From 35a6717e0e889d2417731a1d771a808f97bb690f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Thu, 21 Jul 2022 17:55:07 +0100 Subject: [PATCH] fix the data syntax --- asm/Linker/Generated/Symbol/File.s | 6 +- asm/MSL_C++.PPCEABI.bare.H/ios.s | 26 +- asm/MSL_C++.PPCEABI.bare.H/locale.s | 68 +- asm/MSL_C++.PPCEABI.bare.H/msl_thread.s | 8 +- .../MSL_Common/ansi_files.s | 30 +- asm/MSL_C.PPCEABI.bare.H/MSL_Common/locale.s | 84 +- asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s | 36 +- asm/Runtime.PPCEABI.H/NMWException.s | 24 +- asm/Runtime.PPCEABI.H/New.s | 6 +- asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s | 6 +- asm/ai/ai.s | 2 +- asm/ax/AX.s | 2 +- asm/axfx/AXFXHooks.s | 4 +- asm/bte/bta_dm_act.s | 10 +- asm/bte/bta_dm_api.s | 4 +- asm/bte/bta_dm_cfg.s | 10 +- asm/bte/bta_dm_main.s | 70 +- asm/bte/bta_hh_api.s | 4 +- asm/bte/bta_hh_cfg.s | 4 +- asm/bte/bta_hh_main.s | 30 +- asm/bte/bta_sys_cfg.s | 2 +- asm/bte/hcisu_h2.s | 10 +- asm/bte/hidh_conn.s | 16 +- asm/dsp/dsp.s | 2 +- asm/dvd/dvd.s | 4 +- asm/dvd/dvdDeviceError.s | 14 +- asm/dvd/dvdFatal.s | 32 +- asm/enc/encutility.s | 2 +- asm/exi/EXIBios.s | 2 +- asm/gx/GXInit.s | 6 +- asm/homebuttonLib/HBMAnmController.s | 12 +- asm/homebuttonLib/HBMAxSound.s | 56 +- asm/homebuttonLib/HBMBase.s | 310 +- asm/homebuttonLib/HBMCommon.s | 4 +- asm/homebuttonLib/HBMFrameController.s | 2 +- asm/homebuttonLib/HBMGUIManager.s | 202 +- asm/homebuttonLib/HBMRemoteSpk.s | 6 +- asm/homebuttonLib/lyt_animation.s | 22 +- asm/homebuttonLib/lyt_arcResourceAccessor.s | 16 +- asm/homebuttonLib/lyt_bounding.s | 66 +- asm/homebuttonLib/lyt_drawInfo.s | 6 +- asm/homebuttonLib/lyt_group.s | 6 +- asm/homebuttonLib/lyt_layout.s | 26 +- asm/homebuttonLib/lyt_material.s | 20 +- asm/homebuttonLib/lyt_pane.s | 50 +- asm/homebuttonLib/lyt_picture.s | 62 +- asm/homebuttonLib/lyt_resourceAccessor.s | 6 +- asm/homebuttonLib/lyt_textBox.s | 66 +- asm/homebuttonLib/lyt_window.s | 70 +- asm/homebuttonLib/ut_Font.s | 8 +- asm/homebuttonLib/ut_ResFont.s | 58 +- asm/homebuttonLib/ut_ResFontBase.s | 48 +- asm/homebuttonLib/ut_TagProcessorBase.s | 20 +- asm/homebuttonLib/ut_TextWriterBase.s | 2 +- asm/kpad/KPAD.s | 2 +- asm/libMobiclip/MoApi.s | 2 +- asm/libMobiclip/MoSdkAdpcmDecoder.s | 20 +- asm/libMobiclip/MoSdkAudioDecoder.s | 8 +- asm/libMobiclip/MoSdkFastAudioDecoder.s | 18 +- asm/libMobiclip/MoSdkPcmPassthroughDecoder.s | 18 +- asm/libMobiclip/VX2_DecodeBlock16x16.s | 20 +- asm/libMobiclip/VX2_DecodeBlock16x2.s | 14 +- asm/libMobiclip/VX2_DecodeBlock16x4.s | 16 +- asm/libMobiclip/VX2_DecodeBlock16x8.s | 16 +- asm/libMobiclip/VX2_DecodeBlock2x16.s | 14 +- asm/libMobiclip/VX2_DecodeBlock2x2.s | 12 +- asm/libMobiclip/VX2_DecodeBlock2x4.s | 14 +- asm/libMobiclip/VX2_DecodeBlock2x8.s | 14 +- asm/libMobiclip/VX2_DecodeBlock4x16.s | 16 +- asm/libMobiclip/VX2_DecodeBlock4x2.s | 14 +- asm/libMobiclip/VX2_DecodeBlock4x4.s | 16 +- asm/libMobiclip/VX2_DecodeBlock4x8.s | 16 +- asm/libMobiclip/VX2_DecodeBlock8x16.s | 16 +- asm/libMobiclip/VX2_DecodeBlock8x2.s | 14 +- asm/libMobiclip/VX2_DecodeBlock8x4.s | 16 +- asm/libMobiclip/VX2_DecodeBlock8x8.s | 16 +- asm/libMobiclip/VX2_MotionCompensation.s | 8 +- asm/libnw4r_ef/ef_cube.s | 2 +- asm/libnw4r_ef/ef_cylinder.s | 2 +- asm/libnw4r_ef/ef_disc.s | 2 +- asm/libnw4r_ef/ef_drawbillboardstrategy.s | 10 +- asm/libnw4r_ef/ef_drawdirectionalstrategy.s | 10 +- asm/libnw4r_ef/ef_drawfreestrategy.s | 8 +- asm/libnw4r_ef/ef_drawlinestrategy.s | 8 +- asm/libnw4r_ef/ef_draworder.s | 6 +- asm/libnw4r_ef/ef_drawpointstrategy.s | 8 +- asm/libnw4r_ef/ef_drawsmoothstripestrategy.s | 10 +- asm/libnw4r_ef/ef_drawstrategybuilder.s | 2 +- asm/libnw4r_ef/ef_drawstrategyimpl.s | 8 +- asm/libnw4r_ef/ef_drawstripestrategy.s | 10 +- asm/libnw4r_ef/ef_effect.s | 12 +- asm/libnw4r_ef/ef_effectsystem.s | 4 +- asm/libnw4r_ef/ef_emform.s | 4 +- asm/libnw4r_ef/ef_emitter.s | 16 +- asm/libnw4r_ef/ef_line.s | 2 +- asm/libnw4r_ef/ef_particle.s | 6 +- asm/libnw4r_ef/ef_particlemanager.s | 14 +- asm/libnw4r_ef/ef_point.s | 2 +- asm/libnw4r_ef/ef_resource.s | 2 +- asm/libnw4r_ef/ef_sphere.s | 2 +- asm/libnw4r_ef/ef_torus.s | 2 +- asm/libnw4r_g3d/g3d_3dsmax.s | 28 +- asm/libnw4r_g3d/g3d_anmchr.s | 138 +- asm/libnw4r_g3d/g3d_anmclr.s | 110 +- asm/libnw4r_g3d/g3d_anmscn.s | 80 +- asm/libnw4r_g3d/g3d_anmshp.s | 126 +- asm/libnw4r_g3d/g3d_anmtexpat.s | 110 +- asm/libnw4r_g3d/g3d_anmtexsrt.s | 110 +- asm/libnw4r_g3d/g3d_anmvis.s | 108 +- asm/libnw4r_g3d/g3d_calcview.s | 12 +- asm/libnw4r_g3d/g3d_init.s | 2 +- asm/libnw4r_g3d/g3d_maya.s | 28 +- asm/libnw4r_g3d/g3d_obj.s | 8 +- asm/libnw4r_g3d/g3d_resanmchr.s | 16 +- asm/libnw4r_g3d/g3d_scnmdl.s | 32 +- asm/libnw4r_g3d/g3d_scnmdlexpand.s | 28 +- asm/libnw4r_g3d/g3d_scnmdlsmpl.s | 32 +- asm/libnw4r_g3d/g3d_scnobj.s | 46 +- asm/libnw4r_g3d/g3d_scnroot.s | 46 +- asm/libnw4r_g3d/g3d_state.s | 12 +- asm/libnw4r_g3d/g3d_xsi.s | 28 +- asm/libnw4r_lyt/lyt_animation.s | 14 +- asm/libnw4r_lyt/lyt_arcResourceAccessor.s | 6 +- asm/libnw4r_lyt/lyt_bounding.s | 56 +- asm/libnw4r_lyt/lyt_drawInfo.s | 2 +- asm/libnw4r_lyt/lyt_group.s | 2 +- asm/libnw4r_lyt/lyt_layout.s | 28 +- asm/libnw4r_lyt/lyt_material.s | 20 +- asm/libnw4r_lyt/lyt_pane.s | 56 +- asm/libnw4r_lyt/lyt_picture.s | 58 +- asm/libnw4r_lyt/lyt_resourceAccessor.s | 4 +- asm/libnw4r_lyt/lyt_textBox.s | 64 +- asm/libnw4r_lyt/lyt_window.s | 68 +- asm/libnw4r_snd/snd_AxManager.s | 2 +- asm/libnw4r_snd/snd_BasicPlayer.s | 2 +- asm/libnw4r_snd/snd_BasicSound.s | 16 +- asm/libnw4r_snd/snd_BiquadFilterPreset.s | 20 +- asm/libnw4r_snd/snd_DvdSoundArchive.s | 58 +- asm/libnw4r_snd/snd_MmlParser.s | 4 +- asm/libnw4r_snd/snd_MmlSeqTrack.s | 4 +- asm/libnw4r_snd/snd_MmlSeqTrackAllocator.s | 8 +- asm/libnw4r_snd/snd_PlayerHeap.s | 4 +- asm/libnw4r_snd/snd_SeqPlayer.s | 38 +- asm/libnw4r_snd/snd_SeqSound.s | 34 +- asm/libnw4r_snd/snd_SeqTrack.s | 4 +- asm/libnw4r_snd/snd_SoundActor.s | 10 +- asm/libnw4r_snd/snd_SoundArchive.s | 2 +- asm/libnw4r_snd/snd_SoundArchivePlayer.s | 24 +- asm/libnw4r_snd/snd_SoundHeap.s | 4 +- asm/libnw4r_snd/snd_SoundSystem.s | 4 +- asm/libnw4r_snd/snd_StrmPlayer.s | 44 +- asm/libnw4r_snd/snd_StrmSound.s | 26 +- asm/libnw4r_snd/snd_Util.s | 6 +- asm/libnw4r_snd/snd_Voice.s | 6 +- asm/libnw4r_snd/snd_WavePlayer.s | 10 +- asm/libnw4r_snd/snd_WaveSound.s | 26 +- asm/libnw4r_snd/snd_WsdPlayer.s | 36 +- asm/libnw4r_ut/ut_DvdFileStream.s | 48 +- asm/libnw4r_ut/ut_DvdLockedFileStream.s | 48 +- asm/libnw4r_ut/ut_FileStream.s | 2 +- asm/libnw4r_ut/ut_Font.s | 8 +- asm/libnw4r_ut/ut_IOStream.s | 2 +- asm/libnw4r_ut/ut_LockedCache.s | 2 +- asm/libnw4r_ut/ut_ResFont.s | 42 +- asm/libnw4r_ut/ut_ResFontBase.s | 44 +- asm/libnw4r_ut/ut_RomFont.s | 46 +- asm/libnw4r_ut/ut_TagProcessorBase.s | 12 +- asm/libnw4r_ut/ut_TextWriterBase.s | 2 +- asm/mem/mem_allocator.s | 4 +- asm/nand/NANDCheck.s | 20 +- asm/nand/NANDCore.s | 4 +- asm/nand/NANDErrorMessage.s | 202 +- asm/nrel/ExpHeapMapUser.s | 32 +- asm/os/OS.s | 4 +- asm/os/OSAlarm.s | 2 +- asm/os/OSMemory.s | 2 +- asm/os/OSThread.s | 2 +- asm/os/OSUtf.s | 186 +- asm/pad/Pad.s | 6 +- asm/sc/scsystem.s | 78 +- asm/si/SIBios.s | 2 +- asm/src/AbilityBase.s | 42 +- asm/src/AbilityCustomBase.s | 4 +- asm/src/AbilityKindUtil.s | 72 +- asm/src/AbilityPanel.s | 42 +- asm/src/AbilitySelect.s | 26 +- asm/src/ActionAttack.s | 30 +- asm/src/ActionDrink.s | 30 +- asm/src/ActionHover.s | 30 +- asm/src/ActionRun.s | 30 +- asm/src/ActionThroughLand.s | 30 +- asm/src/ActionVacuumSuper.s | 30 +- asm/src/ActionVomit.s | 30 +- asm/src/ActorDiamond.s | 10 +- asm/src/AddOnMathDirection3.s | 12 +- asm/src/AddOnMint.s | 750 ++--- asm/src/AddWiiRemote.s | 2 +- asm/src/AdditionalMove.s | 4 +- asm/src/Alarm.s | 4 +- asm/src/AnimScript.s | 4 +- asm/src/AppImpl.s | 6 +- asm/src/ArrowBoard.s | 8 +- asm/src/BCOpCode.s | 132 +- asm/src/BG.s | 2 +- asm/src/BGLayout.s | 2 +- asm/src/BGModel.s | 4 +- asm/src/BackupFileData2.s | 8 +- asm/src/BinCarryItemKindUtil.s | 22 +- asm/src/BinDecorationKindUtil.s | 62 +- asm/src/Block.s | 78 +- asm/src/BlockResFiles.s | 226 +- asm/src/Boss.s | 2 +- asm/src/BossPanel.s | 30 +- asm/src/BrainAttack.s | 96 +- asm/src/BrainAttackStraight.s | 14 +- asm/src/BrainBase.s | 10 +- asm/src/BrainBound.s | 14 +- asm/src/BrainChase.s | 62 +- asm/src/BrainCreditFallToGoodbye.s | 14 +- asm/src/BrainCreditPraise.s | 34 +- asm/src/BrainCreditWalkToPraise.s | 34 +- asm/src/BrainDash.s | 10 +- asm/src/BrainDive.s | 18 +- asm/src/BrainEscape.s | 10 +- asm/src/BrainFactory.s | 850 ++--- asm/src/BrainFattyBuffer.s | 14 +- asm/src/BrainFix.s | 14 +- asm/src/BrainFixCeil.s | 10 +- asm/src/BrainFlushPursuit.s | 18 +- asm/src/BrainFly.s | 140 +- asm/src/BrainFlyAround.s | 10 +- asm/src/BrainFlyFarSinCurve.s | 14 +- asm/src/BrainFlySinCurve.s | 14 +- asm/src/BrainFlyStraight.s | 10 +- asm/src/BrainFlyUpDown.s | 28 +- asm/src/BrainFlyWait.s | 10 +- asm/src/BrainFollow.s | 10 +- asm/src/BrainGrandLowper.s | 130 +- asm/src/BrainGround.s | 10 +- asm/src/BrainHang.s | 14 +- asm/src/BrainJump.s | 20 +- asm/src/BrainJumpAttack.s | 14 +- asm/src/BrainJumpOrAttack.s | 10 +- asm/src/BrainMain.s | 10 +- asm/src/BrainMove.s | 178 +- asm/src/BrainMoveAround.s | 14 +- asm/src/BrainMoveAttack.s | 30 +- asm/src/BrainMoveStraight.s | 10 +- asm/src/BrainNoseDive.s | 36 +- asm/src/BrainPuff.s | 14 +- asm/src/BrainPursuit.s | 24 +- asm/src/BrainPursuitCeil.s | 10 +- asm/src/BrainRelease.s | 28 +- asm/src/BrainRise.s | 14 +- asm/src/BrainRun.s | 10 +- asm/src/BrainShot.s | 14 +- asm/src/BrainSmoke.s | 10 +- asm/src/BrainTeleport.s | 14 +- asm/src/BrainTeleportRepeat.s | 10 +- asm/src/BrainWait.s | 112 +- asm/src/BrainWaitAndChase.s | 10 +- asm/src/BrainWaitAttack.s | 10 +- asm/src/BrainWaitFlyStraight.s | 14 +- asm/src/BrainWaitPursuit.s | 10 +- asm/src/BrainWalk.s | 70 +- asm/src/BrainWalkAround.s | 54 +- asm/src/BrainWalkStepBack.s | 10 +- asm/src/BrainWalkStraight.s | 20 +- asm/src/BrainWalkTurnCliff.s | 10 +- asm/src/BrainWall.s | 14 +- asm/src/BrainWhispy.s | 70 +- asm/src/Button.s | 78 +- asm/src/CaptureHeroReceiver.s | 24 +- asm/src/CarryBlock.s | 2 +- asm/src/ChainStarter.s | 12 +- asm/src/ChallengeBattleCtrl.s | 8 +- asm/src/ChallengeDoor.s | 46 +- asm/src/ChallengeDoorMaster.s | 74 +- asm/src/ChallengeDoorMasterEx.s | 38 +- asm/src/ChallengeDoorMusou.s | 38 +- asm/src/ChallengeDoorMusouEx.s | 38 +- asm/src/ChallengeDoorNormal.s | 38 +- asm/src/ChallengeDoorTraining.s | 38 +- asm/src/ChallengeKindUtil.s | 128 +- asm/src/Chara.s | 128 +- asm/src/CharaAnimBlender.s | 40 +- asm/src/CharaModel.s | 4 +- asm/src/Chronology.s | 174 +- asm/src/CinemaScope.s | 6 +- asm/src/Color.s | 2 +- asm/src/Commander.s | 4 +- asm/src/Common.s | 720 ++-- asm/src/Constant.s | 10 +- asm/src/ControlIcon.s | 8 +- asm/src/Cursor.s | 86 +- asm/src/Custom.s | 2374 +++++++------- asm/src/CustomBase.s | 86 +- asm/src/CustomFactory.s | 588 ++-- asm/src/CutRopeStep.s | 16 +- asm/src/DamageFieldReact.s | 8 +- asm/src/Dead.s | 8 +- asm/src/Dedede.s | 342 +- asm/src/Dee.s | 352 +- asm/src/Delete.s | 18 +- asm/src/Demo.s | 12 +- asm/src/DemoAllStageClear.s | 16 +- asm/src/DemoAppearWarpStar.s | 16 +- asm/src/DemoChangeGrade.s | 28 +- asm/src/DemoFirstLvIn.s | 16 +- asm/src/DemoFirstPlay.s | 16 +- asm/src/DemoUnlockMaster.s | 16 +- asm/src/DemoUnlockMasterEx.s | 16 +- asm/src/Detail.s | 10 +- asm/src/Direction3.s | 2 +- asm/src/DisableIcon.s | 2 +- asm/src/DvdControl.s | 16 +- asm/src/DvdWatch_ENG.s | 10 +- asm/src/EasyRender3D.s | 2 +- asm/src/EffectLocatorModelDesc.s | 2 +- asm/src/Enemy.s | 14 +- asm/src/EnemyCtrl.s | 16 +- asm/src/EnemySummonCtrl.s | 4 +- asm/src/Exception.s | 34 +- asm/src/ExplainButton.s | 40 +- asm/src/ExplainConsole.s | 64 +- asm/src/ExplainUtil.s | 236 +- asm/src/Explanation.s | 32 +- asm/src/FDGManager.s | 2 +- asm/src/Fighter.s | 46 +- asm/src/File.s | 30 +- asm/src/FontKindUtil.s | 36 +- asm/src/FoodTableKindUtil.s | 16 +- asm/src/FramePanel.s | 4 +- asm/src/G3DAutoReqAnimCallback.s | 4 +- asm/src/GearModel.s | 4 +- asm/src/GenerateFromObj.s | 6 +- asm/src/Ghost.s | 2 +- asm/src/HEL__Math__Vector2.s | 28 +- asm/src/HEL__Math__Vector3.s | 36 +- asm/src/HIDErrorMenu.s | 18 +- asm/src/HIDManager.s | 2 +- asm/src/Hammer.s | 38 +- asm/src/HeapCompaction.s | 36 +- asm/src/HeapExp.s | 20 +- asm/src/HeapMapUserRepos.s | 2 +- asm/src/HeapUnit.s | 14 +- asm/src/Hero.s | 74 +- asm/src/HeroPanelController.s | 2 +- asm/src/HeroStatusIcon.s | 44 +- asm/src/HidKindUtil.s | 114 +- asm/src/Hit.s | 2 +- asm/src/HitStopCallback.s | 24 +- asm/src/InactiveHero.s | 10 +- asm/src/InactiveStateBase.s | 4 +- asm/src/InactiveStateCallback.s | 4 +- asm/src/IndiviUtil.s | 434 +-- asm/src/InfoGameStatus.s | 2 +- asm/src/Item.s | 88 +- asm/src/ItemCatcher.s | 2 +- asm/src/ItemCollReact.s | 8 +- asm/src/KindUtil.s | 300 +- asm/src/Kirby.s | 734 ++--- asm/src/Kiss.s | 4 +- asm/src/LandLayer.s | 2 +- asm/src/Loader.s | 12 +- asm/src/Locale.s | 14 +- asm/src/Mahoroa.s | 60 +- asm/src/Main.s | 122 +- asm/src/Manager.s | 118 +- asm/src/ManualData.s | 204 +- asm/src/Message.s | 414 +-- asm/src/MessageWindow.s | 40 +- asm/src/Meta.s | 370 +-- asm/src/MintAnim.s | 2 +- asm/src/MintAttacker.s | 2 +- asm/src/MintBGMController.s | 2 +- asm/src/MintBoss.s | 2 +- asm/src/MintCameraController.s | 2 +- asm/src/MintChallengeDoor.s | 2 +- asm/src/MintCommander.s | 2 +- asm/src/MintDemo.s | 2 +- asm/src/MintEffect.s | 2 +- asm/src/MintEnemy.s | 2 +- asm/src/MintFootState.s | 2 +- asm/src/MintGear.s | 2 +- asm/src/MintGearAnim.s | 2 +- asm/src/MintHero.s | 2 +- asm/src/MintLocation.s | 2 +- asm/src/MintMeshFlip.s | 2 +- asm/src/MintModel.s | 4 +- asm/src/MintModelAccessor.s | 2 +- asm/src/MintModelRotCtrl.s | 2 +- asm/src/MintMonitor.s | 2 +- asm/src/MintMove.s | 2 +- asm/src/MintNodeAccessor.s | 2 +- asm/src/MintOCollManager.s | 2 +- asm/src/MintObjColl.s | 2 +- asm/src/MintSERequestor.s | 2 +- asm/src/MintScript.s | 2 +- asm/src/MintScriptTrigger.s | 2 +- asm/src/MintSetting.s | 14 +- asm/src/MintShake.s | 2 +- asm/src/MintShipEvent.s | 2 +- asm/src/MintSuperBackPicture.s | 2 +- asm/src/MintSuperFade.s | 2 +- asm/src/MintTarget.s | 2 +- asm/src/MintZoomQuake.s | 2 +- asm/src/Model.s | 158 +- asm/src/ModelAnimAccessor.s | 4 +- asm/src/ModelDesc.s | 2882 ++++++++--------- asm/src/ModelDescUtil.s | 4 +- asm/src/Monitor.s | 4 +- asm/src/MoveGridGroup.s | 2 +- asm/src/MoveGridManager.s | 22 +- asm/src/MoveGroupCtrl.s | 12 +- asm/src/MovieButtonContent.s | 102 +- asm/src/MovieKindUtil.s | 54 +- asm/src/MoviePlayer.s | 4 +- asm/src/MovieWindow.s | 58 +- asm/src/MovieYuv.s | 10 +- asm/src/NANDErrorMenu.s | 2 +- asm/src/NandThread.s | 32 +- asm/src/NextArrowPanel.s | 16 +- asm/src/Nururi.s | 2 +- asm/src/ObjCollReact.s | 64 +- asm/src/ObjInfoImpl.s | 36 +- asm/src/ObjStop.s | 50 +- asm/src/OperatorNewDelete.s | 2 +- asm/src/Package.s | 14 +- asm/src/PackageButtonContent.s | 102 +- asm/src/PackageWindow.s | 14 +- asm/src/PageAbility.s | 12 +- asm/src/PageCommand.s | 12 +- asm/src/PageDropout.s | 38 +- asm/src/PageManager.s | 4 +- asm/src/Parasol.s | 78 +- asm/src/PauseManager.s | 4 +- asm/src/PerformanceController.s | 2 +- asm/src/PermEffect.s | 10 +- asm/src/PlayerWindow.s | 6 +- asm/src/Point2.s | 2 +- asm/src/Product.s | 2 +- asm/src/ProgressCtrl.s | 8 +- asm/src/PtclEffectMemManager.s | 56 +- asm/src/ReceiverBase.s | 26 +- asm/src/Regset.s | 4 +- asm/src/ResidentFile.s | 2 +- asm/src/ResourceFileName.s | 16 +- asm/src/Result.s | 18 +- asm/src/ResultLyt.s | 18 +- asm/src/Rumble.s | 18 +- asm/src/RumbleResource.s | 4 +- asm/src/Runner.s | 2 +- asm/src/SDKAllocator.s | 4 +- asm/src/SceneAnime.s | 18 +- asm/src/SceneChallengeFileSelect.s | 122 +- asm/src/SceneChallengeResult.s | 14 +- asm/src/SceneChallengeTitle.s | 14 +- asm/src/SceneChallengeTutorial.s | 14 +- asm/src/SceneComic.s | 20 +- asm/src/SceneGrandMenu.s | 14 +- asm/src/SceneGrandTitle.s | 14 +- asm/src/SceneHistory.s | 14 +- asm/src/SceneInit.s | 14 +- asm/src/ScenePackageList.s | 14 +- asm/src/SceneStaffCredit.s | 14 +- asm/src/SceneStep.s | 14 +- asm/src/SceneStrap.s | 14 +- asm/src/SceneVC.s | 14 +- asm/src/Scn__ChallengeTitle__Chara.s | 22 +- asm/src/Scn__GrandTitle__Block.s | 4 +- asm/src/Scn__GrandTitle__Chara.s | 28 +- asm/src/ScriptArchive.s | 2 +- asm/src/ScriptCallback.s | 24 +- asm/src/Scroll.s | 2 +- asm/src/SearchAttack.s | 2 +- asm/src/SearchHit.s | 2 +- asm/src/SelectButtonContent.s | 130 +- asm/src/Sequence.s | 50 +- asm/src/SequenceChallengeRoot.s | 14 +- asm/src/SequenceChallengeTitleRoot.s | 14 +- asm/src/SequenceFirstDemo.s | 14 +- asm/src/SequenceGrandMenu.s | 14 +- asm/src/SequenceHistory.s | 14 +- asm/src/SequenceLvMapRoot.s | 14 +- asm/src/SequenceProductRoot.s | 14 +- asm/src/SequenceRoot.s | 14 +- asm/src/SequenceStaffCredit.s | 14 +- asm/src/SequenceStep.s | 14 +- asm/src/SequenceVC.s | 14 +- asm/src/Shadow.s | 4 +- asm/src/Shake.s | 12 +- asm/src/ShipEvent.s | 96 +- asm/src/Shooting.s | 2 +- asm/src/ShuffleManager.s | 84 +- asm/src/Shutter.s | 20 +- asm/src/Smash.s | 74 +- asm/src/SoundManager.s | 2 +- asm/src/Spark.s | 48 +- asm/src/StaffCredit.s | 18 +- asm/src/StaffRoll.s | 58 +- asm/src/Stage.s | 2 +- asm/src/StateAbilityCrash.s | 18 +- asm/src/StateAgony.s | 12 +- asm/src/StateAim.s | 24 +- asm/src/StateAirJump.s | 18 +- asm/src/StateAirSpin.s | 18 +- asm/src/StateAllStageClear.s | 18 +- asm/src/StateAngerChase.s | 12 +- asm/src/StateAnyWhereIn.s | 14 +- asm/src/StateAppear.s | 68 +- asm/src/StateApproach.s | 8 +- asm/src/StateAreaMapDemoFirstPlay.s | 14 +- asm/src/StateAttack.s | 370 +-- asm/src/StateAttack1Way.s | 12 +- asm/src/StateAttack3Way.s | 12 +- asm/src/StateAttackBreath.s | 12 +- asm/src/StateAttackEnd.s | 14 +- asm/src/StateAttackJoint.s | 12 +- asm/src/StateAttackOver.s | 22 +- asm/src/StateAttackOverEnd.s | 14 +- asm/src/StateAttackShot.s | 12 +- asm/src/StateAttackUnder.s | 22 +- asm/src/StateAttackUnderEnd.s | 14 +- asm/src/StateBack.s | 24 +- asm/src/StateBackCircle.s | 12 +- asm/src/StateBase.s | 58 +- asm/src/StateBodyHit.s | 14 +- asm/src/StateBomb.s | 12 +- asm/src/StateBombStart.s | 12 +- asm/src/StateBossDemoStart.s | 4 +- asm/src/StateBossDemoWait.s | 14 +- asm/src/StateBound.s | 20 +- asm/src/StateBound1.s | 20 +- asm/src/StateBound2.s | 12 +- asm/src/StateBoundNear.s | 12 +- asm/src/StateCall.s | 12 +- asm/src/StateCallback.s | 20 +- asm/src/StateCapture.s | 32 +- asm/src/StateCaptureAttack.s | 16 +- asm/src/StateCapturedFighter.s | 20 +- asm/src/StateCapturedParasol.s | 16 +- asm/src/StateCapturedWaterGalborosEat.s | 14 +- asm/src/StateCapturedWaterGalborosVomit.s | 14 +- asm/src/StateCapturedWhip.s | 16 +- asm/src/StateCapturedWhispyChewing.s | 14 +- asm/src/StateCapturedWhispyRelease.s | 14 +- asm/src/StateCapturedWhispyVacuum.s | 18 +- asm/src/StateCapturedWhispyVomit.s | 18 +- asm/src/StateCapturedWhispyVomitBound.s | 14 +- asm/src/StateCapturedWhispyVomitSoft.s | 14 +- asm/src/StateCatch.s | 50 +- asm/src/StateChallengeBattleLose.s | 14 +- asm/src/StateChallengeBattleWin.s | 14 +- asm/src/StateChallengeBattleWinPre.s | 22 +- asm/src/StateChallengeConfirm.s | 18 +- asm/src/StateChallengeIn.s | 14 +- asm/src/StateChange.s | 30 +- asm/src/StateChangeGrade.s | 14 +- asm/src/StateChanger.s | 2 +- asm/src/StateCharge.s | 38 +- asm/src/StateChargeAttack.s | 12 +- asm/src/StateChargeAttackStart.s | 12 +- asm/src/StateChase.s | 96 +- asm/src/StateChewing.s | 16 +- asm/src/StateCircle.s | 12 +- asm/src/StateClearDance.s | 14 +- asm/src/StateClearDanceFall.s | 18 +- asm/src/StateClearDancePre.s | 18 +- asm/src/StateClearDanceWalk.s | 18 +- asm/src/StateCliffAttack.s | 16 +- asm/src/StateCliffJump.s | 12 +- asm/src/StateCombinationAttack.s | 18 +- asm/src/StateCopy.s | 14 +- asm/src/StateCopyPre.s | 18 +- asm/src/StateCreditMove.s | 12 +- asm/src/StateCreditWalk.s | 24 +- asm/src/StateCutFall.s | 16 +- asm/src/StateCutLanding.s | 12 +- asm/src/StateDamage.s | 12 +- asm/src/StateDamageCapture.s | 12 +- asm/src/StateDamageExtreme.s | 12 +- asm/src/StateDamageL.s | 16 +- asm/src/StateDamageNormal.s | 12 +- asm/src/StateDamageWingToss.s | 12 +- asm/src/StateDash.s | 68 +- asm/src/StateDashAttack.s | 30 +- asm/src/StateDashAttackWallHit.s | 14 +- asm/src/StateDashEnd.s | 12 +- asm/src/StateDashWallHit.s | 24 +- asm/src/StateDead.s | 42 +- asm/src/StateDeadCaptureRelease.s | 12 +- asm/src/StateDeadExtreme.s | 12 +- asm/src/StateDeadInWater.s | 12 +- asm/src/StateDeadSuper.s | 12 +- asm/src/StateDemo.s | 14 +- asm/src/StateDive.s | 28 +- asm/src/StateDiveAttack.s | 18 +- asm/src/StateDiveWait.s | 12 +- asm/src/StateDoubleAttack.s | 12 +- asm/src/StateDoubleKick.s | 14 +- asm/src/StateDrink.s | 26 +- asm/src/StateEat.s | 14 +- asm/src/StateEaten.s | 14 +- asm/src/StateEnd.s | 14 +- asm/src/StateEndure.s | 12 +- asm/src/StateEnterChallengeDoor.s | 14 +- asm/src/StateEnterChallengeDoorPre.s | 18 +- asm/src/StateEnterDoor.s | 18 +- asm/src/StateEnterMahoroa.s | 18 +- asm/src/StateEscape.s | 24 +- asm/src/StateExplosion.s | 72 +- asm/src/StateExtreme.s | 18 +- asm/src/StateFaceChange.s | 12 +- asm/src/StateFaint.s | 18 +- asm/src/StateFall.s | 236 +- asm/src/StateFallEnemy.s | 12 +- asm/src/StateFallFeathery.s | 8 +- asm/src/StateFallNoDecel.s | 12 +- asm/src/StateFallScrewStart.s | 14 +- asm/src/StateFattyBufferAppearFall.s | 12 +- asm/src/StateFattyBufferEscapeNear.s | 12 +- asm/src/StateFinalCutterDrop.s | 18 +- asm/src/StateFinalCutterLanding.s | 14 +- asm/src/StateFinalCutterPre.s | 22 +- asm/src/StateFinalCutterRise.s | 18 +- asm/src/StateFireBlock.s | 14 +- asm/src/StateFireLv2.s | 14 +- asm/src/StateFireLv3.s | 14 +- asm/src/StateFirst.s | 16 +- asm/src/StateFirstDemo.s | 14 +- asm/src/StateFirstMotion.s | 26 +- asm/src/StateFirstMotionDash.s | 26 +- asm/src/StateFixed.s | 8 +- asm/src/StateFlight.s | 18 +- asm/src/StateFlightFar.s | 16 +- asm/src/StateFlush.s | 12 +- asm/src/StateFlushWait.s | 16 +- asm/src/StateFly.s | 112 +- asm/src/StateFlyAround.s | 24 +- asm/src/StateFlyAway.s | 16 +- asm/src/StateFlyFarSinCurve.s | 12 +- asm/src/StateFlyPursuit.s | 12 +- asm/src/StateFlySinCurve.s | 24 +- asm/src/StateFlyStraight.s | 24 +- asm/src/StateFlyUpDown.s | 24 +- asm/src/StateFlyWait.s | 12 +- asm/src/StateFlyWaitFix.s | 12 +- asm/src/StateFlyWall.s | 12 +- asm/src/StateFlyWallStart.s | 20 +- asm/src/StateFlyingOut.s | 12 +- asm/src/StateFollow.s | 12 +- asm/src/StateFootSweep.s | 18 +- asm/src/StateFootSweepEnd.s | 14 +- asm/src/StateGather.s | 8 +- asm/src/StateGetShipParts.s | 14 +- asm/src/StateGlide.s | 28 +- asm/src/StateGlideAway.s | 12 +- asm/src/StateGoodbye.s | 12 +- asm/src/StateGrandLowperAppear.s | 112 +- asm/src/StateGrandLowperEscape.s | 84 +- asm/src/StateGrandLowperEscapeStart.s | 112 +- asm/src/StateGrandLowperLanding.s | 12 +- asm/src/StateGroundAttack.s | 12 +- asm/src/StateGrow.s | 12 +- asm/src/StateGuard.s | 48 +- asm/src/StateHadou.s | 12 +- asm/src/StateHammerAirSpin.s | 18 +- asm/src/StateHammerStrongSwing.s | 18 +- asm/src/StateHang.s | 30 +- asm/src/StateHeightAdjust.s | 12 +- asm/src/StateHide.s | 48 +- asm/src/StateHover.s | 36 +- asm/src/StateHoverFar.s | 16 +- asm/src/StateHoverLanding.s | 18 +- asm/src/StateIdling.s | 16 +- asm/src/StateInit.s | 18 +- asm/src/StateItemGet.s | 14 +- asm/src/StateJump.s | 208 +- asm/src/StateJumpAttack.s | 56 +- asm/src/StateJumpAttackStart.s | 32 +- asm/src/StateJumpBig.s | 16 +- asm/src/StateJumpBigStart.s | 16 +- asm/src/StateJumpCenterAttack.s | 12 +- asm/src/StateJumpHold.s | 18 +- asm/src/StateJumpMachinegun.s | 12 +- asm/src/StateJumpMachinegunStart.s | 16 +- asm/src/StateJumpStart.s | 66 +- asm/src/StateKiss.s | 18 +- asm/src/StateKissReceive.s | 14 +- asm/src/StateLadder.s | 18 +- asm/src/StateLanding.s | 162 +- asm/src/StateLaugh.s | 16 +- asm/src/StateLeaveChallengeDoor.s | 14 +- asm/src/StateLeaveLvMapDoor.s | 22 +- asm/src/StateLeaveMahoroa.s | 14 +- asm/src/StateLeaveSubgameDoor.s | 14 +- asm/src/StateLink.s | 16 +- asm/src/StateLogout.s | 14 +- asm/src/StateLookAround.s | 12 +- asm/src/StateLookBoss.s | 22 +- asm/src/StateLose.s | 12 +- asm/src/StateLoseFly.s | 18 +- asm/src/StateLostHat.s | 12 +- asm/src/StateMain.s | 692 ++-- asm/src/StateMasterSummon.s | 12 +- asm/src/StateMasterSummonWait.s | 12 +- asm/src/StateMix.s | 14 +- asm/src/StateMixPre.s | 18 +- asm/src/StateMoonSault.s | 14 +- asm/src/StateMove.s | 140 +- asm/src/StateMoveAround.s | 12 +- asm/src/StateMoveBack.s | 12 +- asm/src/StateMoveCircle.s | 12 +- asm/src/StateMoveForward.s | 24 +- asm/src/StateMoveJoint.s | 12 +- asm/src/StateMoveSinCurve.s | 12 +- asm/src/StateMoveStraight.s | 12 +- asm/src/StateMoveThunder.s | 12 +- asm/src/StateMoveThunderStart.s | 16 +- asm/src/StateMoveToOtherSide.s | 12 +- asm/src/StateNormal.s | 12 +- asm/src/StateNoseDive.s | 24 +- asm/src/StatePanic.s | 16 +- asm/src/StateParasolCapture.s | 16 +- asm/src/StateParasolDive.s | 22 +- asm/src/StateParasolDrill.s | 22 +- asm/src/StateParasolDrillEnd.s | 14 +- asm/src/StateParasolFall.s | 24 +- asm/src/StateParasolParachute.s | 18 +- asm/src/StateParasolParachuteFall.s | 14 +- asm/src/StateParasolRelease.s | 12 +- asm/src/StateParasolShield.s | 14 +- asm/src/StateParasolSwing.s | 30 +- asm/src/StateParasolUnder.s | 18 +- asm/src/StateParasolWaterDive.s | 18 +- asm/src/StateParasolWaterDrill.s | 22 +- asm/src/StateParasolWaterDrillEnd.s | 14 +- asm/src/StatePick.s | 16 +- asm/src/StatePiggyback.s | 14 +- asm/src/StatePlancher.s | 18 +- asm/src/StatePlancherBound.s | 14 +- asm/src/StatePlancherHit.s | 14 +- asm/src/StatePlancherLanding.s | 22 +- asm/src/StatePraise.s | 84 +- asm/src/StatePreciousAppear.s | 12 +- asm/src/StatePressFall.s | 12 +- asm/src/StatePressFallStart.s | 16 +- asm/src/StatePressJump.s | 16 +- asm/src/StatePressJumpStart.s | 16 +- asm/src/StatePuff.s | 12 +- asm/src/StatePursuit.s | 24 +- asm/src/StateQuivery.s | 12 +- asm/src/StateRainBomb.s | 16 +- asm/src/StateRainBombStart.s | 16 +- asm/src/StateReady.s | 16 +- asm/src/StateReflect.s | 24 +- asm/src/StateReturnWarpLowper.s | 18 +- asm/src/StateRise.s | 12 +- asm/src/StateRising.s | 26 +- asm/src/StateRoah.s | 8 +- asm/src/StateRollJump.s | 12 +- asm/src/StateRolling.s | 16 +- asm/src/StateRollingEnd.s | 12 +- asm/src/StateRollingStart.s | 16 +- asm/src/StateRoomGuarderAppear.s | 12 +- asm/src/StateRootAttack.s | 12 +- asm/src/StateRun.s | 30 +- asm/src/StateRunAppear.s | 20 +- asm/src/StateSCFlyAway.s | 16 +- asm/src/StateSCHide.s | 12 +- asm/src/StateSCLookFar.s | 16 +- asm/src/StateSCLookKirby.s | 20 +- asm/src/StateSCPursuit.s | 12 +- asm/src/StateSelect.s | 4 +- asm/src/StateShipRepairDemo.s | 14 +- asm/src/StateShipRepairDemoAfter.s | 14 +- asm/src/StateShipRepairDemoAfterFollow.s | 14 +- asm/src/StateShipRepairDemoFollow.s | 14 +- asm/src/StateShot.s | 142 +- asm/src/StateShotAirBall.s | 28 +- asm/src/StateShotAirBallBase.s | 12 +- asm/src/StateShotAirBallBig.s | 14 +- asm/src/StateShotAirBallTornado.s | 14 +- asm/src/StateShuttleLoop.s | 42 +- asm/src/StateShuttleLoopEnd.s | 14 +- asm/src/StateSkinned.s | 12 +- asm/src/StateSkyKick.s | 22 +- asm/src/StateSkyKickHit.s | 14 +- asm/src/StateSlant.s | 12 +- asm/src/StateSliding.s | 22 +- asm/src/StateSlidingHit.s | 14 +- asm/src/StateSlip.s | 14 +- asm/src/StateSlope.s | 12 +- asm/src/StateSmash.s | 14 +- asm/src/StateSmashKick.s | 14 +- asm/src/StateSmashKickCharge.s | 22 +- asm/src/StateSmashed.s | 32 +- asm/src/StateSmashedEnd.s | 24 +- asm/src/StateSpaceJump.s | 14 +- asm/src/StateSparkLv1.s | 14 +- asm/src/StateSparkLv2.s | 14 +- asm/src/StateSparkLv3.s | 14 +- asm/src/StateSpin.s | 34 +- asm/src/StateSpinKick.s | 14 +- asm/src/StateSpine.s | 14 +- asm/src/StateSquashRoof.s | 18 +- asm/src/StateSquashWall.s | 18 +- asm/src/StateSquat.s | 18 +- asm/src/StateStamp.s | 18 +- asm/src/StateStampHit.s | 14 +- asm/src/StateStartJump.s | 14 +- asm/src/StateStartWait.s | 12 +- asm/src/StateStay.s | 28 +- asm/src/StateStepBack.s | 12 +- asm/src/StateStickObj.s | 24 +- asm/src/StateStickWall.s | 24 +- asm/src/StateStop.s | 12 +- asm/src/StateStopAir.s | 12 +- asm/src/StateStraight.s | 12 +- asm/src/StateSummon.s | 12 +- asm/src/StateSuperAppear.s | 12 +- asm/src/StateSuperAppearPre.s | 16 +- asm/src/StateSuperFirst.s | 20 +- asm/src/StateSuperJump.s | 14 +- asm/src/StateSuperTeamAttack.s | 14 +- asm/src/StateSwim.s | 14 +- asm/src/StateSwing.s | 16 +- asm/src/StateSwingEnd.s | 12 +- asm/src/StateSwingPursuit.s | 12 +- asm/src/StateSwordAirSpin.s | 18 +- asm/src/StateSwordAttack.s | 22 +- asm/src/StateSwordAttackFinish.s | 18 +- asm/src/StateSwordCharge.s | 18 +- asm/src/StateSwordChargeStart.s | 18 +- asm/src/StateSwordChopping.s | 22 +- asm/src/StateSwordChoppingHit.s | 14 +- asm/src/StateSwordFloatSpin.s | 18 +- asm/src/StateSwordMeteor.s | 22 +- asm/src/StateSwordMeteorLanding.s | 14 +- asm/src/StateSwordMince.s | 18 +- asm/src/StateSwordRaising.s | 22 +- asm/src/StateSwordRaisingEnd.s | 14 +- asm/src/StateSwordSpin.s | 14 +- asm/src/StateSwordThrust.s | 22 +- asm/src/StateSwordThrustEnd.s | 14 +- asm/src/StateSwordUnderThrust.s | 18 +- asm/src/StateSwordUnderThrustLanding.s | 14 +- asm/src/StateSwordUnderThrustStart.s | 22 +- asm/src/StateSwordWaterSpin.s | 18 +- asm/src/StateTakeOff.s | 12 +- asm/src/StateTeleport.s | 12 +- asm/src/StateThrow.s | 52 +- asm/src/StateThrownFighter.s | 12 +- asm/src/StateThunder.s | 12 +- asm/src/StateThunderStart.s | 16 +- asm/src/StateTornadoChase.s | 12 +- asm/src/StateTornadoRise.s | 16 +- asm/src/StateToss.s | 18 +- asm/src/StateUnderAttack.s | 14 +- asm/src/StateUnderAttackLanding.s | 14 +- asm/src/StateUnlockLvMapDoor.s | 14 +- asm/src/StateVacuum.s | 46 +- asm/src/StateVacuumEnd.s | 26 +- asm/src/StateVacuumReceive.s | 58 +- asm/src/StateVacuumStart.s | 16 +- asm/src/StateVanish.s | 24 +- asm/src/StateVomit.s | 42 +- asm/src/StateVomited.s | 14 +- asm/src/StateVulcan.s | 52 +- asm/src/StateVulcanEnd.s | 28 +- asm/src/StateWaft.s | 8 +- asm/src/StateWait.s | 246 +- asm/src/StateWaitFar.s | 16 +- asm/src/StateWakeUp.s | 14 +- asm/src/StateWalk.s | 128 +- asm/src/StateWalkAround.s | 48 +- asm/src/StateWalkEnd.s | 12 +- asm/src/StateWalkStart.s | 16 +- asm/src/StateWalkStepBack.s | 12 +- asm/src/StateWalkStraight.s | 48 +- asm/src/StateWall.s | 12 +- asm/src/StateWallAttack.s | 12 +- asm/src/StateWarp.s | 12 +- asm/src/StateWarpStar.s | 14 +- asm/src/StateWarpStarFall.s | 20 +- asm/src/StateWarpStarIn.s | 20 +- asm/src/StateWaterFloat.s | 18 +- asm/src/StateWaterPistol.s | 18 +- asm/src/StateWaterPistolFloat.s | 18 +- asm/src/StateWaterWait.s | 18 +- asm/src/StateWaterWalk.s | 18 +- asm/src/StateWhipAttack.s | 14 +- asm/src/StateWhipAttackAir.s | 18 +- asm/src/StateWhipAttackUp.s | 18 +- asm/src/StateWhipCapture.s | 22 +- asm/src/StateWhipCaptureUp.s | 14 +- asm/src/StateWhipCatch.s | 14 +- asm/src/StateWhipCharge.s | 30 +- asm/src/StateWhipDrill.s | 18 +- asm/src/StateWhipGazerSpiral.s | 18 +- asm/src/StateWhipRush.s | 18 +- asm/src/StateWhipSlamBack.s | 18 +- asm/src/StateWhipSlamDown.s | 18 +- asm/src/StateWhipSlamFront.s | 18 +- asm/src/StateWhipSlamUp.s | 18 +- asm/src/StateWhispyAppear.s | 56 +- asm/src/StateWhispyFall.s | 16 +- asm/src/StateWhispyLanding.s | 12 +- asm/src/StateWin.s | 12 +- asm/src/StateWinFly.s | 16 +- asm/src/StateWorrisome.s | 20 +- asm/src/StdResponder.s | 8 +- asm/src/Stepping.s | 4 +- asm/src/Stone.s | 4 +- asm/src/Stop.s | 20 +- asm/src/SuperBackPicture.s | 10 +- asm/src/SuperStop.s | 30 +- asm/src/Switch.s | 14 +- asm/src/SwitchOnce.s | 14 +- asm/src/SwitchReceiver.s | 12 +- asm/src/SwitchReturn.s | 14 +- asm/src/SwitchToggle.s | 14 +- asm/src/Sword.s | 90 +- asm/src/SystemTagProcessor.s | 6 +- asm/src/TPLTexture.s | 4 +- asm/src/Table.s | 404 +-- asm/src/TagProcessor.s | 6 +- asm/src/TagUtil.s | 12 +- asm/src/TalkManager.s | 4 +- asm/src/TargetScorePanel.s | 18 +- asm/src/Text.s | 220 +- asm/src/TimeString.s | 6 +- asm/src/TitleInfo.s | 4 +- asm/src/TotalScore.s | 12 +- asm/src/TotalScorePanel.s | 24 +- asm/src/Trophy.s | 14 +- asm/src/UnitHeapMapUser.s | 20 +- asm/src/UserTagProcessor.s | 86 +- asm/src/Util.s | 38 +- asm/src/Utility.s | 8 +- asm/src/VISetting.s | 28 +- asm/src/VMCore.s | 20 +- asm/src/VMFunctionList.s | 4 +- asm/src/VMModule.s | 6 +- asm/src/VMObjectType.s | 6 +- asm/src/VMObjectTypeList.s | 2 +- asm/src/VacuumAttackerCallback.s | 12 +- asm/src/VacuumReceiver.s | 188 +- asm/src/VariationDemo.s | 14 +- asm/src/VariationDownside.s | 10 +- asm/src/VariationLoose.s | 10 +- asm/src/VariationMove.s | 10 +- asm/src/VariationNpc.s | 56 +- asm/src/VariationPerm.s | 10 +- asm/src/VariationShooting.s | 10 +- asm/src/VariationSphere.s | 10 +- asm/src/VariationStill.s | 10 +- asm/src/VariationUpside.s | 10 +- asm/src/Vector2.s | 2 +- asm/src/Vector3.s | 2 +- asm/src/Water.s | 8 +- asm/src/WaterCallback.s | 6 +- asm/src/WaveHandle.s | 4 +- asm/src/Weapon.s | 6 +- asm/src/Whip.s | 98 +- asm/src/Wing.s | 94 +- asm/src/Wipe.s | 6 +- asm/src/ZoomQuake.s | 14 +- asm/vi/vi.s | 4 +- asm/wpad/WPAD.s | 4 +- asm/wpad/WPADHIDParser.s | 64 +- 972 files changed, 17938 insertions(+), 17938 deletions(-) diff --git a/asm/Linker/Generated/Symbol/File.s b/asm/Linker/Generated/Symbol/File.s index 2e6a42b1..aae44aff 100644 --- a/asm/Linker/Generated/Symbol/File.s +++ b/asm/Linker/Generated/Symbol/File.s @@ -57,9 +57,9 @@ _bss_init_info: .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global _eti_init_info _eti_init_info: - .byte4 $$2191 - .byte4 _eti_init_info - .byte4 __dt__Q23std9exceptionFv + .4byte $$2191 + .4byte _eti_init_info + .4byte __dt__Q23std9exceptionFv .4byte 0x0000E460 .4byte 0 .4byte 0 diff --git a/asm/MSL_C++.PPCEABI.bare.H/ios.s b/asm/MSL_C++.PPCEABI.bare.H/ios.s index c470412c..03d2e5af 100644 --- a/asm/MSL_C++.PPCEABI.bare.H/ios.s +++ b/asm/MSL_C++.PPCEABI.bare.H/ios.s @@ -76,14 +76,14 @@ $$210953: .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$210912 $$210912: - .byte4 get_deleter__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1CFRCQ23std9type_info + .4byte get_deleter__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1CFRCQ23std9type_info .4byte 0x0000004C - .byte4 $$210911 + .4byte $$210911 .global $$210954 $$210954: - .byte4 __dt__Q210Metrowerks48move_ptr$$0c$$4RQ33std6detail20default_delete$$0A0_c$$1$$1Fv + .4byte __dt__Q210Metrowerks48move_ptr$$0c$$4RQ33std6detail20default_delete$$0A0_c$$1$$1Fv .4byte 0x00000060 - .byte4 $$210953 + .4byte $$210953 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29022 @@ -99,27 +99,27 @@ $$29165: .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: - .byte4 __RTTI__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1 + .4byte __RTTI__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1 .4byte 0 - .byte4 __dt__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1Fv - .byte4 get_deleter__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1CFRCQ23std9type_info - .byte4 dispose__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1Fv + .4byte __dt__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1Fv + .4byte get_deleter__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1CFRCQ23std9type_info + .4byte dispose__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1Fv .global $$29023 $$29023: - .byte4 __RTTI__Q43std3tr16detail25shared_ptr_deleter_common + .4byte __RTTI__Q43std3tr16detail25shared_ptr_deleter_common .4byte 0 .4byte 0 .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: - .byte4 $$29022 - .byte4 $$29023 + .4byte $$29022 + .4byte $$29023 .global __RTTI__Q43std3tr16detail25shared_ptr_deleter_common __RTTI__Q43std3tr16detail25shared_ptr_deleter_common: - .byte4 $$29050 + .4byte $$29050 .4byte 0 .global __RTTI__Q33std6detail20default_delete$$0A0_c$$1 __RTTI__Q33std6detail20default_delete$$0A0_c$$1: - .byte4 $$29165 + .4byte $$29165 .4byte 0 diff --git a/asm/MSL_C++.PPCEABI.bare.H/locale.s b/asm/MSL_C++.PPCEABI.bare.H/locale.s index 84ce5dc2..0d69ac61 100644 --- a/asm/MSL_C++.PPCEABI.bare.H/locale.s +++ b/asm/MSL_C++.PPCEABI.bare.H/locale.s @@ -463,17 +463,17 @@ $$227127: .4byte 0x00000058 .4byte 0 .4byte 0x02000028 - .byte4 __dt__Q210Metrowerks48move_ptr$$0c$$4RQ33std6detail20default_delete$$0A0_c$$1$$1Fv + .4byte __dt__Q210Metrowerks48move_ptr$$0c$$4RQ33std6detail20default_delete$$0A0_c$$1$$1Fv .4byte 0x8680001D .4byte 0 - .byte4 __dt__Q23std9exceptionFv + .4byte __dt__Q23std9exceptionFv .4byte 0x02000020 - .byte4 __dt__Q210Metrowerks48move_ptr$$0c$$4RQ33std6detail20default_delete$$0A0_c$$1$$1Fv + .4byte __dt__Q210Metrowerks48move_ptr$$0c$$4RQ33std6detail20default_delete$$0A0_c$$1$$1Fv .4byte 0x8680001E .4byte 0 - .byte4 __dt__Q23std9exceptionFv + .4byte __dt__Q23std9exceptionFv .4byte 0x82000030 - .byte4 __dt__Q23std59basic_string$$0c$$4Q23std14char_traits$$0c$$1$$4Q23std12allocator$$0c$$1$$1Fv + .4byte __dt__Q23std59basic_string$$0c$$4Q23std14char_traits$$0c$$1$$4Q23std12allocator$$0c$$1$$1Fv .global $$227197 $$227197: .4byte 0x18180000 @@ -490,27 +490,27 @@ $$227197: .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$225557 $$225557: - .byte4 __dt__Q23std11logic_errorFv + .4byte __dt__Q23std11logic_errorFv .4byte 0x00000090 - .byte4 $$225556 + .4byte $$225556 .global $$226578 $$226578: - .byte4 __dt__Q23std59basic_string$$0c$$4Q23std14char_traits$$0c$$1$$4Q23std12allocator$$0c$$1$$1Fv + .4byte __dt__Q23std59basic_string$$0c$$4Q23std14char_traits$$0c$$1$$4Q23std12allocator$$0c$$1$$1Fv .4byte 0x00000064 - .byte4 $$226577 + .4byte $$226577 .global $$227128 $$227128: - .byte4 do_replace__Q23std59basic_string$$0c$$4Q23std14char_traits$$0c$$1$$4Q23std12allocator$$0c$$1$$1FUlUlPCcPCcQ23std26random_access_iterator_tag + .4byte do_replace__Q23std59basic_string$$0c$$4Q23std14char_traits$$0c$$1$$4Q23std12allocator$$0c$$1$$1FUlUlPCcPCcQ23std26random_access_iterator_tag .4byte 0x000003F0 - .byte4 $$227127 + .4byte $$227127 .global $$227198 $$227198: - .byte4 __dt__Q23std12length_errorFv + .4byte __dt__Q23std12length_errorFv .4byte 0x00000094 - .byte4 $$227197 + .4byte $$227197 .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3locale_cpp + .4byte __sinit_$$3locale_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$210379 @@ -543,41 +543,41 @@ $$2stringBase0: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23std12out_of_range __vt__Q23std12out_of_range: - .byte4 __RTTI__Q23std12out_of_range + .4byte __RTTI__Q23std12out_of_range .4byte 0 - .byte4 __dt__Q23std12out_of_rangeFv - .byte4 what__Q23std11logic_errorCFv + .4byte __dt__Q23std12out_of_rangeFv + .4byte what__Q23std11logic_errorCFv .global $$210380 $$210380: - .byte4 __RTTI__Q23std9exception + .4byte __RTTI__Q23std9exception .4byte 0 - .byte4 __RTTI__Q23std11logic_error + .4byte __RTTI__Q23std11logic_error .4byte 0 .4byte 0 .4byte 0 .global __vt__Q23std12length_error __vt__Q23std12length_error: - .byte4 __RTTI__Q23std12length_error + .4byte __RTTI__Q23std12length_error .4byte 0 - .byte4 __dt__Q23std12length_errorFv - .byte4 what__Q23std11logic_errorCFv + .4byte __dt__Q23std12length_errorFv + .4byte what__Q23std11logic_errorCFv .global $$210382 $$210382: - .byte4 __RTTI__Q23std9exception + .4byte __RTTI__Q23std9exception .4byte 0 - .byte4 __RTTI__Q23std11logic_error + .4byte __RTTI__Q23std11logic_error .4byte 0 .4byte 0 .4byte 0 .global __vt__Q23std11logic_error __vt__Q23std11logic_error: - .byte4 __RTTI__Q23std11logic_error + .4byte __RTTI__Q23std11logic_error .4byte 0 - .byte4 __dt__Q23std11logic_errorFv - .byte4 what__Q23std11logic_errorCFv + .4byte __dt__Q23std11logic_errorFv + .4byte what__Q23std11logic_errorCFv .global $$210388 $$210388: - .byte4 __RTTI__Q23std9exception + .4byte __RTTI__Q23std9exception .4byte 0 .4byte 0 .4byte 0 @@ -585,16 +585,16 @@ $$210388: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__Q23std12out_of_range __RTTI__Q23std12out_of_range: - .byte4 $$210379 - .byte4 $$210380 + .4byte $$210379 + .4byte $$210380 .global __RTTI__Q23std12length_error __RTTI__Q23std12length_error: - .byte4 $$210381 - .byte4 $$210382 + .4byte $$210381 + .4byte $$210382 .global __RTTI__Q23std11logic_error __RTTI__Q23std11logic_error: - .byte4 $$210387 - .byte4 $$210388 + .4byte $$210387 + .4byte $$210388 .global $$211481 $$211481: .byte 0x00 diff --git a/asm/MSL_C++.PPCEABI.bare.H/msl_thread.s b/asm/MSL_C++.PPCEABI.bare.H/msl_thread.s index af8b286b..df4f73e2 100644 --- a/asm/MSL_C++.PPCEABI.bare.H/msl_thread.s +++ b/asm/MSL_C++.PPCEABI.bare.H/msl_thread.s @@ -103,11 +103,11 @@ $$28430: .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$28324 $$28324: - .byte4 release__Q43std3tr16detail25shared_ptr_deleter_commonFv + .4byte release__Q43std3tr16detail25shared_ptr_deleter_commonFv .4byte 0x00000078 - .byte4 $$28323 + .4byte $$28323 .global $$28431 $$28431: - .byte4 __dt__Q33std3tr114function$$0Fv_v$$1Fv + .4byte __dt__Q33std3tr114function$$0Fv_v$$1Fv .4byte 0x000000A0 - .byte4 $$28430 + .4byte $$28430 diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/ansi_files.s b/asm/MSL_C.PPCEABI.bare.H/MSL_Common/ansi_files.s index 8846f7d9..981a3752 100644 --- a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/ansi_files.s +++ b/asm/MSL_C.PPCEABI.bare.H/MSL_Common/ansi_files.s @@ -92,17 +92,17 @@ __files: .4byte 0 .4byte 0 .4byte 0 - .byte4 stdin_buff + .4byte stdin_buff .4byte 0x00000100 - .byte4 stdin_buff + .4byte stdin_buff .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 __read_console - .byte4 __write_console - .byte4 __close_console + .4byte __read_console + .4byte __write_console + .4byte __close_console .4byte 0 .4byte 0x80421148 .4byte 0x00000001 @@ -112,17 +112,17 @@ __files: .4byte 0 .4byte 0 .4byte 0 - .byte4 stdout_buff + .4byte stdout_buff .4byte 0x00000100 - .byte4 stdout_buff + .4byte stdout_buff .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 __read_console - .byte4 __write_console - .byte4 __close_console + .4byte __read_console + .4byte __write_console + .4byte __close_console .4byte 0 .4byte 0x80421198 .4byte 0x00000002 @@ -132,17 +132,17 @@ __files: .4byte 0 .4byte 0 .4byte 0 - .byte4 stderr_buff + .4byte stderr_buff .4byte 0x00000100 - .byte4 stderr_buff + .4byte stderr_buff .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 __read_console - .byte4 __write_console - .byte4 __close_console + .4byte __read_console + .4byte __write_console + .4byte __close_console .4byte 0 .4byte 0x804211E8 .4byte 0 diff --git a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/locale.s b/asm/MSL_C.PPCEABI.bare.H/MSL_Common/locale.s index 0590dee1..3b618cf8 100644 --- a/asm/MSL_C.PPCEABI.bare.H/MSL_Common/locale.s +++ b/asm/MSL_C.PPCEABI.bare.H/MSL_Common/locale.s @@ -24,32 +24,32 @@ $$2147: .section .data, "wa" # 0x80421040 - 0x80496700 .global __lconv __lconv: - .byte4 $$2139 - .byte4 $$2140 - .byte4 $$2140 - .byte4 $$2140 - .byte4 $$2140 - .byte4 $$2140 - .byte4 $$2140 - .byte4 $$2140 - .byte4 $$2140 + .4byte $$2139 + .4byte $$2140 + .4byte $$2140 + .4byte $$2140 + .4byte $$2140 + .4byte $$2140 + .4byte $$2140 + .4byte $$2140 + .4byte $$2140 .4byte 0x7F7F7F7F .4byte 0x7F7F7F00 - .byte4 $$2140 + .4byte $$2140 .4byte 0x7F7F7F7F .4byte 0x7F7F7F00 .global _loc_ctyp_C _loc_ctyp_C: .4byte 0x43000000 .4byte 0 - .byte4 __ctype_mapC - .byte4 __upper_mapC - .byte4 __lower_mapC - .byte4 __wctype_mapC - .byte4 __wupper_mapC - .byte4 __wlower_mapC - .byte4 __mbtowc_noconv - .byte4 __wctomb_noconv + .4byte __ctype_mapC + .4byte __upper_mapC + .4byte __lower_mapC + .4byte __wctype_mapC + .4byte __wupper_mapC + .4byte __wlower_mapC + .4byte __mbtowc_noconv + .4byte __wctomb_noconv .global char_coll_tableC char_coll_tableC: .4byte 0x00010002 @@ -107,43 +107,43 @@ _loc_coll_C: .4byte 0x00000020 .4byte 0x0000006E .4byte 0 - .byte4 char_coll_tableC + .4byte char_coll_tableC .4byte 0 .global _loc_mon_C _loc_mon_C: .4byte 0x43000000 .4byte 0 - .byte4 $$2140 - .byte4 $$2140 - .byte4 $$2140 - .byte4 $$2140 - .byte4 $$2140 - .byte4 $$2140 + .4byte $$2140 + .4byte $$2140 + .4byte $$2140 + .4byte $$2140 + .4byte $$2140 + .4byte $$2140 .4byte 0x7F7F7F7F .4byte 0x7F7F7F00 - .byte4 $$2140 + .4byte $$2140 .4byte 0x7F7F7F7F .4byte 0x7F7F7F00 .global _loc_num_C _loc_num_C: .4byte 0x43000000 .4byte 0 - .byte4 $$2139 - .byte4 $$2140 - .byte4 $$2140 + .4byte $$2139 + .4byte $$2140 + .4byte $$2140 .4byte 0 .global _loc_tim_C _loc_tim_C: .4byte 0x43000000 .4byte 0 - .byte4 $$2141 - .byte4 $$2142 - .byte4 $$2143 - .byte4 $$2144 - .byte4 $$2145 - .byte4 $$2146 - .byte4 $$2147 - .byte4 $$2140 + .4byte $$2141 + .4byte $$2142 + .4byte $$2143 + .4byte $$2144 + .4byte $$2145 + .4byte $$2146 + .4byte $$2147 + .4byte $$2140 .global _current_locale _current_locale: .4byte 0 @@ -159,11 +159,11 @@ _current_locale: .4byte 0 .4byte 0 .4byte 0 - .byte4 _loc_coll_C - .byte4 _loc_ctyp_C - .byte4 _loc_mon_C - .byte4 _loc_num_C - .byte4 _loc_tim_C + .4byte _loc_coll_C + .4byte _loc_ctyp_C + .4byte _loc_mon_C + .4byte _loc_num_C + .4byte _loc_tim_C .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2139 diff --git a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s b/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s index f3731f07..51e26097 100644 --- a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s +++ b/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s @@ -1697,34 +1697,34 @@ $$21130: .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$2284 $$2284: - .byte4 ExPPC_FindExceptionRecord__FPcP15MWExceptionInfo + .4byte ExPPC_FindExceptionRecord__FPcP15MWExceptionInfo .4byte 0x000001B0 - .byte4 $$2283 + .4byte $$2283 .global $$2368 $$2368: - .byte4 ExPPC_NextAction__FP14ActionIterator + .4byte ExPPC_NextAction__FP14ActionIterator .4byte 0x000001B0 - .byte4 $$2367 + .4byte $$2367 .global $$2558 $$2558: - .byte4 ExPPC_PopStackFrame__FP12ThrowContextP15MWExceptionInfo + .4byte ExPPC_PopStackFrame__FP12ThrowContextP15MWExceptionInfo .4byte 0x00000554 - .byte4 $$2557 + .4byte $$2557 .global $$2862 $$2862: - .byte4 ExPPC_UnwindStack__FP12ThrowContextP15MWExceptionInfoPv + .4byte ExPPC_UnwindStack__FP12ThrowContextP15MWExceptionInfoPv .4byte 0x0000050C - .byte4 $$2861 + .4byte $$2861 .global $$2953 $$2953: - .byte4 __unexpected + .4byte __unexpected .4byte 0x000001B8 - .byte4 $$2952 + .4byte $$2952 .global $$21131 $$21131: - .byte4 ExPPC_ThrowHandler__FP12ThrowContext + .4byte ExPPC_ThrowHandler__FP12ThrowContext .4byte 0x00000408 - .byte4 $$21130 + .4byte $$21130 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$21152 @@ -1782,13 +1782,13 @@ $$2860: .4byte 0x80008890 ;# ptr .global __vt__Q23std13bad_exception __vt__Q23std13bad_exception: - .byte4 __RTTI__Q23std13bad_exception + .4byte __RTTI__Q23std13bad_exception .4byte 0 - .byte4 __dt__Q23std13bad_exceptionFv - .byte4 what__Q23std13bad_exceptionCFv + .4byte __dt__Q23std13bad_exceptionFv + .4byte what__Q23std13bad_exceptionCFv .global $$21153 $$21153: - .byte4 __RTTI__Q23std9exception + .4byte __RTTI__Q23std9exception .4byte 0 .4byte 0 .global $$2STRING$$2what__Q23std13bad_exceptionCFv @@ -1800,8 +1800,8 @@ $$2STRING$$2what__Q23std13bad_exceptionCFv: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__Q23std13bad_exception __RTTI__Q23std13bad_exception: - .byte4 $$21152 - .byte4 $$21153 + .4byte $$21152 + .4byte $$21153 .section .bss, "wa" # 0x80496700 - 0x805643FC .global fragmentinfo diff --git a/asm/Runtime.PPCEABI.H/NMWException.s b/asm/Runtime.PPCEABI.H/NMWException.s index 0a17d6a9..0f0ae477 100644 --- a/asm/Runtime.PPCEABI.H/NMWException.s +++ b/asm/Runtime.PPCEABI.H/NMWException.s @@ -429,7 +429,7 @@ $$2340: .4byte 0x00000010 .4byte 0 .4byte 0x82000008 - .byte4 __dt__26__partial_array_destructorFv + .4byte __dt__26__partial_array_destructorFv .global $$2351 $$2351: .4byte 0x18080000 @@ -441,7 +441,7 @@ $$2383: .4byte 0x00000010 .4byte 0 .4byte 0x82000008 - .byte4 __dt__26__partial_array_destructorFv + .4byte __dt__26__partial_array_destructorFv .global $$2401 $$2401: .4byte 0x20080000 @@ -450,29 +450,29 @@ $$2401: .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$2341 $$2341: - .byte4 __construct_new_array + .4byte __construct_new_array .4byte 0x00000104 - .byte4 $$2340 + .4byte $$2340 .global $$2352 $$2352: - .byte4 __dt__26__partial_array_destructorFv + .4byte __dt__26__partial_array_destructorFv .4byte 0x000000BC - .byte4 $$2351 + .4byte $$2351 .global $$2384 $$2384: - .byte4 __construct_array + .4byte __construct_array .4byte 0x000000F8 - .byte4 $$2383 + .4byte $$2383 .global $$2402 $$2402: - .byte4 __destroy_arr + .4byte __destroy_arr .4byte 0x00000078 - .byte4 $$2401 + .4byte $$2401 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global thandler__3std thandler__3std: - .byte4 dthandler__3stdFv + .4byte dthandler__3stdFv .global uhandler__3std uhandler__3std: - .byte4 duhandler__3stdFv + .4byte duhandler__3stdFv diff --git a/asm/Runtime.PPCEABI.H/New.s b/asm/Runtime.PPCEABI.H/New.s index e7de7561..a3ae49de 100644 --- a/asm/Runtime.PPCEABI.H/New.s +++ b/asm/Runtime.PPCEABI.H/New.s @@ -30,9 +30,9 @@ $$2190: .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$2191 $$2191: - .byte4 __dt__Q23std9exceptionFv + .4byte __dt__Q23std9exceptionFv .4byte 0x00000040 - .byte4 $$2190 + .4byte $$2190 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2278 @@ -43,5 +43,5 @@ $$2278: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__Q23std9exception __RTTI__Q23std9exception: - .byte4 $$2278 + .4byte $$2278 .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s b/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s index 3a77bf59..8ac06c93 100644 --- a/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s +++ b/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s @@ -40,15 +40,15 @@ lbl_80007A5C: .section .ctors, "wa" # 0x80406260 - 0x80406540 .global __init_cpp_exceptions_reference __init_cpp_exceptions_reference: - .byte4 __init_cpp_exceptions + .4byte __init_cpp_exceptions .section .dtors, "wa" # 0x80406540 - 0x80406560 .global __destroy_global_chain_reference __destroy_global_chain_reference: - .byte4 __destroy_global_chain + .4byte __destroy_global_chain .global __fini_cpp_exceptions_reference __fini_cpp_exceptions_reference: - .byte4 __fini_cpp_exceptions + .4byte __fini_cpp_exceptions .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global fragmentID diff --git a/asm/ai/ai.s b/asm/ai/ai.s index 931df6d4..447e9694 100644 --- a/asm/ai/ai.s +++ b/asm/ai/ai.s @@ -419,7 +419,7 @@ $$21: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __AIVersion __AIVersion: - .byte4 $$21 + .4byte $$21 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/ax/AX.s b/asm/ax/AX.s index 891e74d2..aab56281 100644 --- a/asm/ax/AX.s +++ b/asm/ax/AX.s @@ -45,7 +45,7 @@ $$21: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __AXVersion __AXVersion: - .byte4 $$21 + .4byte $$21 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/axfx/AXFXHooks.s b/asm/axfx/AXFXHooks.s index 2aaa406f..3d2fb95a 100644 --- a/asm/axfx/AXFXHooks.s +++ b/asm/axfx/AXFXHooks.s @@ -36,7 +36,7 @@ AXFXGetHooks: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __AXFXAlloc __AXFXAlloc: - .byte4 __AXFXAllocFunction + .4byte __AXFXAllocFunction .global __AXFXFree __AXFXFree: - .byte4 __AXFXFreeFunction + .4byte __AXFXFreeFunction diff --git a/asm/bte/bta_dm_act.s b/asm/bte/bta_dm_act.s index 4a0b8877..eff52d9e 100644 --- a/asm/bte/bta_dm_act.s +++ b/asm/bte/bta_dm_act.s @@ -2608,11 +2608,11 @@ bta_service_id_to_btm_srv_id_lkup_tbl: .4byte 0 .global bta_security bta_security: - .byte4 bta_dm_authorize_cback - .byte4 bta_dm_pin_cback - .byte4 bta_dm_new_link_key_cback - .byte4 bta_dm_link_key_request_cback - .byte4 bta_dm_authentication_complete_cback + .4byte bta_dm_authorize_cback + .4byte bta_dm_pin_cback + .4byte bta_dm_new_link_key_cback + .4byte bta_dm_link_key_request_cback + .4byte bta_dm_authentication_complete_cback .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/bte/bta_dm_api.s b/asm/bte/bta_dm_api.s index 452dbdb5..8016abd7 100644 --- a/asm/bte/bta_dm_api.s +++ b/asm/bte/bta_dm_api.s @@ -334,9 +334,9 @@ lbl_8007AE40: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global bta_dm_reg bta_dm_reg: - .byte4 bta_dm_sm_execute + .4byte bta_dm_sm_execute .4byte 0 .global bta_dm_search_reg bta_dm_search_reg: - .byte4 bta_dm_search_sm_execute + .4byte bta_dm_search_sm_execute .4byte 0 diff --git a/asm/bte/bta_dm_cfg.s b/asm/bte/bta_dm_cfg.s index 70261b9c..a8b87b7b 100644 --- a/asm/bte/bta_dm_cfg.s +++ b/asm/bte/bta_dm_cfg.s @@ -51,19 +51,19 @@ bta_dm_pm_md: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global p_bta_dm_rm_cfg p_bta_dm_rm_cfg: - .byte4 bta_dm_rm_cfg + .4byte bta_dm_rm_cfg .global p_bta_dm_compress_cfg p_bta_dm_compress_cfg: - .byte4 bta_dm_compress_cfg + .4byte bta_dm_compress_cfg .global p_bta_dm_pm_cfg p_bta_dm_pm_cfg: - .byte4 bta_dm_pm_cfg + .4byte bta_dm_pm_cfg .global p_bta_dm_pm_spec p_bta_dm_pm_spec: - .byte4 bta_dm_pm_spec + .4byte bta_dm_pm_spec .global p_bta_dm_pm_md p_bta_dm_pm_md: - .byte4 bta_dm_pm_md + .4byte bta_dm_pm_md .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/bte/bta_dm_main.s b/asm/bte/bta_dm_main.s index 753f279e..e972aec8 100644 --- a/asm/bte/bta_dm_main.s +++ b/asm/bte/bta_dm_main.s @@ -102,19 +102,19 @@ lbl_8007AF8C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global bta_dm_action bta_dm_action: - .byte4 bta_dm_enable - .byte4 bta_dm_disable - .byte4 bta_dm_set_dev_name - .byte4 bta_dm_set_visibility - .byte4 bta_dm_bond - .byte4 bta_dm_pin_reply - .byte4 bta_dm_auth_reply - .byte4 bta_dm_signal_strength - .byte4 bta_dm_acl_change - .byte4 bta_dm_pm_btm_status - .byte4 bta_dm_pm_timer - .byte4 bta_dm_keep_acl - .byte4 bta_dm_send_hci_reset + .4byte bta_dm_enable + .4byte bta_dm_disable + .4byte bta_dm_set_dev_name + .4byte bta_dm_set_visibility + .4byte bta_dm_bond + .4byte bta_dm_pin_reply + .4byte bta_dm_auth_reply + .4byte bta_dm_signal_strength + .4byte bta_dm_acl_change + .4byte bta_dm_pm_btm_status + .4byte bta_dm_pm_timer + .4byte bta_dm_keep_acl + .4byte bta_dm_send_hci_reset .global bta_dm_st_table bta_dm_st_table: .4byte 0x000D0001 @@ -130,24 +130,24 @@ bta_dm_st_table: .4byte 0 .global bta_dm_search_action bta_dm_search_action: - .byte4 bta_dm_search_start - .byte4 bta_dm_search_cancel - .byte4 bta_dm_discover - .byte4 bta_dm_inq_cmpl - .byte4 bta_dm_rmt_name - .byte4 bta_dm_sdp_result - .byte4 bta_dm_search_cmpl - .byte4 bta_dm_free_sdp_db - .byte4 bta_dm_disc_result - .byte4 bta_dm_search_result - .byte4 bta_dm_queue_search - .byte4 bta_dm_queue_disc - .byte4 bta_dm_search_clear_queue - .byte4 bta_dm_search_cancel_cmpl - .byte4 bta_dm_search_cancel_notify - .byte4 bta_dm_search_cancel_transac_cmpl - .byte4 bta_dm_disc_rmt_name - .byte4 bta_dm_cancel_rmt_name + .4byte bta_dm_search_start + .4byte bta_dm_search_cancel + .4byte bta_dm_discover + .4byte bta_dm_inq_cmpl + .4byte bta_dm_rmt_name + .4byte bta_dm_sdp_result + .4byte bta_dm_search_cmpl + .4byte bta_dm_free_sdp_db + .4byte bta_dm_disc_result + .4byte bta_dm_search_result + .4byte bta_dm_queue_search + .4byte bta_dm_queue_disc + .4byte bta_dm_search_clear_queue + .4byte bta_dm_search_cancel_cmpl + .4byte bta_dm_search_cancel_notify + .4byte bta_dm_search_cancel_transac_cmpl + .4byte bta_dm_disc_rmt_name + .4byte bta_dm_cancel_rmt_name .global bta_dm_search_idle_st_table bta_dm_search_idle_st_table: .4byte 0x0012010E @@ -186,10 +186,10 @@ bta_dm_search_disc_active_st_table: .4byte 0x08120300 .global bta_dm_search_st_tbl bta_dm_search_st_tbl: - .byte4 bta_dm_search_idle_st_table - .byte4 bta_dm_search_search_active_st_table - .byte4 bta_dm_search_search_cancelling_st_table - .byte4 bta_dm_search_disc_active_st_table + .4byte bta_dm_search_idle_st_table + .4byte bta_dm_search_search_active_st_table + .4byte bta_dm_search_search_cancelling_st_table + .4byte bta_dm_search_disc_active_st_table .section .bss, "wa" # 0x80496700 - 0x805643FC .global bta_dm_search_cb diff --git a/asm/bte/bta_hh_api.s b/asm/bte/bta_hh_api.s index 01f676c3..0a239c86 100644 --- a/asm/bte/bta_hh_api.s +++ b/asm/bte/bta_hh_api.s @@ -287,5 +287,5 @@ $$2863: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global bta_hh_reg bta_hh_reg: - .byte4 bta_hh_hdl_event - .byte4 BTA_HhDisable + .4byte bta_hh_hdl_event + .4byte BTA_HhDisable diff --git a/asm/bte/bta_hh_cfg.s b/asm/bte/bta_hh_cfg.s index 6e01cbfe..17eee5a7 100644 --- a/asm/bte/bta_hh_cfg.s +++ b/asm/bte/bta_hh_cfg.s @@ -4,7 +4,7 @@ .global bta_hh_cfg bta_hh_cfg: .4byte 0x04000000 - .byte4 p_devt_list + .4byte p_devt_list .4byte 0x04000000 .4byte 0 @@ -15,5 +15,5 @@ p_devt_list: .4byte 0x01033102 .global p_bta_hh_cfg p_bta_hh_cfg: - .byte4 bta_hh_cfg + .4byte bta_hh_cfg .4byte 0 diff --git a/asm/bte/bta_hh_main.s b/asm/bte/bta_hh_main.s index 0ab5036e..be7af07d 100644 --- a/asm/bte/bta_hh_main.s +++ b/asm/bte/bta_hh_main.s @@ -403,18 +403,18 @@ lbl_8007DA30: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global bta_hh_action bta_hh_action: - .byte4 bta_hh_api_disc_act - .byte4 bta_hh_open_act - .byte4 bta_hh_close_act - .byte4 bta_hh_data_act - .byte4 bta_hh_ctrl_dat_act - .byte4 bta_hh_handsk_act - .byte4 bta_hh_start_sdp - .byte4 bta_hh_sdp_cmpl - .byte4 bta_hh_write_dev_act - .byte4 bta_hh_get_dscp_act - .byte4 bta_hh_maint_dev_act - .byte4 bta_hh_open_cmpl_act + .4byte bta_hh_api_disc_act + .4byte bta_hh_open_act + .4byte bta_hh_close_act + .4byte bta_hh_data_act + .4byte bta_hh_ctrl_dat_act + .4byte bta_hh_handsk_act + .4byte bta_hh_start_sdp + .4byte bta_hh_sdp_cmpl + .4byte bta_hh_write_dev_act + .4byte bta_hh_get_dscp_act + .4byte bta_hh_maint_dev_act + .4byte bta_hh_open_cmpl_act .global bta_hh_st_idle bta_hh_st_idle: .4byte 0x06020C01 @@ -441,9 +441,9 @@ bta_hh_st_connected: .4byte 0x0A030C03 .global bta_hh_st_tbl bta_hh_st_tbl: - .byte4 bta_hh_st_idle - .byte4 bta_hh_st_w4_conn - .byte4 bta_hh_st_connected + .4byte bta_hh_st_idle + .4byte bta_hh_st_w4_conn + .4byte bta_hh_st_connected .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/bte/bta_sys_cfg.s b/asm/bte/bta_sys_cfg.s index 1bc0dd63..95017553 100644 --- a/asm/bte/bta_sys_cfg.s +++ b/asm/bte/bta_sys_cfg.s @@ -3,7 +3,7 @@ .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global p_bta_sys_cfg p_bta_sys_cfg: - .byte4 bta_sys_cfg + .4byte bta_sys_cfg .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/bte/hcisu_h2.s b/asm/bte/hcisu_h2.s index 3900d35c..82514b16 100644 --- a/asm/bte/hcisu_h2.s +++ b/asm/bte/hcisu_h2.s @@ -492,11 +492,11 @@ hcisu_h2_handle_event: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global hcisu_h2 hcisu_h2: - .byte4 hcisu_h2_init - .byte4 hcisu_h2_open - .byte4 hcisu_h2_close - .byte4 hcisu_h2_send - .byte4 hcisu_h2_handle_event + .4byte hcisu_h2_init + .4byte hcisu_h2_open + .4byte hcisu_h2_close + .4byte hcisu_h2_send + .4byte hcisu_h2_handle_event .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/bte/hidh_conn.s b/asm/bte/hidh_conn.s index bfc21ea6..736bcaae 100644 --- a/asm/bte/hidh_conn.s +++ b/asm/bte/hidh_conn.s @@ -2311,16 +2311,16 @@ hidh_conn_dereg: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global hst_reg_info hst_reg_info: - .byte4 hidh_l2cif_connect_ind - .byte4 hidh_l2cif_connect_cfm + .4byte hidh_l2cif_connect_ind + .4byte hidh_l2cif_connect_cfm .4byte 0 - .byte4 hidh_l2cif_config_ind - .byte4 hidh_l2cif_config_cfm - .byte4 hidh_l2cif_disconnect_ind - .byte4 hidh_l2cif_disconnect_cfm + .4byte hidh_l2cif_config_ind + .4byte hidh_l2cif_config_cfm + .4byte hidh_l2cif_disconnect_ind + .4byte hidh_l2cif_disconnect_cfm .4byte 0 - .byte4 hidh_l2cif_data_ind - .byte4 hidh_l2cif_cong_ind + .4byte hidh_l2cif_data_ind + .4byte hidh_l2cif_cong_ind .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21580 diff --git a/asm/dsp/dsp.s b/asm/dsp/dsp.s index 80b4d27d..d61a80b0 100644 --- a/asm/dsp/dsp.s +++ b/asm/dsp/dsp.s @@ -203,7 +203,7 @@ $$22200: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __DSPVersion __DSPVersion: - .byte4 $$21 + .4byte $$21 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/dvd/dvd.s b/asm/dvd/dvd.s index 8a9d61b7..445f6340 100644 --- a/asm/dvd/dvd.s +++ b/asm/dvd/dvd.s @@ -5908,13 +5908,13 @@ $$25139: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __DVDVersion __DVDVersion: - .byte4 $$21 + .4byte $$21 .global autoInvalidation autoInvalidation: .4byte 0x00000001 .global checkOptionalCommand checkOptionalCommand: - .byte4 defaultOptionalCommandChecker + .4byte defaultOptionalCommandChecker .global $$24254 $$24254: .asciz "dvd.c" diff --git a/asm/dvd/dvdDeviceError.s b/asm/dvd/dvdDeviceError.s index bee0f57c..87ec563a 100644 --- a/asm/dvd/dvdDeviceError.s +++ b/asm/dvd/dvdDeviceError.s @@ -196,13 +196,13 @@ lbl_800401C0: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global __DVDDeviceErrorMessage __DVDDeviceErrorMessage: - .byte4 $$2835 - .byte4 $$2836 - .byte4 $$2837 - .byte4 $$2838 - .byte4 $$2839 - .byte4 $$2840 - .byte4 $$2841 + .4byte $$2835 + .4byte $$2836 + .4byte $$2837 + .4byte $$2838 + .4byte $$2839 + .4byte $$2840 + .4byte $$2841 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/dvd/dvdFatal.s b/asm/dvd/dvdFatal.s index 9c31f519..aac47672 100644 --- a/asm/dvd/dvdFatal.s +++ b/asm/dvd/dvdFatal.s @@ -116,22 +116,22 @@ __DVDPrintFatalMessage: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global __DVDErrorMessageDefault __DVDErrorMessageDefault: - .byte4 $$21462 - .byte4 $$21463 - .byte4 $$21464 - .byte4 $$21465 - .byte4 $$21466 - .byte4 $$21467 - .byte4 $$21468 + .4byte $$21462 + .4byte $$21463 + .4byte $$21464 + .4byte $$21465 + .4byte $$21466 + .4byte $$21467 + .4byte $$21468 .global __DVDErrorMessageEurope __DVDErrorMessageEurope: - .byte4 $$21462 - .byte4 $$21469 - .byte4 $$21464 - .byte4 $$21470 - .byte4 $$21471 - .byte4 $$21467 - .byte4 $$21468 + .4byte $$21462 + .4byte $$21469 + .4byte $$21464 + .4byte $$21470 + .4byte $$21471 + .4byte $$21467 + .4byte $$21468 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21462 @@ -428,8 +428,8 @@ $$21473: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __DVDErrorMessageChinaKorea __DVDErrorMessageChinaKorea: - .byte4 $$21472 - .byte4 $$21473 + .4byte $$21472 + .4byte $$21473 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21482 diff --git a/asm/enc/encutility.s b/asm/enc/encutility.s index b1347016..9f2f16dd 100644 --- a/asm/enc/encutility.s +++ b/asm/enc/encutility.s @@ -183,7 +183,7 @@ $$2669: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __ENCVersion __ENCVersion: - .byte4 $$2669 + .4byte $$2669 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/exi/EXIBios.s b/asm/exi/EXIBios.s index 288da28f..28c21861 100644 --- a/asm/exi/EXIBios.s +++ b/asm/exi/EXIBios.s @@ -1787,7 +1787,7 @@ $$21: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __EXIVersion __EXIVersion: - .byte4 $$21 + .4byte $$21 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/gx/GXInit.s b/asm/gx/GXInit.s index 6b84c77e..7647d08a 100644 --- a/asm/gx/GXInit.s +++ b/asm/gx/GXInit.s @@ -1313,7 +1313,7 @@ GXTexRegionAddrTable: .4byte 0x00070000 .global GXShutdownFuncInfo GXShutdownFuncInfo: - .byte4 __GXShutdown + .4byte __GXShutdown .4byte 0x0000007F .4byte 0 .4byte 0 @@ -1321,13 +1321,13 @@ GXShutdownFuncInfo: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __GXVersion __GXVersion: - .byte4 $$21 + .4byte $$21 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global __GXData __GXData: - .byte4 gxData + .4byte gxData .global $$22712 $$22712: .4byte 0x4B800000 diff --git a/asm/homebuttonLib/HBMAnmController.s b/asm/homebuttonLib/HBMAnmController.s index 71a4321e..d14e3000 100644 --- a/asm/homebuttonLib/HBMAnmController.s +++ b/asm/homebuttonLib/HBMAnmController.s @@ -73,21 +73,21 @@ lbl_80128838: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q210homebutton18GroupAnmController __vt__Q210homebutton18GroupAnmController: - .byte4 __RTTI__Q210homebutton18GroupAnmController + .4byte __RTTI__Q210homebutton18GroupAnmController .4byte 0 - .byte4 __dt__Q210homebutton18GroupAnmControllerFv - .byte4 calc__Q210homebutton15FrameControllerFv + .4byte __dt__Q210homebutton18GroupAnmControllerFv + .4byte calc__Q210homebutton15FrameControllerFv .global $$28022 $$28022: .asciz "homebutton::GroupAnmController" .balign 4 .global $$28023 $$28023: - .byte4 __RTTI__Q210homebutton15FrameController + .4byte __RTTI__Q210homebutton15FrameController .4byte 0 .4byte 0 .4byte 0 .global __RTTI__Q210homebutton18GroupAnmController __RTTI__Q210homebutton18GroupAnmController: - .byte4 $$28022 - .byte4 $$28023 + .4byte $$28022 + .4byte $$28023 diff --git a/asm/homebuttonLib/HBMAxSound.s b/asm/homebuttonLib/HBMAxSound.s index 59bcda47..64625734 100644 --- a/asm/homebuttonLib/HBMAxSound.s +++ b/asm/homebuttonLib/HBMAxSound.s @@ -947,34 +947,34 @@ $$26802: .balign 4 .global $$2LOCAL$$2GetMidiDataFromArc__24$$2unnamed$$2HBMAxSound_cpp$$2Fi$$2SOUND_FILENAME $$2LOCAL$$2GetMidiDataFromArc__24$$2unnamed$$2HBMAxSound_cpp$$2Fi$$2SOUND_FILENAME: - .byte4 $$26775 - .byte4 $$26776 - .byte4 $$26777 - .byte4 $$26778 - .byte4 $$26779 - .byte4 $$26780 - .byte4 $$26781 - .byte4 $$26782 - .byte4 $$26783 - .byte4 $$26784 - .byte4 $$26785 - .byte4 $$26786 - .byte4 $$26787 - .byte4 $$26788 - .byte4 $$26789 - .byte4 $$26790 - .byte4 $$26791 - .byte4 $$26792 - .byte4 $$26793 - .byte4 $$26794 - .byte4 $$26795 - .byte4 $$26796 - .byte4 $$26797 - .byte4 $$26798 - .byte4 $$26799 - .byte4 $$26800 - .byte4 $$26801 - .byte4 $$26802 + .4byte $$26775 + .4byte $$26776 + .4byte $$26777 + .4byte $$26778 + .4byte $$26779 + .4byte $$26780 + .4byte $$26781 + .4byte $$26782 + .4byte $$26783 + .4byte $$26784 + .4byte $$26785 + .4byte $$26786 + .4byte $$26787 + .4byte $$26788 + .4byte $$26789 + .4byte $$26790 + .4byte $$26791 + .4byte $$26792 + .4byte $$26793 + .4byte $$26794 + .4byte $$26795 + .4byte $$26796 + .4byte $$26797 + .4byte $$26798 + .4byte $$26799 + .4byte $$26800 + .4byte $$26801 + .4byte $$26802 .section .bss, "wa" # 0x80496700 - 0x805643FC .global sWork__24$$2unnamed$$2HBMAxSound_cpp$$2 diff --git a/asm/homebuttonLib/HBMBase.s b/asm/homebuttonLib/HBMBase.s index 96dc19bf..ad46fe14 100644 --- a/asm/homebuttonLib/HBMBase.s +++ b/asm/homebuttonLib/HBMBase.s @@ -10034,30 +10034,30 @@ $$29524: .balign 4 .global scCursorLytName__Q210homebutton10HomeButton scCursorLytName__Q210homebutton10HomeButton: - .byte4 $$29521 - .byte4 $$29522 - .byte4 $$29523 - .byte4 $$29524 + .4byte $$29521 + .4byte $$29522 + .4byte $$29523 + .4byte $$29524 .global $$29525 $$29525: .asciz "N_Trans" .global scCursorPaneName__Q210homebutton10HomeButton scCursorPaneName__Q210homebutton10HomeButton: - .byte4 $$29525 + .4byte $$29525 .global $$29526 $$29526: .asciz "N_Rot" .balign 4 .global scCursorRotPaneName__Q210homebutton10HomeButton scCursorRotPaneName__Q210homebutton10HomeButton: - .byte4 $$29526 + .4byte $$29526 .global $$29527 $$29527: .asciz "N_SRot" .balign 4 .global scCursorSRotPaneName__Q210homebutton10HomeButton scCursorSRotPaneName__Q210homebutton10HomeButton: - .byte4 $$29527 + .4byte $$29527 .global $$29528 $$29528: .asciz "B_btnL_00" @@ -10072,9 +10072,9 @@ $$29530: .balign 4 .global scBtnName__Q210homebutton10HomeButton scBtnName__Q210homebutton10HomeButton: - .byte4 $$29528 - .byte4 $$29529 - .byte4 $$29530 + .4byte $$29528 + .4byte $$29529 + .4byte $$29530 .4byte 0 .global $$29531 $$29531: @@ -10091,9 +10091,9 @@ $$29533: .4byte 0 .global scTxtName__Q210homebutton10HomeButton scTxtName__Q210homebutton10HomeButton: - .byte4 $$29531 - .byte4 $$29532 - .byte4 $$29533 + .4byte $$29531 + .4byte $$29532 + .4byte $$29533 .4byte 0 .global $$29534 $$29534: @@ -10125,14 +10125,14 @@ $$29541: .asciz "btnL_11_psh" .global scGrName__Q210homebutton10HomeButton scGrName__Q210homebutton10HomeButton: - .byte4 $$29534 - .byte4 $$29535 - .byte4 $$29536 - .byte4 $$29537 - .byte4 $$29538 - .byte4 $$29539 - .byte4 $$29540 - .byte4 $$29541 + .4byte $$29534 + .4byte $$29535 + .4byte $$29536 + .4byte $$29537 + .4byte $$29538 + .4byte $$29539 + .4byte $$29540 + .4byte $$29541 .global $$29542 $$29542: .asciz "_cntBtn_in.brlan" @@ -10147,9 +10147,9 @@ $$29544: .balign 4 .global scAnimName__Q210homebutton10HomeButton scAnimName__Q210homebutton10HomeButton: - .byte4 $$29542 - .byte4 $$29543 - .byte4 $$29544 + .4byte $$29542 + .4byte $$29543 + .4byte $$29544 .global $$29545 $$29545: .asciz "_ltrIcn_on.brlan" @@ -10207,21 +10207,21 @@ $$29559: .asciz "_12btn_on.brlan" .global scPairGroupAnimName__Q210homebutton10HomeButton scPairGroupAnimName__Q210homebutton10HomeButton: - .byte4 $$29545 - .byte4 $$29546 - .byte4 $$29547 - .byte4 $$29548 - .byte4 $$29549 - .byte4 $$29550 - .byte4 $$29551 - .byte4 $$29552 - .byte4 $$29553 - .byte4 $$29554 - .byte4 $$29555 - .byte4 $$29556 - .byte4 $$29557 - .byte4 $$29558 - .byte4 $$29559 + .4byte $$29545 + .4byte $$29546 + .4byte $$29547 + .4byte $$29548 + .4byte $$29549 + .4byte $$29550 + .4byte $$29551 + .4byte $$29552 + .4byte $$29553 + .4byte $$29554 + .4byte $$29555 + .4byte $$29556 + .4byte $$29557 + .4byte $$29558 + .4byte $$29559 .global $$29560 $$29560: .asciz "ltrIcn_on" @@ -10282,21 +10282,21 @@ $$29574: .balign 4 .global scPairGroupName__Q210homebutton10HomeButton scPairGroupName__Q210homebutton10HomeButton: - .byte4 $$29560 - .byte4 $$29561 - .byte4 $$29562 - .byte4 $$29563 - .byte4 $$29564 - .byte4 $$29565 - .byte4 $$29566 - .byte4 $$29567 - .byte4 $$29568 - .byte4 $$29569 - .byte4 $$29570 - .byte4 $$29571 - .byte4 $$29572 - .byte4 $$29573 - .byte4 $$29574 + .4byte $$29560 + .4byte $$29561 + .4byte $$29562 + .4byte $$29563 + .4byte $$29564 + .4byte $$29565 + .4byte $$29566 + .4byte $$29567 + .4byte $$29568 + .4byte $$29569 + .4byte $$29570 + .4byte $$29571 + .4byte $$29572 + .4byte $$29573 + .4byte $$29574 .global $$29575 $$29575: .asciz "_hmMenu_strt.brlan" @@ -10382,28 +10382,28 @@ $$29596: .asciz "_btry_red.brlan" .global scGroupAnimName__Q210homebutton10HomeButton scGroupAnimName__Q210homebutton10HomeButton: - .byte4 $$29575 - .byte4 $$29576 - .byte4 $$29577 - .byte4 $$29578 - .byte4 $$29579 - .byte4 $$29580 - .byte4 $$29581 - .byte4 $$29582 - .byte4 $$29583 - .byte4 $$29584 - .byte4 $$29585 - .byte4 $$29586 - .byte4 $$29587 - .byte4 $$29588 - .byte4 $$29589 - .byte4 $$29590 - .byte4 $$29591 - .byte4 $$29592 - .byte4 $$29593 - .byte4 $$29594 - .byte4 $$29595 - .byte4 $$29596 + .4byte $$29575 + .4byte $$29576 + .4byte $$29577 + .4byte $$29578 + .4byte $$29579 + .4byte $$29580 + .4byte $$29581 + .4byte $$29582 + .4byte $$29583 + .4byte $$29584 + .4byte $$29585 + .4byte $$29586 + .4byte $$29587 + .4byte $$29588 + .4byte $$29589 + .4byte $$29590 + .4byte $$29591 + .4byte $$29592 + .4byte $$29593 + .4byte $$29594 + .4byte $$29595 + .4byte $$29596 .global $$29597 $$29597: .asciz "hmMenu_strt" @@ -10538,41 +10538,41 @@ $$29631: .asciz "plyr_03" .global scGroupName__Q210homebutton10HomeButton scGroupName__Q210homebutton10HomeButton: - .byte4 $$29597 - .byte4 $$29598 - .byte4 $$29599 - .byte4 $$29600 - .byte4 $$29601 - .byte4 $$29602 - .byte4 $$29603 - .byte4 $$29604 - .byte4 $$29605 - .byte4 $$29606 - .byte4 $$29607 - .byte4 $$29608 - .byte4 $$29609 - .byte4 $$29610 - .byte4 $$29611 - .byte4 $$29612 - .byte4 $$29613 - .byte4 $$29614 - .byte4 $$29615 - .byte4 $$29616 - .byte4 $$29617 - .byte4 $$29618 - .byte4 $$29619 - .byte4 $$29620 - .byte4 $$29621 - .byte4 $$29622 - .byte4 $$29623 - .byte4 $$29624 - .byte4 $$29625 - .byte4 $$29626 - .byte4 $$29627 - .byte4 $$29628 - .byte4 $$29629 - .byte4 $$29630 - .byte4 $$29631 + .4byte $$29597 + .4byte $$29598 + .4byte $$29599 + .4byte $$29600 + .4byte $$29601 + .4byte $$29602 + .4byte $$29603 + .4byte $$29604 + .4byte $$29605 + .4byte $$29606 + .4byte $$29607 + .4byte $$29608 + .4byte $$29609 + .4byte $$29610 + .4byte $$29611 + .4byte $$29612 + .4byte $$29613 + .4byte $$29614 + .4byte $$29615 + .4byte $$29616 + .4byte $$29617 + .4byte $$29618 + .4byte $$29619 + .4byte $$29620 + .4byte $$29621 + .4byte $$29622 + .4byte $$29623 + .4byte $$29624 + .4byte $$29625 + .4byte $$29626 + .4byte $$29627 + .4byte $$29628 + .4byte $$29629 + .4byte $$29630 + .4byte $$29631 .global $$29632 $$29632: .asciz "let_icn_00" @@ -10595,11 +10595,11 @@ $$29636: .balign 4 .global scFuncPaneName__Q210homebutton10HomeButton scFuncPaneName__Q210homebutton10HomeButton: - .byte4 $$29632 - .byte4 $$29633 - .byte4 $$29634 - .byte4 $$29635 - .byte4 $$29636 + .4byte $$29632 + .4byte $$29633 + .4byte $$29634 + .4byte $$29635 + .4byte $$29636 .global $$29637 $$29637: .asciz "B_btn_00" @@ -10642,16 +10642,16 @@ $$29646: .balign 4 .global scFuncTouchPaneName__Q210homebutton10HomeButton scFuncTouchPaneName__Q210homebutton10HomeButton: - .byte4 $$29637 - .byte4 $$29638 - .byte4 $$29639 - .byte4 $$29640 - .byte4 $$29641 - .byte4 $$29642 - .byte4 $$29643 - .byte4 $$29644 - .byte4 $$29645 - .byte4 $$29646 + .4byte $$29637 + .4byte $$29638 + .4byte $$29639 + .4byte $$29640 + .4byte $$29641 + .4byte $$29642 + .4byte $$29643 + .4byte $$29644 + .4byte $$29645 + .4byte $$29646 .global $$29647 $$29647: .asciz "T_msg_00" @@ -10666,9 +10666,9 @@ $$29649: .balign 4 .global scFuncTextPaneName__Q210homebutton10HomeButton scFuncTextPaneName__Q210homebutton10HomeButton: - .byte4 $$29647 - .byte4 $$29648 - .byte4 $$29649 + .4byte $$29647 + .4byte $$29648 + .4byte $$29649 .global $$29650 $$29650: .asciz "btryPwr_00_0" @@ -10735,22 +10735,22 @@ $$29665: .balign 4 .global scBatteryPaneName__Q210homebutton10HomeButton scBatteryPaneName__Q210homebutton10HomeButton: - .byte4 $$29650 - .byte4 $$29651 - .byte4 $$29652 - .byte4 $$29653 - .byte4 $$29654 - .byte4 $$29655 - .byte4 $$29656 - .byte4 $$29657 - .byte4 $$29658 - .byte4 $$29659 - .byte4 $$29660 - .byte4 $$29661 - .byte4 $$29662 - .byte4 $$29663 - .byte4 $$29664 - .byte4 $$29665 + .4byte $$29650 + .4byte $$29651 + .4byte $$29652 + .4byte $$29653 + .4byte $$29654 + .4byte $$29655 + .4byte $$29656 + .4byte $$29657 + .4byte $$29658 + .4byte $$29659 + .4byte $$29660 + .4byte $$29661 + .4byte $$29662 + .4byte $$29663 + .4byte $$29664 + .4byte $$29665 .global $$216076 $$216076: .4byte 0x61726300 @@ -10843,36 +10843,36 @@ $$218596: .4byte 0 .global __vt__Q210homebutton22HomeButtonEventHandler __vt__Q210homebutton22HomeButtonEventHandler: - .byte4 __RTTI__Q210homebutton22HomeButtonEventHandler + .4byte __RTTI__Q210homebutton22HomeButtonEventHandler .4byte 0 - .byte4 onEvent__Q210homebutton22HomeButtonEventHandlerFUlUlPv - .byte4 setManager__Q310homebutton3gui12EventHandlerFPQ310homebutton3gui7Manager + .4byte onEvent__Q210homebutton22HomeButtonEventHandlerFUlUlPv + .4byte setManager__Q310homebutton3gui12EventHandlerFPQ310homebutton3gui7Manager .global $$211453 $$211453: .asciz "homebutton::HomeButtonEventHandler" .balign 4 .global $$211454 $$211454: - .byte4 __RTTI__Q310homebutton3gui12EventHandler + .4byte __RTTI__Q310homebutton3gui12EventHandler .4byte 0 .4byte 0 .global __RTTI__Q210homebutton22HomeButtonEventHandler __RTTI__Q210homebutton22HomeButtonEventHandler: - .byte4 $$211453 - .byte4 $$211454 + .4byte $$211453 + .4byte $$211454 .global __vt__Q310homebutton3gui12EventHandler __vt__Q310homebutton3gui12EventHandler: - .byte4 __RTTI__Q310homebutton3gui12EventHandler + .4byte __RTTI__Q310homebutton3gui12EventHandler .4byte 0 - .byte4 onEvent__Q310homebutton3gui12EventHandlerFUlUlPv - .byte4 setManager__Q310homebutton3gui12EventHandlerFPQ310homebutton3gui7Manager + .4byte onEvent__Q310homebutton3gui12EventHandlerFUlUlPv + .4byte setManager__Q310homebutton3gui12EventHandlerFPQ310homebutton3gui7Manager .global $$211456 $$211456: .asciz "homebutton::gui::EventHandler" .balign 4 .global __RTTI__Q310homebutton3gui12EventHandler __RTTI__Q310homebutton3gui12EventHandler: - .byte4 $$211456 + .4byte $$211456 .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/homebuttonLib/HBMCommon.s b/asm/homebuttonLib/HBMCommon.s index eec6414c..391e359d 100644 --- a/asm/homebuttonLib/HBMCommon.s +++ b/asm/homebuttonLib/HBMCommon.s @@ -287,10 +287,10 @@ $$29367: .balign 4 .global __HBMVersion __HBMVersion: - .byte4 $$29367 + .4byte $$29367 .global spAllocator spAllocator: - .byte4 sAllocator + .4byte sAllocator .section .bss, "wa" # 0x80496700 - 0x805643FC .global sAllocator diff --git a/asm/homebuttonLib/HBMFrameController.s b/asm/homebuttonLib/HBMFrameController.s index 7dfc8866..0ab940a9 100644 --- a/asm/homebuttonLib/HBMFrameController.s +++ b/asm/homebuttonLib/HBMFrameController.s @@ -140,5 +140,5 @@ $$22206: .4byte 0 .global __RTTI__Q210homebutton15FrameController __RTTI__Q210homebutton15FrameController: - .byte4 $$22206 + .4byte $$22206 .4byte 0 diff --git a/asm/homebuttonLib/HBMGUIManager.s b/asm/homebuttonLib/HBMGUIManager.s index 04a70625..30e379b1 100644 --- a/asm/homebuttonLib/HBMGUIManager.s +++ b/asm/homebuttonLib/HBMGUIManager.s @@ -1818,146 +1818,146 @@ $$2LOCAL$$2drawLine___Q210homebutton3guiFfffffUcR8_GXColor$$2cubeScale: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q310homebutton3gui13PaneComponent __vt__Q310homebutton3gui13PaneComponent: - .byte4 __RTTI__Q310homebutton3gui13PaneComponent + .4byte __RTTI__Q310homebutton3gui13PaneComponent .4byte 0 - .byte4 create__Q310homebutton3gui9InterfaceFv - .byte4 init__Q310homebutton3gui9ComponentFv - .byte4 calc__Q310homebutton3gui9InterfaceFv - .byte4 draw__Q310homebutton3gui9InterfaceFRA3_A4_f - .byte4 draw__Q310homebutton3gui13PaneComponentFv - .byte4 __dt__Q310homebutton3gui13PaneComponentFv - .byte4 getID__Q310homebutton3gui9ComponentFv - .byte4 isPointed__Q310homebutton3gui9ComponentFi - .byte4 setPointed__Q310homebutton3gui9ComponentFib - .byte4 onPoint__Q310homebutton3gui9ComponentFv - .byte4 offPoint__Q310homebutton3gui9ComponentFv - .byte4 onDrag__Q310homebutton3gui9ComponentFff - .byte4 onMove__Q310homebutton3gui9ComponentFff - .byte4 onTrig__Q310homebutton3gui9ComponentFUlR3Vec - .byte4 setDraggingButton__Q310homebutton3gui9ComponentFUl - .byte4 update__Q310homebutton3gui9ComponentFiPC10KPADStatusffPv - .byte4 update__Q310homebutton3gui9ComponentFiffUlUlUlPv - .byte4 isTriggerTarger__Q310homebutton3gui9ComponentFv - .byte4 setTriggerTarget__Q310homebutton3gui9ComponentFb - .byte4 setManager__Q310homebutton3gui9ComponentFPQ310homebutton3gui7Manager - .byte4 isVisible__Q310homebutton3gui13PaneComponentFv - .byte4 contain__Q310homebutton3gui13PaneComponentFff - .byte4 setPane__Q310homebutton3gui13PaneComponentFPQ36nw4hbm3lyt4Pane - .byte4 getPane__Q310homebutton3gui13PaneComponentFv + .4byte create__Q310homebutton3gui9InterfaceFv + .4byte init__Q310homebutton3gui9ComponentFv + .4byte calc__Q310homebutton3gui9InterfaceFv + .4byte draw__Q310homebutton3gui9InterfaceFRA3_A4_f + .4byte draw__Q310homebutton3gui13PaneComponentFv + .4byte __dt__Q310homebutton3gui13PaneComponentFv + .4byte getID__Q310homebutton3gui9ComponentFv + .4byte isPointed__Q310homebutton3gui9ComponentFi + .4byte setPointed__Q310homebutton3gui9ComponentFib + .4byte onPoint__Q310homebutton3gui9ComponentFv + .4byte offPoint__Q310homebutton3gui9ComponentFv + .4byte onDrag__Q310homebutton3gui9ComponentFff + .4byte onMove__Q310homebutton3gui9ComponentFff + .4byte onTrig__Q310homebutton3gui9ComponentFUlR3Vec + .4byte setDraggingButton__Q310homebutton3gui9ComponentFUl + .4byte update__Q310homebutton3gui9ComponentFiPC10KPADStatusffPv + .4byte update__Q310homebutton3gui9ComponentFiffUlUlUlPv + .4byte isTriggerTarger__Q310homebutton3gui9ComponentFv + .4byte setTriggerTarget__Q310homebutton3gui9ComponentFb + .4byte setManager__Q310homebutton3gui9ComponentFPQ310homebutton3gui7Manager + .4byte isVisible__Q310homebutton3gui13PaneComponentFv + .4byte contain__Q310homebutton3gui13PaneComponentFff + .4byte setPane__Q310homebutton3gui13PaneComponentFPQ36nw4hbm3lyt4Pane + .4byte getPane__Q310homebutton3gui13PaneComponentFv .global $$29429 $$29429: .asciz "homebutton::gui::PaneComponent" .balign 4 .global $$29430 $$29430: - .byte4 __RTTI__Q310homebutton3gui9Interface + .4byte __RTTI__Q310homebutton3gui9Interface .4byte 0 - .byte4 __RTTI__Q310homebutton3gui9Component + .4byte __RTTI__Q310homebutton3gui9Component .4byte 0 .4byte 0 .4byte 0 .global __RTTI__Q310homebutton3gui13PaneComponent __RTTI__Q310homebutton3gui13PaneComponent: - .byte4 $$29429 - .byte4 $$29430 + .4byte $$29429 + .4byte $$29430 .global __vt__Q310homebutton3gui11PaneManager __vt__Q310homebutton3gui11PaneManager: - .byte4 __RTTI__Q310homebutton3gui11PaneManager + .4byte __RTTI__Q310homebutton3gui11PaneManager .4byte 0 - .byte4 create__Q310homebutton3gui9InterfaceFv - .byte4 init__Q310homebutton3gui7ManagerFv - .byte4 calc__Q310homebutton3gui7ManagerFv - .byte4 draw__Q310homebutton3gui9InterfaceFRA3_A4_f - .byte4 draw__Q310homebutton3gui7ManagerFv - .byte4 __dt__Q310homebutton3gui11PaneManagerFv - .byte4 addComponent__Q310homebutton3gui7ManagerFPQ310homebutton3gui9Component - .byte4 delComponent__Q310homebutton3gui7ManagerFPQ310homebutton3gui9Component - .byte4 getComponent__Q310homebutton3gui7ManagerFUl - .byte4 update__Q310homebutton3gui7ManagerFiPC10KPADStatusffPv - .byte4 update__Q310homebutton3gui7ManagerFiffUlUlUlPv - .byte4 onEvent__Q310homebutton3gui7ManagerFUlUlPv - .byte4 setAllComponentTriggerTarget__Q310homebutton3gui7ManagerFb - .byte4 setEventHandler__Q310homebutton3gui7ManagerFPQ310homebutton3gui12EventHandler - .byte4 createLayoutScene__Q310homebutton3gui11PaneManagerFRCQ36nw4hbm3lyt6Layout - .byte4 addLayoutScene__Q310homebutton3gui11PaneManagerFRCQ36nw4hbm3lyt6Layout - .byte4 delLayoutScene__Q310homebutton3gui11PaneManagerFRCQ36nw4hbm3lyt6Layout - .byte4 getPaneComponentByPane__Q310homebutton3gui11PaneManagerFPQ36nw4hbm3lyt4Pane - .byte4 getDrawInfo__Q310homebutton3gui11PaneManagerFv - .byte4 setDrawInfo__Q310homebutton3gui11PaneManagerFPCQ36nw4hbm3lyt8DrawInfo - .byte4 setAllBoundingBoxComponentTriggerTarget__Q310homebutton3gui11PaneManagerFb - .byte4 walkInChildren__Q310homebutton3gui11PaneManagerFRQ36nw4hbm2ut30LinkList$$0Q36nw4hbm3lyt4Pane$$44$$1 - .byte4 walkInChildrenDel__Q310homebutton3gui11PaneManagerFRQ36nw4hbm2ut30LinkList$$0Q36nw4hbm3lyt4Pane$$44$$1 + .4byte create__Q310homebutton3gui9InterfaceFv + .4byte init__Q310homebutton3gui7ManagerFv + .4byte calc__Q310homebutton3gui7ManagerFv + .4byte draw__Q310homebutton3gui9InterfaceFRA3_A4_f + .4byte draw__Q310homebutton3gui7ManagerFv + .4byte __dt__Q310homebutton3gui11PaneManagerFv + .4byte addComponent__Q310homebutton3gui7ManagerFPQ310homebutton3gui9Component + .4byte delComponent__Q310homebutton3gui7ManagerFPQ310homebutton3gui9Component + .4byte getComponent__Q310homebutton3gui7ManagerFUl + .4byte update__Q310homebutton3gui7ManagerFiPC10KPADStatusffPv + .4byte update__Q310homebutton3gui7ManagerFiffUlUlUlPv + .4byte onEvent__Q310homebutton3gui7ManagerFUlUlPv + .4byte setAllComponentTriggerTarget__Q310homebutton3gui7ManagerFb + .4byte setEventHandler__Q310homebutton3gui7ManagerFPQ310homebutton3gui12EventHandler + .4byte createLayoutScene__Q310homebutton3gui11PaneManagerFRCQ36nw4hbm3lyt6Layout + .4byte addLayoutScene__Q310homebutton3gui11PaneManagerFRCQ36nw4hbm3lyt6Layout + .4byte delLayoutScene__Q310homebutton3gui11PaneManagerFRCQ36nw4hbm3lyt6Layout + .4byte getPaneComponentByPane__Q310homebutton3gui11PaneManagerFPQ36nw4hbm3lyt4Pane + .4byte getDrawInfo__Q310homebutton3gui11PaneManagerFv + .4byte setDrawInfo__Q310homebutton3gui11PaneManagerFPCQ36nw4hbm3lyt8DrawInfo + .4byte setAllBoundingBoxComponentTriggerTarget__Q310homebutton3gui11PaneManagerFb + .4byte walkInChildren__Q310homebutton3gui11PaneManagerFRQ36nw4hbm2ut30LinkList$$0Q36nw4hbm3lyt4Pane$$44$$1 + .4byte walkInChildrenDel__Q310homebutton3gui11PaneManagerFRQ36nw4hbm2ut30LinkList$$0Q36nw4hbm3lyt4Pane$$44$$1 .global $$29431 $$29431: .asciz "homebutton::gui::PaneManager" .balign 4 .global $$29432 $$29432: - .byte4 __RTTI__Q310homebutton3gui9Interface + .4byte __RTTI__Q310homebutton3gui9Interface .4byte 0 - .byte4 __RTTI__Q310homebutton3gui7Manager + .4byte __RTTI__Q310homebutton3gui7Manager .4byte 0 .4byte 0 .global __RTTI__Q310homebutton3gui11PaneManager __RTTI__Q310homebutton3gui11PaneManager: - .byte4 $$29431 - .byte4 $$29432 + .4byte $$29431 + .4byte $$29432 .global __vt__Q310homebutton3gui7Manager __vt__Q310homebutton3gui7Manager: - .byte4 __RTTI__Q310homebutton3gui7Manager + .4byte __RTTI__Q310homebutton3gui7Manager .4byte 0 - .byte4 create__Q310homebutton3gui9InterfaceFv - .byte4 init__Q310homebutton3gui7ManagerFv - .byte4 calc__Q310homebutton3gui7ManagerFv - .byte4 draw__Q310homebutton3gui9InterfaceFRA3_A4_f - .byte4 draw__Q310homebutton3gui7ManagerFv - .byte4 __dt__Q310homebutton3gui7ManagerFv - .byte4 addComponent__Q310homebutton3gui7ManagerFPQ310homebutton3gui9Component - .byte4 delComponent__Q310homebutton3gui7ManagerFPQ310homebutton3gui9Component - .byte4 getComponent__Q310homebutton3gui7ManagerFUl - .byte4 update__Q310homebutton3gui7ManagerFiPC10KPADStatusffPv - .byte4 update__Q310homebutton3gui7ManagerFiffUlUlUlPv - .byte4 onEvent__Q310homebutton3gui7ManagerFUlUlPv - .byte4 setAllComponentTriggerTarget__Q310homebutton3gui7ManagerFb - .byte4 setEventHandler__Q310homebutton3gui7ManagerFPQ310homebutton3gui12EventHandler + .4byte create__Q310homebutton3gui9InterfaceFv + .4byte init__Q310homebutton3gui7ManagerFv + .4byte calc__Q310homebutton3gui7ManagerFv + .4byte draw__Q310homebutton3gui9InterfaceFRA3_A4_f + .4byte draw__Q310homebutton3gui7ManagerFv + .4byte __dt__Q310homebutton3gui7ManagerFv + .4byte addComponent__Q310homebutton3gui7ManagerFPQ310homebutton3gui9Component + .4byte delComponent__Q310homebutton3gui7ManagerFPQ310homebutton3gui9Component + .4byte getComponent__Q310homebutton3gui7ManagerFUl + .4byte update__Q310homebutton3gui7ManagerFiPC10KPADStatusffPv + .4byte update__Q310homebutton3gui7ManagerFiffUlUlUlPv + .4byte onEvent__Q310homebutton3gui7ManagerFUlUlPv + .4byte setAllComponentTriggerTarget__Q310homebutton3gui7ManagerFb + .4byte setEventHandler__Q310homebutton3gui7ManagerFPQ310homebutton3gui12EventHandler .global $$29433 $$29433: .asciz "homebutton::gui::Manager" .balign 4 .global $$29434 $$29434: - .byte4 __RTTI__Q310homebutton3gui9Interface + .4byte __RTTI__Q310homebutton3gui9Interface .4byte 0 .4byte 0 .global __RTTI__Q310homebutton3gui7Manager __RTTI__Q310homebutton3gui7Manager: - .byte4 $$29433 - .byte4 $$29434 + .4byte $$29433 + .4byte $$29434 .global __vt__Q310homebutton3gui9Component __vt__Q310homebutton3gui9Component: - .byte4 __RTTI__Q310homebutton3gui9Component + .4byte __RTTI__Q310homebutton3gui9Component .4byte 0 - .byte4 create__Q310homebutton3gui9InterfaceFv - .byte4 init__Q310homebutton3gui9ComponentFv - .byte4 calc__Q310homebutton3gui9InterfaceFv - .byte4 draw__Q310homebutton3gui9InterfaceFRA3_A4_f - .byte4 draw__Q310homebutton3gui9InterfaceFv - .byte4 __dt__Q310homebutton3gui9ComponentFv - .byte4 getID__Q310homebutton3gui9ComponentFv - .byte4 isPointed__Q310homebutton3gui9ComponentFi - .byte4 setPointed__Q310homebutton3gui9ComponentFib - .byte4 onPoint__Q310homebutton3gui9ComponentFv - .byte4 offPoint__Q310homebutton3gui9ComponentFv - .byte4 onDrag__Q310homebutton3gui9ComponentFff - .byte4 onMove__Q310homebutton3gui9ComponentFff - .byte4 onTrig__Q310homebutton3gui9ComponentFUlR3Vec - .byte4 setDraggingButton__Q310homebutton3gui9ComponentFUl - .byte4 update__Q310homebutton3gui9ComponentFiPC10KPADStatusffPv - .byte4 update__Q310homebutton3gui9ComponentFiffUlUlUlPv - .byte4 isTriggerTarger__Q310homebutton3gui9ComponentFv - .byte4 setTriggerTarget__Q310homebutton3gui9ComponentFb - .byte4 setManager__Q310homebutton3gui9ComponentFPQ310homebutton3gui7Manager - .byte4 isVisible__Q310homebutton3gui9ComponentFv + .4byte create__Q310homebutton3gui9InterfaceFv + .4byte init__Q310homebutton3gui9ComponentFv + .4byte calc__Q310homebutton3gui9InterfaceFv + .4byte draw__Q310homebutton3gui9InterfaceFRA3_A4_f + .4byte draw__Q310homebutton3gui9InterfaceFv + .4byte __dt__Q310homebutton3gui9ComponentFv + .4byte getID__Q310homebutton3gui9ComponentFv + .4byte isPointed__Q310homebutton3gui9ComponentFi + .4byte setPointed__Q310homebutton3gui9ComponentFib + .4byte onPoint__Q310homebutton3gui9ComponentFv + .4byte offPoint__Q310homebutton3gui9ComponentFv + .4byte onDrag__Q310homebutton3gui9ComponentFff + .4byte onMove__Q310homebutton3gui9ComponentFff + .4byte onTrig__Q310homebutton3gui9ComponentFUlR3Vec + .4byte setDraggingButton__Q310homebutton3gui9ComponentFUl + .4byte update__Q310homebutton3gui9ComponentFiPC10KPADStatusffPv + .4byte update__Q310homebutton3gui9ComponentFiffUlUlUlPv + .4byte isTriggerTarger__Q310homebutton3gui9ComponentFv + .4byte setTriggerTarget__Q310homebutton3gui9ComponentFb + .4byte setManager__Q310homebutton3gui9ComponentFPQ310homebutton3gui7Manager + .4byte isVisible__Q310homebutton3gui9ComponentFv .4byte 0 .global $$29435 $$29435: @@ -1965,13 +1965,13 @@ $$29435: .balign 4 .global $$29436 $$29436: - .byte4 __RTTI__Q310homebutton3gui9Interface + .4byte __RTTI__Q310homebutton3gui9Interface .4byte 0 .4byte 0 .global __RTTI__Q310homebutton3gui9Component __RTTI__Q310homebutton3gui9Component: - .byte4 $$29435 - .byte4 $$29436 + .4byte $$29435 + .4byte $$29436 .global $$29437 $$29437: .asciz "homebutton::gui::Interface" @@ -1979,7 +1979,7 @@ $$29437: .4byte 0 .global __RTTI__Q310homebutton3gui9Interface __RTTI__Q310homebutton3gui9Interface: - .byte4 $$29437 + .4byte $$29437 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/homebuttonLib/HBMRemoteSpk.s b/asm/homebuttonLib/HBMRemoteSpk.s index ad355aad..26e998c9 100644 --- a/asm/homebuttonLib/HBMRemoteSpk.s +++ b/asm/homebuttonLib/HBMRemoteSpk.s @@ -667,9 +667,9 @@ isPlayReady__Q210homebutton9RemoteSpkCFl: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q210homebutton9RemoteSpk __vt__Q210homebutton9RemoteSpk: - .byte4 __RTTI__Q210homebutton9RemoteSpk + .4byte __RTTI__Q210homebutton9RemoteSpk .4byte 0 - .byte4 __dt__Q210homebutton9RemoteSpkFv + .4byte __dt__Q210homebutton9RemoteSpkFv .global $$26598 $$26598: .asciz "homebutton::RemoteSpk" @@ -677,7 +677,7 @@ $$26598: .4byte 0 .global __RTTI__Q210homebutton9RemoteSpk __RTTI__Q210homebutton9RemoteSpk: - .byte4 $$26598 + .4byte $$26598 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/homebuttonLib/lyt_animation.s b/asm/homebuttonLib/lyt_animation.s index 067398a3..c7cfd853 100644 --- a/asm/homebuttonLib/lyt_animation.s +++ b/asm/homebuttonLib/lyt_animation.s @@ -854,27 +854,27 @@ $$28717: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt18AnimTransformBasic __vt__Q36nw4hbm3lyt18AnimTransformBasic: - .byte4 __RTTI__Q36nw4hbm3lyt18AnimTransformBasic + .4byte __RTTI__Q36nw4hbm3lyt18AnimTransformBasic .4byte 0 - .byte4 __dt__Q36nw4hbm3lyt18AnimTransformBasicFv - .byte4 SetResource__Q36nw4hbm3lyt18AnimTransformBasicFPCQ46nw4hbm3lyt3res14AnimationBlockPQ36nw4hbm3lyt16ResourceAccessor - .byte4 Bind__Q36nw4hbm3lyt18AnimTransformBasicFPQ36nw4hbm3lyt4Paneb - .byte4 Bind__Q36nw4hbm3lyt18AnimTransformBasicFPQ36nw4hbm3lyt8Material - .byte4 Animate__Q36nw4hbm3lyt18AnimTransformBasicFUlPQ36nw4hbm3lyt4Pane - .byte4 Animate__Q36nw4hbm3lyt18AnimTransformBasicFUlPQ36nw4hbm3lyt8Material + .4byte __dt__Q36nw4hbm3lyt18AnimTransformBasicFv + .4byte SetResource__Q36nw4hbm3lyt18AnimTransformBasicFPCQ46nw4hbm3lyt3res14AnimationBlockPQ36nw4hbm3lyt16ResourceAccessor + .4byte Bind__Q36nw4hbm3lyt18AnimTransformBasicFPQ36nw4hbm3lyt4Paneb + .4byte Bind__Q36nw4hbm3lyt18AnimTransformBasicFPQ36nw4hbm3lyt8Material + .4byte Animate__Q36nw4hbm3lyt18AnimTransformBasicFUlPQ36nw4hbm3lyt4Pane + .4byte Animate__Q36nw4hbm3lyt18AnimTransformBasicFUlPQ36nw4hbm3lyt8Material .global $$28016 $$28016: .asciz "nw4hbm::lyt::AnimTransformBasic" .global $$28017 $$28017: - .byte4 __RTTI__Q36nw4hbm3lyt13AnimTransform + .4byte __RTTI__Q36nw4hbm3lyt13AnimTransform .4byte 0 .4byte 0 .4byte 0 .global __RTTI__Q36nw4hbm3lyt18AnimTransformBasic __RTTI__Q36nw4hbm3lyt18AnimTransformBasic: - .byte4 $$28016 - .byte4 $$28017 + .4byte $$28016 + .4byte $$28017 .global $$28018 $$28018: .asciz "nw4hbm::lyt::AnimTransform" @@ -882,5 +882,5 @@ $$28018: .4byte 0 .global __RTTI__Q36nw4hbm3lyt13AnimTransform __RTTI__Q36nw4hbm3lyt13AnimTransform: - .byte4 $$28018 + .4byte $$28018 .4byte 0 diff --git a/asm/homebuttonLib/lyt_arcResourceAccessor.s b/asm/homebuttonLib/lyt_arcResourceAccessor.s index 4b042370..1951c136 100644 --- a/asm/homebuttonLib/lyt_arcResourceAccessor.s +++ b/asm/homebuttonLib/lyt_arcResourceAccessor.s @@ -211,30 +211,30 @@ $$23472: .4byte 0x2E2E0000 .global __vt__Q36nw4hbm3lyt19ArcResourceAccessor __vt__Q36nw4hbm3lyt19ArcResourceAccessor: - .byte4 __RTTI__Q36nw4hbm3lyt19ArcResourceAccessor + .4byte __RTTI__Q36nw4hbm3lyt19ArcResourceAccessor .4byte 0 - .byte4 __dt__Q36nw4hbm3lyt19ArcResourceAccessorFv - .byte4 GetResource__Q36nw4hbm3lyt19ArcResourceAccessorFUlPCcPUl - .byte4 GetFont__Q36nw4hbm3lyt19ArcResourceAccessorFPCc + .4byte __dt__Q36nw4hbm3lyt19ArcResourceAccessorFv + .4byte GetResource__Q36nw4hbm3lyt19ArcResourceAccessorFUlPCcPUl + .4byte GetFont__Q36nw4hbm3lyt19ArcResourceAccessorFPCc .global $$23154 $$23154: .asciz "nw4hbm::lyt::ArcResourceAccessor" .balign 4 .global $$23155 $$23155: - .byte4 __RTTI__Q36nw4hbm3lyt16ResourceAccessor + .4byte __RTTI__Q36nw4hbm3lyt16ResourceAccessor .4byte 0 .4byte 0 .4byte 0 .global __RTTI__Q36nw4hbm3lyt19ArcResourceAccessor __RTTI__Q36nw4hbm3lyt19ArcResourceAccessor: - .byte4 $$23154 - .byte4 $$23155 + .4byte $$23154 + .4byte $$23155 .global $$23156 $$23156: .asciz "nw4hbm::lyt::ResourceAccessor" .balign 4 .global __RTTI__Q36nw4hbm3lyt16ResourceAccessor __RTTI__Q36nw4hbm3lyt16ResourceAccessor: - .byte4 $$23156 + .4byte $$23156 .4byte 0 diff --git a/asm/homebuttonLib/lyt_bounding.s b/asm/homebuttonLib/lyt_bounding.s index ffa25ef8..437c46cb 100644 --- a/asm/homebuttonLib/lyt_bounding.s +++ b/asm/homebuttonLib/lyt_bounding.s @@ -106,71 +106,71 @@ __sinit_$$3lyt_bounding_cpp: /* 80135C7C 00131ABC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3lyt_bounding_cpp + .4byte __sinit_$$3lyt_bounding_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt8Bounding __vt__Q36nw4hbm3lyt8Bounding: - .byte4 __RTTI__Q36nw4hbm3lyt8Bounding + .4byte __RTTI__Q36nw4hbm3lyt8Bounding .4byte 0 - .byte4 __dt__Q36nw4hbm3lyt8BoundingFv - .byte4 GetRuntimeTypeInfo__Q36nw4hbm3lyt8BoundingCFv - .byte4 CalculateMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo - .byte4 Draw__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo - .byte4 DrawSelf__Q36nw4hbm3lyt8BoundingFRCQ36nw4hbm3lyt8DrawInfo - .byte4 Animate__Q36nw4hbm3lyt4PaneFUl - .byte4 AnimateSelf__Q36nw4hbm3lyt4PaneFUl - .byte4 GetVtxColor__Q36nw4hbm3lyt4PaneCFUl - .byte4 SetVtxColor__Q36nw4hbm3lyt4PaneFUlQ36nw4hbm2ut5Color - .byte4 GetColorElement__Q36nw4hbm3lyt4PaneCFUl - .byte4 SetColorElement__Q36nw4hbm3lyt4PaneFUlUc - .byte4 GetVtxColorElement__Q36nw4hbm3lyt4PaneCFUl - .byte4 SetVtxColorElement__Q36nw4hbm3lyt4PaneFUlUc - .byte4 FindPaneByName__Q36nw4hbm3lyt4PaneFPCcb - .byte4 FindMaterialByName__Q36nw4hbm3lyt4PaneFPCcb - .byte4 BindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb - .byte4 UnbindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb - .byte4 UnbindAllAnimation__Q36nw4hbm3lyt4PaneFb - .byte4 UnbindAnimationSelf__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransform - .byte4 FindAnimationLink__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransform - .byte4 SetAnimationEnable__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformbb - .byte4 GetMaterial__Q36nw4hbm3lyt4PaneCFv - .byte4 LoadMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo + .4byte __dt__Q36nw4hbm3lyt8BoundingFv + .4byte GetRuntimeTypeInfo__Q36nw4hbm3lyt8BoundingCFv + .4byte CalculateMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo + .4byte Draw__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo + .4byte DrawSelf__Q36nw4hbm3lyt8BoundingFRCQ36nw4hbm3lyt8DrawInfo + .4byte Animate__Q36nw4hbm3lyt4PaneFUl + .4byte AnimateSelf__Q36nw4hbm3lyt4PaneFUl + .4byte GetVtxColor__Q36nw4hbm3lyt4PaneCFUl + .4byte SetVtxColor__Q36nw4hbm3lyt4PaneFUlQ36nw4hbm2ut5Color + .4byte GetColorElement__Q36nw4hbm3lyt4PaneCFUl + .4byte SetColorElement__Q36nw4hbm3lyt4PaneFUlUc + .4byte GetVtxColorElement__Q36nw4hbm3lyt4PaneCFUl + .4byte SetVtxColorElement__Q36nw4hbm3lyt4PaneFUlUc + .4byte FindPaneByName__Q36nw4hbm3lyt4PaneFPCcb + .4byte FindMaterialByName__Q36nw4hbm3lyt4PaneFPCcb + .4byte BindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb + .4byte UnbindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb + .4byte UnbindAllAnimation__Q36nw4hbm3lyt4PaneFb + .4byte UnbindAnimationSelf__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransform + .4byte FindAnimationLink__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransform + .4byte SetAnimationEnable__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformbb + .4byte GetMaterial__Q36nw4hbm3lyt4PaneCFv + .4byte LoadMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo .global $$27465 $$27465: .asciz "nw4hbm::lyt::Bounding" .balign 4 .global $$27466 $$27466: - .byte4 __RTTI__Q46nw4hbm3lyt6detail8PaneBase + .4byte __RTTI__Q46nw4hbm3lyt6detail8PaneBase .4byte 0 - .byte4 __RTTI__Q36nw4hbm3lyt4Pane + .4byte __RTTI__Q36nw4hbm3lyt4Pane .4byte 0 .4byte 0 .global __RTTI__Q36nw4hbm3lyt8Bounding __RTTI__Q36nw4hbm3lyt8Bounding: - .byte4 $$27465 - .byte4 $$27466 + .4byte $$27465 + .4byte $$27466 .global $$27467 $$27467: .asciz "nw4hbm::lyt::Pane" .balign 4 .global $$27468 $$27468: - .byte4 __RTTI__Q46nw4hbm3lyt6detail8PaneBase + .4byte __RTTI__Q46nw4hbm3lyt6detail8PaneBase .4byte 0 .4byte 0 .global __RTTI__Q36nw4hbm3lyt4Pane __RTTI__Q36nw4hbm3lyt4Pane: - .byte4 $$27467 - .byte4 $$27468 + .4byte $$27467 + .4byte $$27468 .global $$27469 $$27469: .asciz "nw4hbm::lyt::detail::PaneBase" .balign 4 .global __RTTI__Q46nw4hbm3lyt6detail8PaneBase __RTTI__Q46nw4hbm3lyt6detail8PaneBase: - .byte4 $$27469 + .4byte $$27469 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/homebuttonLib/lyt_drawInfo.s b/asm/homebuttonLib/lyt_drawInfo.s index 767fa4d3..9231aadb 100644 --- a/asm/homebuttonLib/lyt_drawInfo.s +++ b/asm/homebuttonLib/lyt_drawInfo.s @@ -54,9 +54,9 @@ $$25012: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt8DrawInfo __vt__Q36nw4hbm3lyt8DrawInfo: - .byte4 __RTTI__Q36nw4hbm3lyt8DrawInfo + .4byte __RTTI__Q36nw4hbm3lyt8DrawInfo .4byte 0 - .byte4 __dt__Q36nw4hbm3lyt8DrawInfoFv + .4byte __dt__Q36nw4hbm3lyt8DrawInfoFv .global $$24994 $$24994: .asciz "nw4hbm::lyt::DrawInfo" @@ -64,5 +64,5 @@ $$24994: .4byte 0 .global __RTTI__Q36nw4hbm3lyt8DrawInfo __RTTI__Q36nw4hbm3lyt8DrawInfo: - .byte4 $$24994 + .4byte $$24994 .4byte 0 diff --git a/asm/homebuttonLib/lyt_group.s b/asm/homebuttonLib/lyt_group.s index 78d7722e..b38b28ac 100644 --- a/asm/homebuttonLib/lyt_group.s +++ b/asm/homebuttonLib/lyt_group.s @@ -247,14 +247,14 @@ lbl_80136BFC: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt5Group __vt__Q36nw4hbm3lyt5Group: - .byte4 __RTTI__Q36nw4hbm3lyt5Group + .4byte __RTTI__Q36nw4hbm3lyt5Group .4byte 0 - .byte4 __dt__Q36nw4hbm3lyt5GroupFv + .4byte __dt__Q36nw4hbm3lyt5GroupFv .global $$27939 $$27939: .asciz "nw4hbm::lyt::Group" .balign 4 .global __RTTI__Q36nw4hbm3lyt5Group __RTTI__Q36nw4hbm3lyt5Group: - .byte4 $$27939 + .4byte $$27939 .4byte 0 diff --git a/asm/homebuttonLib/lyt_layout.s b/asm/homebuttonLib/lyt_layout.s index b6162ece..37902bd8 100644 --- a/asm/homebuttonLib/lyt_layout.s +++ b/asm/homebuttonLib/lyt_layout.s @@ -955,25 +955,25 @@ $$29664: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt6Layout __vt__Q36nw4hbm3lyt6Layout: - .byte4 __RTTI__Q36nw4hbm3lyt6Layout + .4byte __RTTI__Q36nw4hbm3lyt6Layout .4byte 0 - .byte4 __dt__Q36nw4hbm3lyt6LayoutFv - .byte4 Build__Q36nw4hbm3lyt6LayoutFPCvPQ36nw4hbm3lyt16ResourceAccessor - .byte4 CreateAnimTransform__Q36nw4hbm3lyt6LayoutFPCvPQ36nw4hbm3lyt16ResourceAccessor - .byte4 BindAnimation__Q36nw4hbm3lyt6LayoutFPQ36nw4hbm3lyt13AnimTransform - .byte4 UnbindAnimation__Q36nw4hbm3lyt6LayoutFPQ36nw4hbm3lyt13AnimTransform - .byte4 UnbindAllAnimation__Q36nw4hbm3lyt6LayoutFv - .byte4 SetAnimationEnable__Q36nw4hbm3lyt6LayoutFPQ36nw4hbm3lyt13AnimTransformb - .byte4 CalculateMtx__Q36nw4hbm3lyt6LayoutFRCQ36nw4hbm3lyt8DrawInfo - .byte4 Draw__Q36nw4hbm3lyt6LayoutFRCQ36nw4hbm3lyt8DrawInfo - .byte4 Animate__Q36nw4hbm3lyt6LayoutFUl - .byte4 SetTagProcessor__Q36nw4hbm3lyt6LayoutFPQ36nw4hbm2ut19TagProcessorBase$$0w$$1 + .4byte __dt__Q36nw4hbm3lyt6LayoutFv + .4byte Build__Q36nw4hbm3lyt6LayoutFPCvPQ36nw4hbm3lyt16ResourceAccessor + .4byte CreateAnimTransform__Q36nw4hbm3lyt6LayoutFPCvPQ36nw4hbm3lyt16ResourceAccessor + .4byte BindAnimation__Q36nw4hbm3lyt6LayoutFPQ36nw4hbm3lyt13AnimTransform + .4byte UnbindAnimation__Q36nw4hbm3lyt6LayoutFPQ36nw4hbm3lyt13AnimTransform + .4byte UnbindAllAnimation__Q36nw4hbm3lyt6LayoutFv + .4byte SetAnimationEnable__Q36nw4hbm3lyt6LayoutFPQ36nw4hbm3lyt13AnimTransformb + .4byte CalculateMtx__Q36nw4hbm3lyt6LayoutFRCQ36nw4hbm3lyt8DrawInfo + .4byte Draw__Q36nw4hbm3lyt6LayoutFRCQ36nw4hbm3lyt8DrawInfo + .4byte Animate__Q36nw4hbm3lyt6LayoutFUl + .4byte SetTagProcessor__Q36nw4hbm3lyt6LayoutFPQ36nw4hbm2ut19TagProcessorBase$$0w$$1 .global $$28461 $$28461: .asciz "nw4hbm::lyt::Layout" .global __RTTI__Q36nw4hbm3lyt6Layout __RTTI__Q36nw4hbm3lyt6Layout: - .byte4 $$28461 + .4byte $$28461 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/homebuttonLib/lyt_material.s b/asm/homebuttonLib/lyt_material.s index 7a7cb792..56e708fb 100644 --- a/asm/homebuttonLib/lyt_material.s +++ b/asm/homebuttonLib/lyt_material.s @@ -3486,21 +3486,21 @@ $$2LOCAL$$2SetupGX__Q36nw4hbm3lyt8MaterialFbUc$$2kAlpSels$$20: .4byte 0x00000012 .global __vt__Q36nw4hbm3lyt8Material __vt__Q36nw4hbm3lyt8Material: - .byte4 __RTTI__Q36nw4hbm3lyt8Material + .4byte __RTTI__Q36nw4hbm3lyt8Material .4byte 0 - .byte4 __dt__Q36nw4hbm3lyt8MaterialFv - .byte4 SetupGX__Q36nw4hbm3lyt8MaterialFbUc - .byte4 BindAnimation__Q36nw4hbm3lyt8MaterialFPQ36nw4hbm3lyt13AnimTransform - .byte4 UnbindAnimation__Q36nw4hbm3lyt8MaterialFPQ36nw4hbm3lyt13AnimTransform - .byte4 UnbindAllAnimation__Q36nw4hbm3lyt8MaterialFv - .byte4 Animate__Q36nw4hbm3lyt8MaterialFv - .byte4 FindAnimationLink__Q36nw4hbm3lyt8MaterialFPQ36nw4hbm3lyt13AnimTransform - .byte4 SetAnimationEnable__Q36nw4hbm3lyt8MaterialFPQ36nw4hbm3lyt13AnimTransformb + .4byte __dt__Q36nw4hbm3lyt8MaterialFv + .4byte SetupGX__Q36nw4hbm3lyt8MaterialFbUc + .4byte BindAnimation__Q36nw4hbm3lyt8MaterialFPQ36nw4hbm3lyt13AnimTransform + .4byte UnbindAnimation__Q36nw4hbm3lyt8MaterialFPQ36nw4hbm3lyt13AnimTransform + .4byte UnbindAllAnimation__Q36nw4hbm3lyt8MaterialFv + .4byte Animate__Q36nw4hbm3lyt8MaterialFv + .4byte FindAnimationLink__Q36nw4hbm3lyt8MaterialFPQ36nw4hbm3lyt13AnimTransform + .4byte SetAnimationEnable__Q36nw4hbm3lyt8MaterialFPQ36nw4hbm3lyt13AnimTransformb .global $$28504 $$28504: .asciz "nw4hbm::lyt::Material" .balign 4 .global __RTTI__Q36nw4hbm3lyt8Material __RTTI__Q36nw4hbm3lyt8Material: - .byte4 $$28504 + .4byte $$28504 .4byte 0 diff --git a/asm/homebuttonLib/lyt_pane.s b/asm/homebuttonLib/lyt_pane.s index cd0ec5b6..a236d8b3 100644 --- a/asm/homebuttonLib/lyt_pane.s +++ b/asm/homebuttonLib/lyt_pane.s @@ -1238,7 +1238,7 @@ __sinit_$$3lyt_pane_cpp: /* 8013BB3C 0013797C 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3lyt_pane_cpp + .4byte __sinit_$$3lyt_pane_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29169 @@ -1267,31 +1267,31 @@ $$29733: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt4Pane __vt__Q36nw4hbm3lyt4Pane: - .byte4 __RTTI__Q36nw4hbm3lyt4Pane + .4byte __RTTI__Q36nw4hbm3lyt4Pane .4byte 0 - .byte4 __dt__Q36nw4hbm3lyt4PaneFv - .byte4 GetRuntimeTypeInfo__Q36nw4hbm3lyt4PaneCFv - .byte4 CalculateMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo - .byte4 Draw__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo - .byte4 DrawSelf__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo - .byte4 Animate__Q36nw4hbm3lyt4PaneFUl - .byte4 AnimateSelf__Q36nw4hbm3lyt4PaneFUl - .byte4 GetVtxColor__Q36nw4hbm3lyt4PaneCFUl - .byte4 SetVtxColor__Q36nw4hbm3lyt4PaneFUlQ36nw4hbm2ut5Color - .byte4 GetColorElement__Q36nw4hbm3lyt4PaneCFUl - .byte4 SetColorElement__Q36nw4hbm3lyt4PaneFUlUc - .byte4 GetVtxColorElement__Q36nw4hbm3lyt4PaneCFUl - .byte4 SetVtxColorElement__Q36nw4hbm3lyt4PaneFUlUc - .byte4 FindPaneByName__Q36nw4hbm3lyt4PaneFPCcb - .byte4 FindMaterialByName__Q36nw4hbm3lyt4PaneFPCcb - .byte4 BindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb - .byte4 UnbindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb - .byte4 UnbindAllAnimation__Q36nw4hbm3lyt4PaneFb - .byte4 UnbindAnimationSelf__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransform - .byte4 FindAnimationLink__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransform - .byte4 SetAnimationEnable__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformbb - .byte4 GetMaterial__Q36nw4hbm3lyt4PaneCFv - .byte4 LoadMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo + .4byte __dt__Q36nw4hbm3lyt4PaneFv + .4byte GetRuntimeTypeInfo__Q36nw4hbm3lyt4PaneCFv + .4byte CalculateMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo + .4byte Draw__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo + .4byte DrawSelf__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo + .4byte Animate__Q36nw4hbm3lyt4PaneFUl + .4byte AnimateSelf__Q36nw4hbm3lyt4PaneFUl + .4byte GetVtxColor__Q36nw4hbm3lyt4PaneCFUl + .4byte SetVtxColor__Q36nw4hbm3lyt4PaneFUlQ36nw4hbm2ut5Color + .4byte GetColorElement__Q36nw4hbm3lyt4PaneCFUl + .4byte SetColorElement__Q36nw4hbm3lyt4PaneFUlUc + .4byte GetVtxColorElement__Q36nw4hbm3lyt4PaneCFUl + .4byte SetVtxColorElement__Q36nw4hbm3lyt4PaneFUlUc + .4byte FindPaneByName__Q36nw4hbm3lyt4PaneFPCcb + .4byte FindMaterialByName__Q36nw4hbm3lyt4PaneFPCcb + .4byte BindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb + .4byte UnbindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb + .4byte UnbindAllAnimation__Q36nw4hbm3lyt4PaneFb + .4byte UnbindAnimationSelf__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransform + .4byte FindAnimationLink__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransform + .4byte SetAnimationEnable__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformbb + .4byte GetMaterial__Q36nw4hbm3lyt4PaneCFv + .4byte LoadMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/homebuttonLib/lyt_picture.s b/asm/homebuttonLib/lyt_picture.s index 83d36204..010248ae 100644 --- a/asm/homebuttonLib/lyt_picture.s +++ b/asm/homebuttonLib/lyt_picture.s @@ -392,7 +392,7 @@ __sinit_$$3lyt_picture_cpp: /* 8013C09C 00137EDC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3lyt_picture_cpp + .4byte __sinit_$$3lyt_picture_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$28171 @@ -403,48 +403,48 @@ $$28171: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt7Picture __vt__Q36nw4hbm3lyt7Picture: - .byte4 __RTTI__Q36nw4hbm3lyt7Picture + .4byte __RTTI__Q36nw4hbm3lyt7Picture .4byte 0 - .byte4 __dt__Q36nw4hbm3lyt7PictureFv - .byte4 GetRuntimeTypeInfo__Q36nw4hbm3lyt7PictureCFv - .byte4 CalculateMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo - .byte4 Draw__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo - .byte4 DrawSelf__Q36nw4hbm3lyt7PictureFRCQ36nw4hbm3lyt8DrawInfo - .byte4 Animate__Q36nw4hbm3lyt4PaneFUl - .byte4 AnimateSelf__Q36nw4hbm3lyt4PaneFUl - .byte4 GetVtxColor__Q36nw4hbm3lyt7PictureCFUl - .byte4 SetVtxColor__Q36nw4hbm3lyt7PictureFUlQ36nw4hbm2ut5Color - .byte4 GetColorElement__Q36nw4hbm3lyt4PaneCFUl - .byte4 SetColorElement__Q36nw4hbm3lyt4PaneFUlUc - .byte4 GetVtxColorElement__Q36nw4hbm3lyt7PictureCFUl - .byte4 SetVtxColorElement__Q36nw4hbm3lyt7PictureFUlUc - .byte4 FindPaneByName__Q36nw4hbm3lyt4PaneFPCcb - .byte4 FindMaterialByName__Q36nw4hbm3lyt4PaneFPCcb - .byte4 BindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb - .byte4 UnbindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb - .byte4 UnbindAllAnimation__Q36nw4hbm3lyt4PaneFb - .byte4 UnbindAnimationSelf__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransform - .byte4 FindAnimationLink__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransform - .byte4 SetAnimationEnable__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformbb - .byte4 GetMaterial__Q36nw4hbm3lyt4PaneCFv - .byte4 LoadMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo - .byte4 Append__Q36nw4hbm3lyt7PictureFP10TPLPalette - .byte4 Append__Q36nw4hbm3lyt7PictureFRC9_GXTexObj + .4byte __dt__Q36nw4hbm3lyt7PictureFv + .4byte GetRuntimeTypeInfo__Q36nw4hbm3lyt7PictureCFv + .4byte CalculateMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo + .4byte Draw__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo + .4byte DrawSelf__Q36nw4hbm3lyt7PictureFRCQ36nw4hbm3lyt8DrawInfo + .4byte Animate__Q36nw4hbm3lyt4PaneFUl + .4byte AnimateSelf__Q36nw4hbm3lyt4PaneFUl + .4byte GetVtxColor__Q36nw4hbm3lyt7PictureCFUl + .4byte SetVtxColor__Q36nw4hbm3lyt7PictureFUlQ36nw4hbm2ut5Color + .4byte GetColorElement__Q36nw4hbm3lyt4PaneCFUl + .4byte SetColorElement__Q36nw4hbm3lyt4PaneFUlUc + .4byte GetVtxColorElement__Q36nw4hbm3lyt7PictureCFUl + .4byte SetVtxColorElement__Q36nw4hbm3lyt7PictureFUlUc + .4byte FindPaneByName__Q36nw4hbm3lyt4PaneFPCcb + .4byte FindMaterialByName__Q36nw4hbm3lyt4PaneFPCcb + .4byte BindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb + .4byte UnbindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb + .4byte UnbindAllAnimation__Q36nw4hbm3lyt4PaneFb + .4byte UnbindAnimationSelf__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransform + .4byte FindAnimationLink__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransform + .4byte SetAnimationEnable__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformbb + .4byte GetMaterial__Q36nw4hbm3lyt4PaneCFv + .4byte LoadMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo + .4byte Append__Q36nw4hbm3lyt7PictureFP10TPLPalette + .4byte Append__Q36nw4hbm3lyt7PictureFRC9_GXTexObj .global $$27912 $$27912: .asciz "nw4hbm::lyt::Picture" .balign 4 .global $$27913 $$27913: - .byte4 __RTTI__Q46nw4hbm3lyt6detail8PaneBase + .4byte __RTTI__Q46nw4hbm3lyt6detail8PaneBase .4byte 0 - .byte4 __RTTI__Q36nw4hbm3lyt4Pane + .4byte __RTTI__Q36nw4hbm3lyt4Pane .4byte 0 .4byte 0 .global __RTTI__Q36nw4hbm3lyt7Picture __RTTI__Q36nw4hbm3lyt7Picture: - .byte4 $$27912 - .byte4 $$27913 + .4byte $$27912 + .4byte $$27913 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q36nw4hbm3lyt7Picture diff --git a/asm/homebuttonLib/lyt_resourceAccessor.s b/asm/homebuttonLib/lyt_resourceAccessor.s index b5580a9d..0079860f 100644 --- a/asm/homebuttonLib/lyt_resourceAccessor.s +++ b/asm/homebuttonLib/lyt_resourceAccessor.s @@ -25,9 +25,9 @@ GetFont__Q36nw4hbm3lyt16ResourceAccessorFPCc: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt16ResourceAccessor __vt__Q36nw4hbm3lyt16ResourceAccessor: - .byte4 __RTTI__Q36nw4hbm3lyt16ResourceAccessor + .4byte __RTTI__Q36nw4hbm3lyt16ResourceAccessor .4byte 0 - .byte4 __dt__Q36nw4hbm3lyt16ResourceAccessorFv + .4byte __dt__Q36nw4hbm3lyt16ResourceAccessorFv .4byte 0 - .byte4 GetFont__Q36nw4hbm3lyt16ResourceAccessorFPCc + .4byte GetFont__Q36nw4hbm3lyt16ResourceAccessorFPCc .4byte 0 diff --git a/asm/homebuttonLib/lyt_textBox.s b/asm/homebuttonLib/lyt_textBox.s index 6c2f1678..672105bc 100644 --- a/asm/homebuttonLib/lyt_textBox.s +++ b/asm/homebuttonLib/lyt_textBox.s @@ -1428,7 +1428,7 @@ __sinit_$$3lyt_textBox_cpp: /* 8013D4EC 0013932C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3lyt_textBox_cpp + .4byte __sinit_$$3lyt_textBox_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29376 @@ -1452,51 +1452,51 @@ $$29987: .4byte 0x000A0000 .global __vt__Q36nw4hbm3lyt7TextBox __vt__Q36nw4hbm3lyt7TextBox: - .byte4 __RTTI__Q36nw4hbm3lyt7TextBox + .4byte __RTTI__Q36nw4hbm3lyt7TextBox .4byte 0 - .byte4 __dt__Q36nw4hbm3lyt7TextBoxFv - .byte4 GetRuntimeTypeInfo__Q36nw4hbm3lyt7TextBoxCFv - .byte4 CalculateMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo - .byte4 Draw__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo - .byte4 DrawSelf__Q36nw4hbm3lyt7TextBoxFRCQ36nw4hbm3lyt8DrawInfo - .byte4 Animate__Q36nw4hbm3lyt4PaneFUl - .byte4 AnimateSelf__Q36nw4hbm3lyt4PaneFUl - .byte4 GetVtxColor__Q36nw4hbm3lyt7TextBoxCFUl - .byte4 SetVtxColor__Q36nw4hbm3lyt7TextBoxFUlQ36nw4hbm2ut5Color - .byte4 GetColorElement__Q36nw4hbm3lyt4PaneCFUl - .byte4 SetColorElement__Q36nw4hbm3lyt4PaneFUlUc - .byte4 GetVtxColorElement__Q36nw4hbm3lyt7TextBoxCFUl - .byte4 SetVtxColorElement__Q36nw4hbm3lyt7TextBoxFUlUc - .byte4 FindPaneByName__Q36nw4hbm3lyt4PaneFPCcb - .byte4 FindMaterialByName__Q36nw4hbm3lyt4PaneFPCcb - .byte4 BindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb - .byte4 UnbindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb - .byte4 UnbindAllAnimation__Q36nw4hbm3lyt4PaneFb - .byte4 UnbindAnimationSelf__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransform - .byte4 FindAnimationLink__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransform - .byte4 SetAnimationEnable__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformbb - .byte4 GetMaterial__Q36nw4hbm3lyt4PaneCFv - .byte4 LoadMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo - .byte4 AllocStringBuffer__Q36nw4hbm3lyt7TextBoxFUs - .byte4 FreeStringBuffer__Q36nw4hbm3lyt7TextBoxFv - .byte4 SetString__Q36nw4hbm3lyt7TextBoxFPCwUs - .byte4 SetString__Q36nw4hbm3lyt7TextBoxFPCwUsUs + .4byte __dt__Q36nw4hbm3lyt7TextBoxFv + .4byte GetRuntimeTypeInfo__Q36nw4hbm3lyt7TextBoxCFv + .4byte CalculateMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo + .4byte Draw__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo + .4byte DrawSelf__Q36nw4hbm3lyt7TextBoxFRCQ36nw4hbm3lyt8DrawInfo + .4byte Animate__Q36nw4hbm3lyt4PaneFUl + .4byte AnimateSelf__Q36nw4hbm3lyt4PaneFUl + .4byte GetVtxColor__Q36nw4hbm3lyt7TextBoxCFUl + .4byte SetVtxColor__Q36nw4hbm3lyt7TextBoxFUlQ36nw4hbm2ut5Color + .4byte GetColorElement__Q36nw4hbm3lyt4PaneCFUl + .4byte SetColorElement__Q36nw4hbm3lyt4PaneFUlUc + .4byte GetVtxColorElement__Q36nw4hbm3lyt7TextBoxCFUl + .4byte SetVtxColorElement__Q36nw4hbm3lyt7TextBoxFUlUc + .4byte FindPaneByName__Q36nw4hbm3lyt4PaneFPCcb + .4byte FindMaterialByName__Q36nw4hbm3lyt4PaneFPCcb + .4byte BindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb + .4byte UnbindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb + .4byte UnbindAllAnimation__Q36nw4hbm3lyt4PaneFb + .4byte UnbindAnimationSelf__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransform + .4byte FindAnimationLink__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransform + .4byte SetAnimationEnable__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformbb + .4byte GetMaterial__Q36nw4hbm3lyt4PaneCFv + .4byte LoadMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo + .4byte AllocStringBuffer__Q36nw4hbm3lyt7TextBoxFUs + .4byte FreeStringBuffer__Q36nw4hbm3lyt7TextBoxFv + .4byte SetString__Q36nw4hbm3lyt7TextBoxFPCwUs + .4byte SetString__Q36nw4hbm3lyt7TextBoxFPCwUsUs .global $$28641 $$28641: .asciz "nw4hbm::lyt::TextBox" .balign 4 .global $$28642 $$28642: - .byte4 __RTTI__Q46nw4hbm3lyt6detail8PaneBase + .4byte __RTTI__Q46nw4hbm3lyt6detail8PaneBase .4byte 0 - .byte4 __RTTI__Q36nw4hbm3lyt4Pane + .4byte __RTTI__Q36nw4hbm3lyt4Pane .4byte 0 .4byte 0 .4byte 0 .global __RTTI__Q36nw4hbm3lyt7TextBox __RTTI__Q36nw4hbm3lyt7TextBox: - .byte4 $$28641 - .byte4 $$28642 + .4byte $$28641 + .4byte $$28642 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q36nw4hbm3lyt7TextBox diff --git a/asm/homebuttonLib/lyt_window.s b/asm/homebuttonLib/lyt_window.s index 9b6f65b3..f2ac80ef 100644 --- a/asm/homebuttonLib/lyt_window.s +++ b/asm/homebuttonLib/lyt_window.s @@ -2569,7 +2569,7 @@ __sinit_$$3lyt_window_cpp: /* 8013FB1C 0013B95C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3lyt_window_cpp + .4byte __sinit_$$3lyt_window_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29107 @@ -2605,51 +2605,51 @@ $$2LOCAL$$2GetTexutreFlipInfo__24$$2unnamed$$2lyt_window_cpp$$2FUc$$2flipInfos: .4byte 0x00010100 .global __vt__Q36nw4hbm3lyt6Window __vt__Q36nw4hbm3lyt6Window: - .byte4 __RTTI__Q36nw4hbm3lyt6Window + .4byte __RTTI__Q36nw4hbm3lyt6Window .4byte 0 - .byte4 __dt__Q36nw4hbm3lyt6WindowFv - .byte4 GetRuntimeTypeInfo__Q36nw4hbm3lyt6WindowCFv - .byte4 CalculateMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo - .byte4 Draw__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo - .byte4 DrawSelf__Q36nw4hbm3lyt6WindowFRCQ36nw4hbm3lyt8DrawInfo - .byte4 Animate__Q36nw4hbm3lyt4PaneFUl - .byte4 AnimateSelf__Q36nw4hbm3lyt6WindowFUl - .byte4 GetVtxColor__Q36nw4hbm3lyt6WindowCFUl - .byte4 SetVtxColor__Q36nw4hbm3lyt6WindowFUlQ36nw4hbm2ut5Color - .byte4 GetColorElement__Q36nw4hbm3lyt4PaneCFUl - .byte4 SetColorElement__Q36nw4hbm3lyt4PaneFUlUc - .byte4 GetVtxColorElement__Q36nw4hbm3lyt6WindowCFUl - .byte4 SetVtxColorElement__Q36nw4hbm3lyt6WindowFUlUc - .byte4 FindPaneByName__Q36nw4hbm3lyt4PaneFPCcb - .byte4 FindMaterialByName__Q36nw4hbm3lyt6WindowFPCcb - .byte4 BindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb - .byte4 UnbindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb - .byte4 UnbindAllAnimation__Q36nw4hbm3lyt4PaneFb - .byte4 UnbindAnimationSelf__Q36nw4hbm3lyt6WindowFPQ36nw4hbm3lyt13AnimTransform - .byte4 FindAnimationLink__Q36nw4hbm3lyt6WindowFPQ36nw4hbm3lyt13AnimTransform - .byte4 SetAnimationEnable__Q36nw4hbm3lyt6WindowFPQ36nw4hbm3lyt13AnimTransformbb - .byte4 GetMaterial__Q36nw4hbm3lyt4PaneCFv - .byte4 LoadMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo - .byte4 GetContentMaterial__Q36nw4hbm3lyt6WindowCFv - .byte4 GetFrameMaterial__Q36nw4hbm3lyt6WindowCFUl - .byte4 DrawContent__Q36nw4hbm3lyt6WindowFRCQ36nw4hbm4math4VEC2RCQ36nw4hbm3lyt15WindowFrameSizeUc - .byte4 DrawFrame__Q36nw4hbm3lyt6WindowFRCQ36nw4hbm4math4VEC2RCQ46nw4hbm3lyt6Window5FrameRCQ36nw4hbm3lyt15WindowFrameSizeUc - .byte4 DrawFrame4__Q36nw4hbm3lyt6WindowFRCQ36nw4hbm4math4VEC2PCQ46nw4hbm3lyt6Window5FrameRCQ36nw4hbm3lyt15WindowFrameSizeUc - .byte4 DrawFrame8__Q36nw4hbm3lyt6WindowFRCQ36nw4hbm4math4VEC2PCQ46nw4hbm3lyt6Window5FrameRCQ36nw4hbm3lyt15WindowFrameSizeUc + .4byte __dt__Q36nw4hbm3lyt6WindowFv + .4byte GetRuntimeTypeInfo__Q36nw4hbm3lyt6WindowCFv + .4byte CalculateMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo + .4byte Draw__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo + .4byte DrawSelf__Q36nw4hbm3lyt6WindowFRCQ36nw4hbm3lyt8DrawInfo + .4byte Animate__Q36nw4hbm3lyt4PaneFUl + .4byte AnimateSelf__Q36nw4hbm3lyt6WindowFUl + .4byte GetVtxColor__Q36nw4hbm3lyt6WindowCFUl + .4byte SetVtxColor__Q36nw4hbm3lyt6WindowFUlQ36nw4hbm2ut5Color + .4byte GetColorElement__Q36nw4hbm3lyt4PaneCFUl + .4byte SetColorElement__Q36nw4hbm3lyt4PaneFUlUc + .4byte GetVtxColorElement__Q36nw4hbm3lyt6WindowCFUl + .4byte SetVtxColorElement__Q36nw4hbm3lyt6WindowFUlUc + .4byte FindPaneByName__Q36nw4hbm3lyt4PaneFPCcb + .4byte FindMaterialByName__Q36nw4hbm3lyt6WindowFPCcb + .4byte BindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb + .4byte UnbindAnimation__Q36nw4hbm3lyt4PaneFPQ36nw4hbm3lyt13AnimTransformb + .4byte UnbindAllAnimation__Q36nw4hbm3lyt4PaneFb + .4byte UnbindAnimationSelf__Q36nw4hbm3lyt6WindowFPQ36nw4hbm3lyt13AnimTransform + .4byte FindAnimationLink__Q36nw4hbm3lyt6WindowFPQ36nw4hbm3lyt13AnimTransform + .4byte SetAnimationEnable__Q36nw4hbm3lyt6WindowFPQ36nw4hbm3lyt13AnimTransformbb + .4byte GetMaterial__Q36nw4hbm3lyt4PaneCFv + .4byte LoadMtx__Q36nw4hbm3lyt4PaneFRCQ36nw4hbm3lyt8DrawInfo + .4byte GetContentMaterial__Q36nw4hbm3lyt6WindowCFv + .4byte GetFrameMaterial__Q36nw4hbm3lyt6WindowCFUl + .4byte DrawContent__Q36nw4hbm3lyt6WindowFRCQ36nw4hbm4math4VEC2RCQ36nw4hbm3lyt15WindowFrameSizeUc + .4byte DrawFrame__Q36nw4hbm3lyt6WindowFRCQ36nw4hbm4math4VEC2RCQ46nw4hbm3lyt6Window5FrameRCQ36nw4hbm3lyt15WindowFrameSizeUc + .4byte DrawFrame4__Q36nw4hbm3lyt6WindowFRCQ36nw4hbm4math4VEC2PCQ46nw4hbm3lyt6Window5FrameRCQ36nw4hbm3lyt15WindowFrameSizeUc + .4byte DrawFrame8__Q36nw4hbm3lyt6WindowFRCQ36nw4hbm4math4VEC2PCQ46nw4hbm3lyt6Window5FrameRCQ36nw4hbm3lyt15WindowFrameSizeUc .global $$28272 $$28272: .asciz "nw4hbm::lyt::Window" .global $$28273 $$28273: - .byte4 __RTTI__Q46nw4hbm3lyt6detail8PaneBase + .4byte __RTTI__Q46nw4hbm3lyt6detail8PaneBase .4byte 0 - .byte4 __RTTI__Q36nw4hbm3lyt4Pane + .4byte __RTTI__Q36nw4hbm3lyt4Pane .4byte 0 .4byte 0 .global __RTTI__Q36nw4hbm3lyt6Window __RTTI__Q36nw4hbm3lyt6Window: - .byte4 $$28272 - .byte4 $$28273 + .4byte $$28272 + .4byte $$28273 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q36nw4hbm3lyt6Window diff --git a/asm/homebuttonLib/ut_Font.s b/asm/homebuttonLib/ut_Font.s index d6c0d8d2..31611e8b 100644 --- a/asm/homebuttonLib/ut_Font.s +++ b/asm/homebuttonLib/ut_Font.s @@ -57,19 +57,19 @@ lbl_80141854: $$298: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ReadNextCharUTF8__Q36nw4hbm2ut14CharStrmReaderFv + .4byte ReadNextCharUTF8__Q36nw4hbm2ut14CharStrmReaderFv .global $$299 $$299: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ReadNextCharUTF16__Q36nw4hbm2ut14CharStrmReaderFv + .4byte ReadNextCharUTF16__Q36nw4hbm2ut14CharStrmReaderFv .global $$2100 $$2100: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ReadNextCharSJIS__Q36nw4hbm2ut14CharStrmReaderFv + .4byte ReadNextCharSJIS__Q36nw4hbm2ut14CharStrmReaderFv .global $$2101 $$2101: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ReadNextCharCP1252__Q36nw4hbm2ut14CharStrmReaderFv + .4byte ReadNextCharCP1252__Q36nw4hbm2ut14CharStrmReaderFv diff --git a/asm/homebuttonLib/ut_ResFont.s b/asm/homebuttonLib/ut_ResFont.s index d4a8bd65..99e4c40c 100644 --- a/asm/homebuttonLib/ut_ResFont.s +++ b/asm/homebuttonLib/ut_ResFont.s @@ -147,55 +147,55 @@ lbl_80141AA0: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm2ut7ResFont __vt__Q36nw4hbm2ut7ResFont: - .byte4 __RTTI__Q36nw4hbm2ut7ResFont + .4byte __RTTI__Q36nw4hbm2ut7ResFont .4byte 0 - .byte4 __dt__Q36nw4hbm2ut7ResFontFv - .byte4 GetWidth__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetHeight__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetAscent__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetDescent__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetBaselinePos__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetCellHeight__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetCellWidth__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetMaxCharWidth__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetType__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetTextureFormat__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetLineFeed__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetDefaultCharWidths__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 SetDefaultCharWidths__Q46nw4hbm2ut6detail11ResFontBaseFRCQ36nw4hbm2ut10CharWidths - .byte4 SetAlternateChar__Q46nw4hbm2ut6detail11ResFontBaseFUs - .byte4 SetLineFeed__Q46nw4hbm2ut6detail11ResFontBaseFi - .byte4 GetCharWidth__Q46nw4hbm2ut6detail11ResFontBaseCFUs - .byte4 GetCharWidths__Q46nw4hbm2ut6detail11ResFontBaseCFUs - .byte4 GetGlyph__Q46nw4hbm2ut6detail11ResFontBaseCFPQ36nw4hbm2ut5GlyphUs - .byte4 GetEncoding__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte __dt__Q36nw4hbm2ut7ResFontFv + .4byte GetWidth__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetHeight__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetAscent__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetDescent__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetBaselinePos__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetCellHeight__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetCellWidth__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetMaxCharWidth__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetType__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetTextureFormat__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetLineFeed__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetDefaultCharWidths__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte SetDefaultCharWidths__Q46nw4hbm2ut6detail11ResFontBaseFRCQ36nw4hbm2ut10CharWidths + .4byte SetAlternateChar__Q46nw4hbm2ut6detail11ResFontBaseFUs + .4byte SetLineFeed__Q46nw4hbm2ut6detail11ResFontBaseFi + .4byte GetCharWidth__Q46nw4hbm2ut6detail11ResFontBaseCFUs + .4byte GetCharWidths__Q46nw4hbm2ut6detail11ResFontBaseCFUs + .4byte GetGlyph__Q46nw4hbm2ut6detail11ResFontBaseCFPQ36nw4hbm2ut5GlyphUs + .4byte GetEncoding__Q46nw4hbm2ut6detail11ResFontBaseCFv .global $$2355 $$2355: .asciz "nw4hbm::ut::ResFont" .global $$2356 $$2356: - .byte4 __RTTI__Q36nw4hbm2ut4Font + .4byte __RTTI__Q36nw4hbm2ut4Font .4byte 0 - .byte4 __RTTI__Q46nw4hbm2ut6detail11ResFontBase + .4byte __RTTI__Q46nw4hbm2ut6detail11ResFontBase .4byte 0 .4byte 0 .global __RTTI__Q36nw4hbm2ut7ResFont __RTTI__Q36nw4hbm2ut7ResFont: - .byte4 $$2355 - .byte4 $$2356 + .4byte $$2355 + .4byte $$2356 .global $$2357 $$2357: .asciz "nw4hbm::ut::detail::ResFontBase" .global $$2358 $$2358: - .byte4 __RTTI__Q36nw4hbm2ut4Font + .4byte __RTTI__Q36nw4hbm2ut4Font .4byte 0 .4byte 0 .4byte 0 .global __RTTI__Q46nw4hbm2ut6detail11ResFontBase __RTTI__Q46nw4hbm2ut6detail11ResFontBase: - .byte4 $$2357 - .byte4 $$2358 + .4byte $$2357 + .4byte $$2358 .global $$2359 $$2359: .asciz "nw4hbm::ut::Font" @@ -203,5 +203,5 @@ $$2359: .4byte 0 .global __RTTI__Q36nw4hbm2ut4Font __RTTI__Q36nw4hbm2ut4Font: - .byte4 $$2359 + .4byte $$2359 .4byte 0 diff --git a/asm/homebuttonLib/ut_ResFontBase.s b/asm/homebuttonLib/ut_ResFontBase.s index bc51985d..f35da88c 100644 --- a/asm/homebuttonLib/ut_ResFontBase.s +++ b/asm/homebuttonLib/ut_ResFontBase.s @@ -402,37 +402,37 @@ lbl_80141F20: $$2549: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ReadNextCharCP1252__Q36nw4hbm2ut14CharStrmReaderFv + .4byte ReadNextCharCP1252__Q36nw4hbm2ut14CharStrmReaderFv .4byte 0 .global __vt__Q46nw4hbm2ut6detail11ResFontBase __vt__Q46nw4hbm2ut6detail11ResFontBase: - .byte4 __RTTI__Q46nw4hbm2ut6detail11ResFontBase + .4byte __RTTI__Q46nw4hbm2ut6detail11ResFontBase .4byte 0 - .byte4 __dt__Q46nw4hbm2ut6detail11ResFontBaseFv - .byte4 GetWidth__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetHeight__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetAscent__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetDescent__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetBaselinePos__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetCellHeight__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetCellWidth__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetMaxCharWidth__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetType__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetTextureFormat__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetLineFeed__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 GetDefaultCharWidths__Q46nw4hbm2ut6detail11ResFontBaseCFv - .byte4 SetDefaultCharWidths__Q46nw4hbm2ut6detail11ResFontBaseFRCQ36nw4hbm2ut10CharWidths - .byte4 SetAlternateChar__Q46nw4hbm2ut6detail11ResFontBaseFUs - .byte4 SetLineFeed__Q46nw4hbm2ut6detail11ResFontBaseFi - .byte4 GetCharWidth__Q46nw4hbm2ut6detail11ResFontBaseCFUs - .byte4 GetCharWidths__Q46nw4hbm2ut6detail11ResFontBaseCFUs - .byte4 GetGlyph__Q46nw4hbm2ut6detail11ResFontBaseCFPQ36nw4hbm2ut5GlyphUs - .byte4 GetEncoding__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte __dt__Q46nw4hbm2ut6detail11ResFontBaseFv + .4byte GetWidth__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetHeight__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetAscent__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetDescent__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetBaselinePos__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetCellHeight__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetCellWidth__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetMaxCharWidth__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetType__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetTextureFormat__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetLineFeed__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte GetDefaultCharWidths__Q46nw4hbm2ut6detail11ResFontBaseCFv + .4byte SetDefaultCharWidths__Q46nw4hbm2ut6detail11ResFontBaseFRCQ36nw4hbm2ut10CharWidths + .4byte SetAlternateChar__Q46nw4hbm2ut6detail11ResFontBaseFUs + .4byte SetLineFeed__Q46nw4hbm2ut6detail11ResFontBaseFi + .4byte GetCharWidth__Q46nw4hbm2ut6detail11ResFontBaseCFUs + .4byte GetCharWidths__Q46nw4hbm2ut6detail11ResFontBaseCFUs + .4byte GetGlyph__Q46nw4hbm2ut6detail11ResFontBaseCFPQ36nw4hbm2ut5GlyphUs + .4byte GetEncoding__Q46nw4hbm2ut6detail11ResFontBaseCFv .global __vt__Q36nw4hbm2ut4Font __vt__Q36nw4hbm2ut4Font: - .byte4 __RTTI__Q36nw4hbm2ut4Font + .4byte __RTTI__Q36nw4hbm2ut4Font .4byte 0 - .byte4 __dt__Q36nw4hbm2ut4FontFv + .4byte __dt__Q36nw4hbm2ut4FontFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/homebuttonLib/ut_TagProcessorBase.s b/asm/homebuttonLib/ut_TagProcessorBase.s index 7bee04e4..55478abd 100644 --- a/asm/homebuttonLib/ut_TagProcessorBase.s +++ b/asm/homebuttonLib/ut_TagProcessorBase.s @@ -770,11 +770,11 @@ $$24655: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm2ut19TagProcessorBase$$0w$$1 __vt__Q36nw4hbm2ut19TagProcessorBase$$0w$$1: - .byte4 __RTTI__Q36nw4hbm2ut19TagProcessorBase$$0w$$1 + .4byte __RTTI__Q36nw4hbm2ut19TagProcessorBase$$0w$$1 .4byte 0 - .byte4 __dt__Q36nw4hbm2ut19TagProcessorBase$$0w$$1Fv - .byte4 Process__Q36nw4hbm2ut19TagProcessorBase$$0w$$1FUsPQ36nw4hbm2ut15PrintContext$$0w$$1 - .byte4 CalcRect__Q36nw4hbm2ut19TagProcessorBase$$0w$$1FPQ36nw4hbm2ut4RectUsPQ36nw4hbm2ut15PrintContext$$0w$$1 + .4byte __dt__Q36nw4hbm2ut19TagProcessorBase$$0w$$1Fv + .4byte Process__Q36nw4hbm2ut19TagProcessorBase$$0w$$1FUsPQ36nw4hbm2ut15PrintContext$$0w$$1 + .4byte CalcRect__Q36nw4hbm2ut19TagProcessorBase$$0w$$1FPQ36nw4hbm2ut4RectUsPQ36nw4hbm2ut15PrintContext$$0w$$1 .global $$24426 $$24426: .asciz "nw4hbm::ut::TagProcessorBase" @@ -782,20 +782,20 @@ $$24426: .4byte 0 .global __RTTI__Q36nw4hbm2ut19TagProcessorBase$$0w$$1 __RTTI__Q36nw4hbm2ut19TagProcessorBase$$0w$$1: - .byte4 $$24426 + .4byte $$24426 .4byte 0 .global __vt__Q36nw4hbm2ut19TagProcessorBase$$0c$$1 __vt__Q36nw4hbm2ut19TagProcessorBase$$0c$$1: - .byte4 __RTTI__Q36nw4hbm2ut19TagProcessorBase$$0c$$1 + .4byte __RTTI__Q36nw4hbm2ut19TagProcessorBase$$0c$$1 .4byte 0 - .byte4 __dt__Q36nw4hbm2ut19TagProcessorBase$$0c$$1Fv - .byte4 Process__Q36nw4hbm2ut19TagProcessorBase$$0c$$1FUsPQ36nw4hbm2ut15PrintContext$$0c$$1 - .byte4 CalcRect__Q36nw4hbm2ut19TagProcessorBase$$0c$$1FPQ36nw4hbm2ut4RectUsPQ36nw4hbm2ut15PrintContext$$0c$$1 + .4byte __dt__Q36nw4hbm2ut19TagProcessorBase$$0c$$1Fv + .4byte Process__Q36nw4hbm2ut19TagProcessorBase$$0c$$1FUsPQ36nw4hbm2ut15PrintContext$$0c$$1 + .4byte CalcRect__Q36nw4hbm2ut19TagProcessorBase$$0c$$1FPQ36nw4hbm2ut4RectUsPQ36nw4hbm2ut15PrintContext$$0c$$1 .global $$24427 $$24427: .asciz "nw4hbm::ut::TagProcessorBase" .balign 4 .global __RTTI__Q36nw4hbm2ut19TagProcessorBase$$0c$$1 __RTTI__Q36nw4hbm2ut19TagProcessorBase$$0c$$1: - .byte4 $$24427 + .4byte $$24427 .4byte 0 diff --git a/asm/homebuttonLib/ut_TextWriterBase.s b/asm/homebuttonLib/ut_TextWriterBase.s index 0931f563..8c2b4247 100644 --- a/asm/homebuttonLib/ut_TextWriterBase.s +++ b/asm/homebuttonLib/ut_TextWriterBase.s @@ -5831,7 +5831,7 @@ lbl_80147E8C: /* 80147EAC 00143CEC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ut_TextWriterBase_cpp + .4byte __sinit_$$3ut_TextWriterBase_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$27999 diff --git a/asm/kpad/KPAD.s b/asm/kpad/KPAD.s index 6d15fdb4..8f41afd5 100644 --- a/asm/kpad/KPAD.s +++ b/asm/kpad/KPAD.s @@ -5776,7 +5776,7 @@ $$2LOCAL$$2KPADiSamplingCallback__Fl$$2table: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __KPADVersion __KPADVersion: - .byte4 $$21614 + .4byte $$21614 .global idist_org idist_org: .4byte 0x3F800000 diff --git a/asm/libMobiclip/MoApi.s b/asm/libMobiclip/MoApi.s index bc1f2204..a26f9455 100644 --- a/asm/libMobiclip/MoApi.s +++ b/asm/libMobiclip/MoApi.s @@ -1176,7 +1176,7 @@ $$23615: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __MOBICLIP_MOVersion __MOBICLIP_MOVersion: - .byte4 $$22662 + .4byte $$22662 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/libMobiclip/MoSdkAdpcmDecoder.s b/asm/libMobiclip/MoSdkAdpcmDecoder.s index 5d2640a8..e34c6d3d 100644 --- a/asm/libMobiclip/MoSdkAdpcmDecoder.s +++ b/asm/libMobiclip/MoSdkAdpcmDecoder.s @@ -241,20 +241,20 @@ $$22535: .balign 4 .global __vt__17MoSdkAdpcmDecoder __vt__17MoSdkAdpcmDecoder: - .byte4 __RTTI__17MoSdkAdpcmDecoder + .4byte __RTTI__17MoSdkAdpcmDecoder .4byte 0 - .byte4 decodeIntoBuffer__17MoSdkAdpcmDecoderFPCUcUlPUsPUl - .byte4 getPcmSizeFromPacket__17MoSdkAdpcmDecoderFUl - .byte4 __dt__17MoSdkAdpcmDecoderFv - .byte4 decode__17MoSdkAudioDecoderFPCUcUl - .byte4 seekPerformed__17MoSdkAudioDecoderFv + .4byte decodeIntoBuffer__17MoSdkAdpcmDecoderFPCUcUlPUsPUl + .4byte getPcmSizeFromPacket__17MoSdkAdpcmDecoderFUl + .4byte __dt__17MoSdkAdpcmDecoderFv + .4byte decode__17MoSdkAudioDecoderFPCUcUl + .4byte seekPerformed__17MoSdkAudioDecoderFv .global $$22510 $$22510: .asciz "MoSdkAdpcmDecoder" .balign 4 .global $$22511 $$22511: - .byte4 __RTTI__17MoSdkAudioDecoder + .4byte __RTTI__17MoSdkAudioDecoder .4byte 0 .4byte 0 .global $$22512 @@ -266,9 +266,9 @@ $$22512: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__17MoSdkAdpcmDecoder __RTTI__17MoSdkAdpcmDecoder: - .byte4 $$22510 - .byte4 $$22511 + .4byte $$22510 + .4byte $$22511 .global __RTTI__17MoSdkAudioDecoder __RTTI__17MoSdkAudioDecoder: - .byte4 $$22512 + .4byte $$22512 .4byte 0 diff --git a/asm/libMobiclip/MoSdkAudioDecoder.s b/asm/libMobiclip/MoSdkAudioDecoder.s index 3718d15c..2dddd68e 100644 --- a/asm/libMobiclip/MoSdkAudioDecoder.s +++ b/asm/libMobiclip/MoSdkAudioDecoder.s @@ -280,10 +280,10 @@ $$22550: .balign 4 .global __vt__17MoSdkAudioDecoder __vt__17MoSdkAudioDecoder: - .byte4 __RTTI__17MoSdkAudioDecoder + .4byte __RTTI__17MoSdkAudioDecoder .4byte 0 .4byte 0 .4byte 0 - .byte4 __dt__17MoSdkAudioDecoderFv - .byte4 decode__17MoSdkAudioDecoderFPCUcUl - .byte4 seekPerformed__17MoSdkAudioDecoderFv + .4byte __dt__17MoSdkAudioDecoderFv + .4byte decode__17MoSdkAudioDecoderFPCUcUl + .4byte seekPerformed__17MoSdkAudioDecoderFv diff --git a/asm/libMobiclip/MoSdkFastAudioDecoder.s b/asm/libMobiclip/MoSdkFastAudioDecoder.s index d3309b87..769f799a 100644 --- a/asm/libMobiclip/MoSdkFastAudioDecoder.s +++ b/asm/libMobiclip/MoSdkFastAudioDecoder.s @@ -265,20 +265,20 @@ $$22578: .balign 4 .global __vt__21MoSdkFastAudioDecoder __vt__21MoSdkFastAudioDecoder: - .byte4 __RTTI__21MoSdkFastAudioDecoder + .4byte __RTTI__21MoSdkFastAudioDecoder .4byte 0 - .byte4 decodeIntoBuffer__21MoSdkFastAudioDecoderFPCUcUlPUsPUl - .byte4 getPcmSizeFromPacket__21MoSdkFastAudioDecoderFUl - .byte4 __dt__21MoSdkFastAudioDecoderFv - .byte4 decode__17MoSdkAudioDecoderFPCUcUl - .byte4 seekPerformed__17MoSdkAudioDecoderFv + .4byte decodeIntoBuffer__21MoSdkFastAudioDecoderFPCUcUlPUsPUl + .4byte getPcmSizeFromPacket__21MoSdkFastAudioDecoderFUl + .4byte __dt__21MoSdkFastAudioDecoderFv + .4byte decode__17MoSdkAudioDecoderFPCUcUl + .4byte seekPerformed__17MoSdkAudioDecoderFv .global $$22542 $$22542: .asciz "MoSdkFastAudioDecoder" .balign 4 .global $$22543 $$22543: - .byte4 __RTTI__17MoSdkAudioDecoder + .4byte __RTTI__17MoSdkAudioDecoder .4byte 0 .4byte 0 .4byte 0 @@ -286,5 +286,5 @@ $$22543: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__21MoSdkFastAudioDecoder __RTTI__21MoSdkFastAudioDecoder: - .byte4 $$22542 - .byte4 $$22543 + .4byte $$22542 + .4byte $$22543 diff --git a/asm/libMobiclip/MoSdkPcmPassthroughDecoder.s b/asm/libMobiclip/MoSdkPcmPassthroughDecoder.s index fa54755f..97968ce2 100644 --- a/asm/libMobiclip/MoSdkPcmPassthroughDecoder.s +++ b/asm/libMobiclip/MoSdkPcmPassthroughDecoder.s @@ -108,20 +108,20 @@ lbl_80153980: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__26MoSdkPcmPassthroughDecoder __vt__26MoSdkPcmPassthroughDecoder: - .byte4 __RTTI__26MoSdkPcmPassthroughDecoder + .4byte __RTTI__26MoSdkPcmPassthroughDecoder .4byte 0 - .byte4 decodeIntoBuffer__26MoSdkPcmPassthroughDecoderFPCUcUlPUsPUl - .byte4 getPcmSizeFromPacket__26MoSdkPcmPassthroughDecoderFUl - .byte4 __dt__26MoSdkPcmPassthroughDecoderFv - .byte4 decode__17MoSdkAudioDecoderFPCUcUl - .byte4 seekPerformed__17MoSdkAudioDecoderFv + .4byte decodeIntoBuffer__26MoSdkPcmPassthroughDecoderFPCUcUlPUsPUl + .4byte getPcmSizeFromPacket__26MoSdkPcmPassthroughDecoderFUl + .4byte __dt__26MoSdkPcmPassthroughDecoderFv + .4byte decode__17MoSdkAudioDecoderFPCUcUl + .4byte seekPerformed__17MoSdkAudioDecoderFv .global $$22523 $$22523: .asciz "MoSdkPcmPassthroughDecoder" .balign 4 .global $$22524 $$22524: - .byte4 __RTTI__17MoSdkAudioDecoder + .4byte __RTTI__17MoSdkAudioDecoder .4byte 0 .4byte 0 .4byte 0 @@ -129,5 +129,5 @@ $$22524: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__26MoSdkPcmPassthroughDecoder __RTTI__26MoSdkPcmPassthroughDecoder: - .byte4 $$22523 - .byte4 $$22524 + .4byte $$22523 + .4byte $$22524 diff --git a/asm/libMobiclip/VX2_DecodeBlock16x16.s b/asm/libMobiclip/VX2_DecodeBlock16x16.s index 8bed36cc..61e31771 100644 --- a/asm/libMobiclip/VX2_DecodeBlock16x16.s +++ b/asm/libMobiclip/VX2_DecodeBlock16x16.s @@ -898,16 +898,16 @@ lbl_801551A8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable16x16 VX2CommandTable16x16: - .byte4 VX2CommandSkip116x16__FR14VX2DecoderData - .byte4 VX2CommandBack116x16__FR14VX2DecoderData - .byte4 VX2CommandBack216x16__FR14VX2DecoderData - .byte4 VX2CommandBack316x16__FR14VX2DecoderData - .byte4 VX2CommandBack416x16__FR14VX2DecoderData - .byte4 VX2CommandBack516x16__FR14VX2DecoderData - .byte4 VX2DecodeBlockIntraSimple__FR14VX2DecoderData - .byte4 VX2DecodeBlockIntra__FR14VX2DecoderData - .byte4 VX2CommandCutH16x16__FR14VX2DecoderData - .byte4 VX2CommandCutV16x16__FR14VX2DecoderData + .4byte VX2CommandSkip116x16__FR14VX2DecoderData + .4byte VX2CommandBack116x16__FR14VX2DecoderData + .4byte VX2CommandBack216x16__FR14VX2DecoderData + .4byte VX2CommandBack316x16__FR14VX2DecoderData + .4byte VX2CommandBack416x16__FR14VX2DecoderData + .4byte VX2CommandBack516x16__FR14VX2DecoderData + .4byte VX2DecodeBlockIntraSimple__FR14VX2DecoderData + .4byte VX2DecodeBlockIntra__FR14VX2DecoderData + .4byte VX2CommandCutH16x16__FR14VX2DecoderData + .4byte VX2CommandCutV16x16__FR14VX2DecoderData .global $$2LOCAL$$2VX2DecodeBlockInter16x16__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter16x16__FR14VX2DecoderData$$2command: .4byte 0x00000008 diff --git a/asm/libMobiclip/VX2_DecodeBlock16x2.s b/asm/libMobiclip/VX2_DecodeBlock16x2.s index a5380e13..76bc5d23 100644 --- a/asm/libMobiclip/VX2_DecodeBlock16x2.s +++ b/asm/libMobiclip/VX2_DecodeBlock16x2.s @@ -855,16 +855,16 @@ lbl_80155E68: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable16x2 VX2CommandTable16x2: - .byte4 VX2CommandSkip116x2__FR14VX2DecoderData - .byte4 VX2CommandBack116x2__FR14VX2DecoderData - .byte4 VX2CommandBack216x2__FR14VX2DecoderData - .byte4 VX2CommandBack316x2__FR14VX2DecoderData - .byte4 VX2CommandBack416x2__FR14VX2DecoderData - .byte4 VX2CommandBack516x2__FR14VX2DecoderData + .4byte VX2CommandSkip116x2__FR14VX2DecoderData + .4byte VX2CommandBack116x2__FR14VX2DecoderData + .4byte VX2CommandBack216x2__FR14VX2DecoderData + .4byte VX2CommandBack316x2__FR14VX2DecoderData + .4byte VX2CommandBack416x2__FR14VX2DecoderData + .4byte VX2CommandBack516x2__FR14VX2DecoderData .4byte 0 .4byte 0 .4byte 0 - .byte4 VX2CommandCutV16x2__FR14VX2DecoderData + .4byte VX2CommandCutV16x2__FR14VX2DecoderData .global $$2LOCAL$$2VX2DecodeBlockInter16x2__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter16x2__FR14VX2DecoderData$$2command: .4byte 0x00000001 diff --git a/asm/libMobiclip/VX2_DecodeBlock16x4.s b/asm/libMobiclip/VX2_DecodeBlock16x4.s index e4597bbb..b2466fd5 100644 --- a/asm/libMobiclip/VX2_DecodeBlock16x4.s +++ b/asm/libMobiclip/VX2_DecodeBlock16x4.s @@ -890,16 +890,16 @@ lbl_80156BA8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable16x4 VX2CommandTable16x4: - .byte4 VX2CommandSkip116x4__FR14VX2DecoderData - .byte4 VX2CommandBack116x4__FR14VX2DecoderData - .byte4 VX2CommandBack216x4__FR14VX2DecoderData - .byte4 VX2CommandBack316x4__FR14VX2DecoderData - .byte4 VX2CommandBack416x4__FR14VX2DecoderData - .byte4 VX2CommandBack516x4__FR14VX2DecoderData + .4byte VX2CommandSkip116x4__FR14VX2DecoderData + .4byte VX2CommandBack116x4__FR14VX2DecoderData + .4byte VX2CommandBack216x4__FR14VX2DecoderData + .4byte VX2CommandBack316x4__FR14VX2DecoderData + .4byte VX2CommandBack416x4__FR14VX2DecoderData + .4byte VX2CommandBack516x4__FR14VX2DecoderData .4byte 0 .4byte 0 - .byte4 VX2CommandCutH16x4__FR14VX2DecoderData - .byte4 VX2CommandCutV16x4__FR14VX2DecoderData + .4byte VX2CommandCutH16x4__FR14VX2DecoderData + .4byte VX2CommandCutV16x4__FR14VX2DecoderData .global $$2LOCAL$$2VX2DecodeBlockInter16x4__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter16x4__FR14VX2DecoderData$$2command: .4byte 0 diff --git a/asm/libMobiclip/VX2_DecodeBlock16x8.s b/asm/libMobiclip/VX2_DecodeBlock16x8.s index ad51ec80..c93eb8c6 100644 --- a/asm/libMobiclip/VX2_DecodeBlock16x8.s +++ b/asm/libMobiclip/VX2_DecodeBlock16x8.s @@ -890,16 +890,16 @@ lbl_801578E8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable16x8 VX2CommandTable16x8: - .byte4 VX2CommandSkip116x8__FR14VX2DecoderData - .byte4 VX2CommandBack116x8__FR14VX2DecoderData - .byte4 VX2CommandBack216x8__FR14VX2DecoderData - .byte4 VX2CommandBack316x8__FR14VX2DecoderData - .byte4 VX2CommandBack416x8__FR14VX2DecoderData - .byte4 VX2CommandBack516x8__FR14VX2DecoderData + .4byte VX2CommandSkip116x8__FR14VX2DecoderData + .4byte VX2CommandBack116x8__FR14VX2DecoderData + .4byte VX2CommandBack216x8__FR14VX2DecoderData + .4byte VX2CommandBack316x8__FR14VX2DecoderData + .4byte VX2CommandBack416x8__FR14VX2DecoderData + .4byte VX2CommandBack516x8__FR14VX2DecoderData .4byte 0 .4byte 0 - .byte4 VX2CommandCutH16x8__FR14VX2DecoderData - .byte4 VX2CommandCutV16x8__FR14VX2DecoderData + .4byte VX2CommandCutH16x8__FR14VX2DecoderData + .4byte VX2CommandCutV16x8__FR14VX2DecoderData .global $$2LOCAL$$2VX2DecodeBlockInter16x8__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter16x8__FR14VX2DecoderData$$2command: .4byte 0x00000002 diff --git a/asm/libMobiclip/VX2_DecodeBlock2x16.s b/asm/libMobiclip/VX2_DecodeBlock2x16.s index 7fbd99a9..1fd5ef03 100644 --- a/asm/libMobiclip/VX2_DecodeBlock2x16.s +++ b/asm/libMobiclip/VX2_DecodeBlock2x16.s @@ -859,15 +859,15 @@ lbl_801585B8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable2x16 VX2CommandTable2x16: - .byte4 VX2CommandSkip12x16__FR14VX2DecoderData - .byte4 VX2CommandBack12x16__FR14VX2DecoderData - .byte4 VX2CommandBack22x16__FR14VX2DecoderData - .byte4 VX2CommandBack32x16__FR14VX2DecoderData - .byte4 VX2CommandBack42x16__FR14VX2DecoderData - .byte4 VX2CommandBack52x16__FR14VX2DecoderData + .4byte VX2CommandSkip12x16__FR14VX2DecoderData + .4byte VX2CommandBack12x16__FR14VX2DecoderData + .4byte VX2CommandBack22x16__FR14VX2DecoderData + .4byte VX2CommandBack32x16__FR14VX2DecoderData + .4byte VX2CommandBack42x16__FR14VX2DecoderData + .4byte VX2CommandBack52x16__FR14VX2DecoderData .4byte 0 .4byte 0 - .byte4 VX2CommandCutH2x16__FR14VX2DecoderData + .4byte VX2CommandCutH2x16__FR14VX2DecoderData .4byte 0 .global $$2LOCAL$$2VX2DecodeBlockInter2x16__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter2x16__FR14VX2DecoderData$$2command: diff --git a/asm/libMobiclip/VX2_DecodeBlock2x2.s b/asm/libMobiclip/VX2_DecodeBlock2x2.s index aae50ffd..ff6673cc 100644 --- a/asm/libMobiclip/VX2_DecodeBlock2x2.s +++ b/asm/libMobiclip/VX2_DecodeBlock2x2.s @@ -824,12 +824,12 @@ lbl_80159208: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable2x2 VX2CommandTable2x2: - .byte4 VX2CommandSkip12x2__FR14VX2DecoderData - .byte4 VX2CommandBack12x2__FR14VX2DecoderData - .byte4 VX2CommandBack22x2__FR14VX2DecoderData - .byte4 VX2CommandBack32x2__FR14VX2DecoderData - .byte4 VX2CommandBack42x2__FR14VX2DecoderData - .byte4 VX2CommandBack52x2__FR14VX2DecoderData + .4byte VX2CommandSkip12x2__FR14VX2DecoderData + .4byte VX2CommandBack12x2__FR14VX2DecoderData + .4byte VX2CommandBack22x2__FR14VX2DecoderData + .4byte VX2CommandBack32x2__FR14VX2DecoderData + .4byte VX2CommandBack42x2__FR14VX2DecoderData + .4byte VX2CommandBack52x2__FR14VX2DecoderData .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/libMobiclip/VX2_DecodeBlock2x4.s b/asm/libMobiclip/VX2_DecodeBlock2x4.s index 4c296927..ca692666 100644 --- a/asm/libMobiclip/VX2_DecodeBlock2x4.s +++ b/asm/libMobiclip/VX2_DecodeBlock2x4.s @@ -859,15 +859,15 @@ lbl_80159ED8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable2x4 VX2CommandTable2x4: - .byte4 VX2CommandSkip12x4__FR14VX2DecoderData - .byte4 VX2CommandBack12x4__FR14VX2DecoderData - .byte4 VX2CommandBack22x4__FR14VX2DecoderData - .byte4 VX2CommandBack32x4__FR14VX2DecoderData - .byte4 VX2CommandBack42x4__FR14VX2DecoderData - .byte4 VX2CommandBack52x4__FR14VX2DecoderData + .4byte VX2CommandSkip12x4__FR14VX2DecoderData + .4byte VX2CommandBack12x4__FR14VX2DecoderData + .4byte VX2CommandBack22x4__FR14VX2DecoderData + .4byte VX2CommandBack32x4__FR14VX2DecoderData + .4byte VX2CommandBack42x4__FR14VX2DecoderData + .4byte VX2CommandBack52x4__FR14VX2DecoderData .4byte 0 .4byte 0 - .byte4 VX2CommandCutH2x4__FR14VX2DecoderData + .4byte VX2CommandCutH2x4__FR14VX2DecoderData .4byte 0 .global $$2LOCAL$$2VX2DecodeBlockInter2x4__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter2x4__FR14VX2DecoderData$$2command: diff --git a/asm/libMobiclip/VX2_DecodeBlock2x8.s b/asm/libMobiclip/VX2_DecodeBlock2x8.s index b7d0bc5f..c2ef27c6 100644 --- a/asm/libMobiclip/VX2_DecodeBlock2x8.s +++ b/asm/libMobiclip/VX2_DecodeBlock2x8.s @@ -859,15 +859,15 @@ lbl_8015ABA8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable2x8 VX2CommandTable2x8: - .byte4 VX2CommandSkip12x8__FR14VX2DecoderData - .byte4 VX2CommandBack12x8__FR14VX2DecoderData - .byte4 VX2CommandBack22x8__FR14VX2DecoderData - .byte4 VX2CommandBack32x8__FR14VX2DecoderData - .byte4 VX2CommandBack42x8__FR14VX2DecoderData - .byte4 VX2CommandBack52x8__FR14VX2DecoderData + .4byte VX2CommandSkip12x8__FR14VX2DecoderData + .4byte VX2CommandBack12x8__FR14VX2DecoderData + .4byte VX2CommandBack22x8__FR14VX2DecoderData + .4byte VX2CommandBack32x8__FR14VX2DecoderData + .4byte VX2CommandBack42x8__FR14VX2DecoderData + .4byte VX2CommandBack52x8__FR14VX2DecoderData .4byte 0 .4byte 0 - .byte4 VX2CommandCutH2x8__FR14VX2DecoderData + .4byte VX2CommandCutH2x8__FR14VX2DecoderData .4byte 0 .global $$2LOCAL$$2VX2DecodeBlockInter2x8__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter2x8__FR14VX2DecoderData$$2command: diff --git a/asm/libMobiclip/VX2_DecodeBlock4x16.s b/asm/libMobiclip/VX2_DecodeBlock4x16.s index 19cc85d1..4a0fd836 100644 --- a/asm/libMobiclip/VX2_DecodeBlock4x16.s +++ b/asm/libMobiclip/VX2_DecodeBlock4x16.s @@ -890,16 +890,16 @@ lbl_8015B8E8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable4x16 VX2CommandTable4x16: - .byte4 VX2CommandSkip14x16__FR14VX2DecoderData - .byte4 VX2CommandBack14x16__FR14VX2DecoderData - .byte4 VX2CommandBack24x16__FR14VX2DecoderData - .byte4 VX2CommandBack34x16__FR14VX2DecoderData - .byte4 VX2CommandBack44x16__FR14VX2DecoderData - .byte4 VX2CommandBack54x16__FR14VX2DecoderData + .4byte VX2CommandSkip14x16__FR14VX2DecoderData + .4byte VX2CommandBack14x16__FR14VX2DecoderData + .4byte VX2CommandBack24x16__FR14VX2DecoderData + .4byte VX2CommandBack34x16__FR14VX2DecoderData + .4byte VX2CommandBack44x16__FR14VX2DecoderData + .4byte VX2CommandBack54x16__FR14VX2DecoderData .4byte 0 .4byte 0 - .byte4 VX2CommandCutH4x16__FR14VX2DecoderData - .byte4 VX2CommandCutV4x16__FR14VX2DecoderData + .4byte VX2CommandCutH4x16__FR14VX2DecoderData + .4byte VX2CommandCutV4x16__FR14VX2DecoderData .global $$2LOCAL$$2VX2DecodeBlockInter4x16__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter4x16__FR14VX2DecoderData$$2command: .4byte 0 diff --git a/asm/libMobiclip/VX2_DecodeBlock4x2.s b/asm/libMobiclip/VX2_DecodeBlock4x2.s index d84dd76c..122e3f35 100644 --- a/asm/libMobiclip/VX2_DecodeBlock4x2.s +++ b/asm/libMobiclip/VX2_DecodeBlock4x2.s @@ -855,16 +855,16 @@ lbl_8015C5A8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable4x2 VX2CommandTable4x2: - .byte4 VX2CommandSkip14x2__FR14VX2DecoderData - .byte4 VX2CommandBack14x2__FR14VX2DecoderData - .byte4 VX2CommandBack24x2__FR14VX2DecoderData - .byte4 VX2CommandBack34x2__FR14VX2DecoderData - .byte4 VX2CommandBack44x2__FR14VX2DecoderData - .byte4 VX2CommandBack54x2__FR14VX2DecoderData + .4byte VX2CommandSkip14x2__FR14VX2DecoderData + .4byte VX2CommandBack14x2__FR14VX2DecoderData + .4byte VX2CommandBack24x2__FR14VX2DecoderData + .4byte VX2CommandBack34x2__FR14VX2DecoderData + .4byte VX2CommandBack44x2__FR14VX2DecoderData + .4byte VX2CommandBack54x2__FR14VX2DecoderData .4byte 0 .4byte 0 .4byte 0 - .byte4 VX2CommandCutV4x2__FR14VX2DecoderData + .4byte VX2CommandCutV4x2__FR14VX2DecoderData .global $$2LOCAL$$2VX2DecodeBlockInter4x2__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter4x2__FR14VX2DecoderData$$2command: .4byte 0 diff --git a/asm/libMobiclip/VX2_DecodeBlock4x4.s b/asm/libMobiclip/VX2_DecodeBlock4x4.s index a524022c..0c1a7a6e 100644 --- a/asm/libMobiclip/VX2_DecodeBlock4x4.s +++ b/asm/libMobiclip/VX2_DecodeBlock4x4.s @@ -890,16 +890,16 @@ lbl_8015D2E8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable4x4 VX2CommandTable4x4: - .byte4 VX2CommandSkip14x4__FR14VX2DecoderData - .byte4 VX2CommandBack14x4__FR14VX2DecoderData - .byte4 VX2CommandBack24x4__FR14VX2DecoderData - .byte4 VX2CommandBack34x4__FR14VX2DecoderData - .byte4 VX2CommandBack44x4__FR14VX2DecoderData - .byte4 VX2CommandBack54x4__FR14VX2DecoderData + .4byte VX2CommandSkip14x4__FR14VX2DecoderData + .4byte VX2CommandBack14x4__FR14VX2DecoderData + .4byte VX2CommandBack24x4__FR14VX2DecoderData + .4byte VX2CommandBack34x4__FR14VX2DecoderData + .4byte VX2CommandBack44x4__FR14VX2DecoderData + .4byte VX2CommandBack54x4__FR14VX2DecoderData .4byte 0 .4byte 0 - .byte4 VX2CommandCutH4x4__FR14VX2DecoderData - .byte4 VX2CommandCutV4x4__FR14VX2DecoderData + .4byte VX2CommandCutH4x4__FR14VX2DecoderData + .4byte VX2CommandCutV4x4__FR14VX2DecoderData .global $$2LOCAL$$2VX2DecodeBlockInter4x4__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter4x4__FR14VX2DecoderData$$2command: .4byte 0 diff --git a/asm/libMobiclip/VX2_DecodeBlock4x8.s b/asm/libMobiclip/VX2_DecodeBlock4x8.s index 003773b8..2f46ef98 100644 --- a/asm/libMobiclip/VX2_DecodeBlock4x8.s +++ b/asm/libMobiclip/VX2_DecodeBlock4x8.s @@ -890,16 +890,16 @@ lbl_8015E028: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable4x8 VX2CommandTable4x8: - .byte4 VX2CommandSkip14x8__FR14VX2DecoderData - .byte4 VX2CommandBack14x8__FR14VX2DecoderData - .byte4 VX2CommandBack24x8__FR14VX2DecoderData - .byte4 VX2CommandBack34x8__FR14VX2DecoderData - .byte4 VX2CommandBack44x8__FR14VX2DecoderData - .byte4 VX2CommandBack54x8__FR14VX2DecoderData + .4byte VX2CommandSkip14x8__FR14VX2DecoderData + .4byte VX2CommandBack14x8__FR14VX2DecoderData + .4byte VX2CommandBack24x8__FR14VX2DecoderData + .4byte VX2CommandBack34x8__FR14VX2DecoderData + .4byte VX2CommandBack44x8__FR14VX2DecoderData + .4byte VX2CommandBack54x8__FR14VX2DecoderData .4byte 0 .4byte 0 - .byte4 VX2CommandCutH4x8__FR14VX2DecoderData - .byte4 VX2CommandCutV4x8__FR14VX2DecoderData + .4byte VX2CommandCutH4x8__FR14VX2DecoderData + .4byte VX2CommandCutV4x8__FR14VX2DecoderData .global $$2LOCAL$$2VX2DecodeBlockInter4x8__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter4x8__FR14VX2DecoderData$$2command: .4byte 0x00000001 diff --git a/asm/libMobiclip/VX2_DecodeBlock8x16.s b/asm/libMobiclip/VX2_DecodeBlock8x16.s index be468cac..39d92b00 100644 --- a/asm/libMobiclip/VX2_DecodeBlock8x16.s +++ b/asm/libMobiclip/VX2_DecodeBlock8x16.s @@ -890,16 +890,16 @@ lbl_8015ED68: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable8x16 VX2CommandTable8x16: - .byte4 VX2CommandSkip18x16__FR14VX2DecoderData - .byte4 VX2CommandBack18x16__FR14VX2DecoderData - .byte4 VX2CommandBack28x16__FR14VX2DecoderData - .byte4 VX2CommandBack38x16__FR14VX2DecoderData - .byte4 VX2CommandBack48x16__FR14VX2DecoderData - .byte4 VX2CommandBack58x16__FR14VX2DecoderData + .4byte VX2CommandSkip18x16__FR14VX2DecoderData + .4byte VX2CommandBack18x16__FR14VX2DecoderData + .4byte VX2CommandBack28x16__FR14VX2DecoderData + .4byte VX2CommandBack38x16__FR14VX2DecoderData + .4byte VX2CommandBack48x16__FR14VX2DecoderData + .4byte VX2CommandBack58x16__FR14VX2DecoderData .4byte 0 .4byte 0 - .byte4 VX2CommandCutH8x16__FR14VX2DecoderData - .byte4 VX2CommandCutV8x16__FR14VX2DecoderData + .4byte VX2CommandCutH8x16__FR14VX2DecoderData + .4byte VX2CommandCutV8x16__FR14VX2DecoderData .global $$2LOCAL$$2VX2DecodeBlockInter8x16__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter8x16__FR14VX2DecoderData$$2command: .4byte 0x00000009 diff --git a/asm/libMobiclip/VX2_DecodeBlock8x2.s b/asm/libMobiclip/VX2_DecodeBlock8x2.s index e8b48b32..0c9250d3 100644 --- a/asm/libMobiclip/VX2_DecodeBlock8x2.s +++ b/asm/libMobiclip/VX2_DecodeBlock8x2.s @@ -855,16 +855,16 @@ lbl_8015FA28: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable8x2 VX2CommandTable8x2: - .byte4 VX2CommandSkip18x2__FR14VX2DecoderData - .byte4 VX2CommandBack18x2__FR14VX2DecoderData - .byte4 VX2CommandBack28x2__FR14VX2DecoderData - .byte4 VX2CommandBack38x2__FR14VX2DecoderData - .byte4 VX2CommandBack48x2__FR14VX2DecoderData - .byte4 VX2CommandBack58x2__FR14VX2DecoderData + .4byte VX2CommandSkip18x2__FR14VX2DecoderData + .4byte VX2CommandBack18x2__FR14VX2DecoderData + .4byte VX2CommandBack28x2__FR14VX2DecoderData + .4byte VX2CommandBack38x2__FR14VX2DecoderData + .4byte VX2CommandBack48x2__FR14VX2DecoderData + .4byte VX2CommandBack58x2__FR14VX2DecoderData .4byte 0 .4byte 0 .4byte 0 - .byte4 VX2CommandCutV8x2__FR14VX2DecoderData + .4byte VX2CommandCutV8x2__FR14VX2DecoderData .global $$2LOCAL$$2VX2DecodeBlockInter8x2__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter8x2__FR14VX2DecoderData$$2command: .4byte 0x00000001 diff --git a/asm/libMobiclip/VX2_DecodeBlock8x4.s b/asm/libMobiclip/VX2_DecodeBlock8x4.s index 87653fac..5eec087f 100644 --- a/asm/libMobiclip/VX2_DecodeBlock8x4.s +++ b/asm/libMobiclip/VX2_DecodeBlock8x4.s @@ -890,16 +890,16 @@ lbl_80160768: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable8x4 VX2CommandTable8x4: - .byte4 VX2CommandSkip18x4__FR14VX2DecoderData - .byte4 VX2CommandBack18x4__FR14VX2DecoderData - .byte4 VX2CommandBack28x4__FR14VX2DecoderData - .byte4 VX2CommandBack38x4__FR14VX2DecoderData - .byte4 VX2CommandBack48x4__FR14VX2DecoderData - .byte4 VX2CommandBack58x4__FR14VX2DecoderData + .4byte VX2CommandSkip18x4__FR14VX2DecoderData + .4byte VX2CommandBack18x4__FR14VX2DecoderData + .4byte VX2CommandBack28x4__FR14VX2DecoderData + .4byte VX2CommandBack38x4__FR14VX2DecoderData + .4byte VX2CommandBack48x4__FR14VX2DecoderData + .4byte VX2CommandBack58x4__FR14VX2DecoderData .4byte 0 .4byte 0 - .byte4 VX2CommandCutH8x4__FR14VX2DecoderData - .byte4 VX2CommandCutV8x4__FR14VX2DecoderData + .4byte VX2CommandCutH8x4__FR14VX2DecoderData + .4byte VX2CommandCutV8x4__FR14VX2DecoderData .global $$2LOCAL$$2VX2DecodeBlockInter8x4__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter8x4__FR14VX2DecoderData$$2command: .4byte 0x00000001 diff --git a/asm/libMobiclip/VX2_DecodeBlock8x8.s b/asm/libMobiclip/VX2_DecodeBlock8x8.s index 9e438a39..641d24c4 100644 --- a/asm/libMobiclip/VX2_DecodeBlock8x8.s +++ b/asm/libMobiclip/VX2_DecodeBlock8x8.s @@ -890,16 +890,16 @@ lbl_801614A8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable8x8 VX2CommandTable8x8: - .byte4 VX2CommandSkip18x8__FR14VX2DecoderData - .byte4 VX2CommandBack18x8__FR14VX2DecoderData - .byte4 VX2CommandBack28x8__FR14VX2DecoderData - .byte4 VX2CommandBack38x8__FR14VX2DecoderData - .byte4 VX2CommandBack48x8__FR14VX2DecoderData - .byte4 VX2CommandBack58x8__FR14VX2DecoderData + .4byte VX2CommandSkip18x8__FR14VX2DecoderData + .4byte VX2CommandBack18x8__FR14VX2DecoderData + .4byte VX2CommandBack28x8__FR14VX2DecoderData + .4byte VX2CommandBack38x8__FR14VX2DecoderData + .4byte VX2CommandBack48x8__FR14VX2DecoderData + .4byte VX2CommandBack58x8__FR14VX2DecoderData .4byte 0 .4byte 0 - .byte4 VX2CommandCutH8x8__FR14VX2DecoderData - .byte4 VX2CommandCutV8x8__FR14VX2DecoderData + .4byte VX2CommandCutH8x8__FR14VX2DecoderData + .4byte VX2CommandCutV8x8__FR14VX2DecoderData .global $$2LOCAL$$2VX2DecodeBlockInter8x8__FR14VX2DecoderData$$2command $$2LOCAL$$2VX2DecodeBlockInter8x8__FR14VX2DecoderData$$2command: .4byte 0x00000003 diff --git a/asm/libMobiclip/VX2_MotionCompensation.s b/asm/libMobiclip/VX2_MotionCompensation.s index 41b0bd46..5224ac03 100644 --- a/asm/libMobiclip/VX2_MotionCompensation.s +++ b/asm/libMobiclip/VX2_MotionCompensation.s @@ -901,10 +901,10 @@ InvSbpTable: .4byte 0xFFFFFFFF .global DecodeEscapeTable DecodeEscapeTable: - .byte4 DecodeEscape__FR14VX2DecoderDataRiRiRi - .byte4 DecodeEscape__FR14VX2DecoderDataRiRiRi - .byte4 DecodeEscape2__FR14VX2DecoderDataRiRiRi - .byte4 DecodeEscape3__FR14VX2DecoderDataRiRiRi + .4byte DecodeEscape__FR14VX2DecoderDataRiRiRi + .4byte DecodeEscape__FR14VX2DecoderDataRiRiRi + .4byte DecodeEscape2__FR14VX2DecoderDataRiRiRi + .4byte DecodeEscape3__FR14VX2DecoderDataRiRiRi .global ZigZag8x8 ZigZag8x8: .4byte 0 diff --git a/asm/libnw4r_ef/ef_cube.s b/asm/libnw4r_ef/ef_cube.s index 7d176458..f7426a84 100644 --- a/asm/libnw4r_ef/ef_cube.s +++ b/asm/libnw4r_ef/ef_cube.s @@ -1951,7 +1951,7 @@ lbl_800B8904: __vt__Q34nw4r2ef15EmitterFormCube: .4byte 0 .4byte 0 - .byte4 Emission__Q34nw4r2ef15EmitterFormCubeFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 + .4byte Emission__Q34nw4r2ef15EmitterFormCubeFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_ef/ef_cylinder.s b/asm/libnw4r_ef/ef_cylinder.s index c466c053..d7b6311d 100644 --- a/asm/libnw4r_ef/ef_cylinder.s +++ b/asm/libnw4r_ef/ef_cylinder.s @@ -531,7 +531,7 @@ lbl_800B6728: __vt__Q34nw4r2ef19EmitterFormCylinder: .4byte 0 .4byte 0 - .byte4 Emission__Q34nw4r2ef19EmitterFormCylinderFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 + .4byte Emission__Q34nw4r2ef19EmitterFormCylinderFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_ef/ef_disc.s b/asm/libnw4r_ef/ef_disc.s index f98bdd8e..fdc85cdc 100644 --- a/asm/libnw4r_ef/ef_disc.s +++ b/asm/libnw4r_ef/ef_disc.s @@ -365,7 +365,7 @@ lbl_800B56E4: __vt__Q34nw4r2ef15EmitterFormDisc: .4byte 0 .4byte 0 - .byte4 Emission__Q34nw4r2ef15EmitterFormDiscFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 + .4byte Emission__Q34nw4r2ef15EmitterFormDiscFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_ef/ef_drawbillboardstrategy.s b/asm/libnw4r_ef/ef_drawbillboardstrategy.s index 0390663f..af8bdb8b 100644 --- a/asm/libnw4r_ef/ef_drawbillboardstrategy.s +++ b/asm/libnw4r_ef/ef_drawbillboardstrategy.s @@ -2297,11 +2297,11 @@ __dt__Q34nw4r2ef21DrawBillboardStrategyFv: __vt__Q34nw4r2ef21DrawBillboardStrategy: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r2ef21DrawBillboardStrategyFv - .byte4 Draw__Q34nw4r2ef21DrawBillboardStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager - .byte4 GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .byte4 GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .byte4 GetCalcAheadFunc__Q34nw4r2ef21DrawBillboardStrategyFPQ34nw4r2ef15ParticleManager + .4byte __dt__Q34nw4r2ef21DrawBillboardStrategyFv + .4byte Draw__Q34nw4r2ef21DrawBillboardStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetCalcAheadFunc__Q34nw4r2ef21DrawBillboardStrategyFPQ34nw4r2ef15ParticleManager .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/libnw4r_ef/ef_drawdirectionalstrategy.s b/asm/libnw4r_ef/ef_drawdirectionalstrategy.s index 3341f24f..f3545981 100644 --- a/asm/libnw4r_ef/ef_drawdirectionalstrategy.s +++ b/asm/libnw4r_ef/ef_drawdirectionalstrategy.s @@ -2521,11 +2521,11 @@ $$2LOCAL$$2DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8Dra __vt__Q34nw4r2ef23DrawDirectionalStrategy: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r2ef23DrawDirectionalStrategyFv - .byte4 Draw__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager - .byte4 GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .byte4 GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .byte4 GetCalcAheadFunc__Q34nw4r2ef23DrawDirectionalStrategyFPQ34nw4r2ef15ParticleManager + .4byte __dt__Q34nw4r2ef23DrawDirectionalStrategyFv + .4byte Draw__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetCalcAheadFunc__Q34nw4r2ef23DrawDirectionalStrategyFPQ34nw4r2ef15ParticleManager .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/libnw4r_ef/ef_drawfreestrategy.s b/asm/libnw4r_ef/ef_drawfreestrategy.s index f4eee105..79614ba2 100644 --- a/asm/libnw4r_ef/ef_drawfreestrategy.s +++ b/asm/libnw4r_ef/ef_drawfreestrategy.s @@ -629,10 +629,10 @@ $$2LOCAL$$2Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15 __vt__Q34nw4r2ef16DrawFreeStrategy: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r2ef16DrawFreeStrategyFv - .byte4 Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager - .byte4 GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .byte4 GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte __dt__Q34nw4r2ef16DrawFreeStrategyFv + .4byte Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global free_tex0_u8__Q24nw4r2ef diff --git a/asm/libnw4r_ef/ef_drawlinestrategy.s b/asm/libnw4r_ef/ef_drawlinestrategy.s index 3c277bfe..f24b1595 100644 --- a/asm/libnw4r_ef/ef_drawlinestrategy.s +++ b/asm/libnw4r_ef/ef_drawlinestrategy.s @@ -420,10 +420,10 @@ __dt__Q34nw4r2ef16DrawLineStrategyFv: __vt__Q34nw4r2ef16DrawLineStrategy: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r2ef16DrawLineStrategyFv - .byte4 Draw__Q34nw4r2ef16DrawLineStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager - .byte4 GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .byte4 GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte __dt__Q34nw4r2ef16DrawLineStrategyFv + .4byte Draw__Q34nw4r2ef16DrawLineStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$211461 diff --git a/asm/libnw4r_ef/ef_draworder.s b/asm/libnw4r_ef/ef_draworder.s index e4b25d24..02f814c2 100644 --- a/asm/libnw4r_ef/ef_draworder.s +++ b/asm/libnw4r_ef/ef_draworder.s @@ -92,7 +92,7 @@ Remove__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectPQ34nw4r2ef15ParticleManager: __vt__Q34nw4r2ef9DrawOrder: .4byte 0 .4byte 0 - .byte4 Add__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectPQ34nw4r2ef15ParticleManager - .byte4 Remove__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectPQ34nw4r2ef15ParticleManager - .byte4 Draw__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectRCQ34nw4r2ef8DrawInfo + .4byte Add__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectPQ34nw4r2ef15ParticleManager + .4byte Remove__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectPQ34nw4r2ef15ParticleManager + .4byte Draw__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectRCQ34nw4r2ef8DrawInfo .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawpointstrategy.s b/asm/libnw4r_ef/ef_drawpointstrategy.s index 8603d09a..9a888350 100644 --- a/asm/libnw4r_ef/ef_drawpointstrategy.s +++ b/asm/libnw4r_ef/ef_drawpointstrategy.s @@ -312,10 +312,10 @@ __dt__Q34nw4r2ef17DrawPointStrategyFv: __vt__Q34nw4r2ef17DrawPointStrategy: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r2ef17DrawPointStrategyFv - .byte4 Draw__Q34nw4r2ef17DrawPointStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager - .byte4 GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .byte4 GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte __dt__Q34nw4r2ef17DrawPointStrategyFv + .4byte Draw__Q34nw4r2ef17DrawPointStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$211451 diff --git a/asm/libnw4r_ef/ef_drawsmoothstripestrategy.s b/asm/libnw4r_ef/ef_drawsmoothstripestrategy.s index b82503da..2b389217 100644 --- a/asm/libnw4r_ef/ef_drawsmoothstripestrategy.s +++ b/asm/libnw4r_ef/ef_drawsmoothstripestrategy.s @@ -5478,11 +5478,11 @@ __dt__Q34nw4r2ef24DrawSmoothStripeStrategyFv: __vt__Q34nw4r2ef24DrawSmoothStripeStrategy: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r2ef24DrawSmoothStripeStrategyFv - .byte4 Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager - .byte4 GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .byte4 GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .byte4 GetCalcAheadFunc__Q34nw4r2ef24DrawSmoothStripeStrategyFPQ34nw4r2ef15ParticleManager + .4byte __dt__Q34nw4r2ef24DrawSmoothStripeStrategyFv + .4byte Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetCalcAheadFunc__Q34nw4r2ef24DrawSmoothStripeStrategyFPQ34nw4r2ef15ParticleManager .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawstrategybuilder.s b/asm/libnw4r_ef/ef_drawstrategybuilder.s index c02a257f..23ea63f4 100644 --- a/asm/libnw4r_ef/ef_drawstrategybuilder.s +++ b/asm/libnw4r_ef/ef_drawstrategybuilder.s @@ -129,7 +129,7 @@ lbl_800B8B3C: __vt__Q34nw4r2ef19DrawStrategyBuilder: .4byte 0 .4byte 0 - .byte4 Create__Q34nw4r2ef19DrawStrategyBuilderFUl + .4byte Create__Q34nw4r2ef19DrawStrategyBuilderFUl .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/libnw4r_ef/ef_drawstrategyimpl.s b/asm/libnw4r_ef/ef_drawstrategyimpl.s index 13b19f78..f722cf99 100644 --- a/asm/libnw4r_ef/ef_drawstrategyimpl.s +++ b/asm/libnw4r_ef/ef_drawstrategyimpl.s @@ -2308,17 +2308,17 @@ __sinit_$$3ef_drawstrategyimpl_cpp: /* 800BAB4C 000B698C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ef_drawstrategyimpl_cpp + .4byte __sinit_$$3ef_drawstrategyimpl_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef16DrawStrategyImpl __vt__Q34nw4r2ef16DrawStrategyImpl: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r2ef16DrawStrategyImplFv + .4byte __dt__Q34nw4r2ef16DrawStrategyImplFv .4byte 0 - .byte4 GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .byte4 GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29915 diff --git a/asm/libnw4r_ef/ef_drawstripestrategy.s b/asm/libnw4r_ef/ef_drawstripestrategy.s index e1bcd78f..bec28ac8 100644 --- a/asm/libnw4r_ef/ef_drawstripestrategy.s +++ b/asm/libnw4r_ef/ef_drawstripestrategy.s @@ -3794,11 +3794,11 @@ __dt__Q34nw4r2ef18DrawStripeStrategyFv: __vt__Q34nw4r2ef18DrawStripeStrategy: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r2ef18DrawStripeStrategyFv - .byte4 Draw__Q34nw4r2ef18DrawStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager - .byte4 GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .byte4 GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .byte4 GetCalcAheadFunc__Q34nw4r2ef18DrawStripeStrategyFPQ34nw4r2ef15ParticleManager + .4byte __dt__Q34nw4r2ef18DrawStripeStrategyFv + .4byte Draw__Q34nw4r2ef18DrawStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetCalcAheadFunc__Q34nw4r2ef18DrawStripeStrategyFPQ34nw4r2ef15ParticleManager .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_ef/ef_effect.s b/asm/libnw4r_ef/ef_effect.s index e2646208..50243b0b 100644 --- a/asm/libnw4r_ef/ef_effect.s +++ b/asm/libnw4r_ef/ef_effect.s @@ -881,12 +881,12 @@ lbl_800A4648: __vt__Q34nw4r2ef6Effect: .4byte 0 .4byte 0 - .byte4 SendClosing__Q34nw4r2ef6EffectFv - .byte4 DestroyFunc__Q34nw4r2ef6EffectFv - .byte4 Initialize__Q34nw4r2ef6EffectFPQ34nw4r2ef12EffectSystemPQ34nw4r2ef15EmitterResourceUs - .byte4 CreateEmitter__Q34nw4r2ef6EffectFQ34nw4r2ef10ResEmitterUcUs - .byte4 Calc__Q34nw4r2ef6EffectFQ34nw4r2ef10CalcOption - .byte4 Draw__Q34nw4r2ef6EffectFRCQ34nw4r2ef8DrawInfo + .4byte SendClosing__Q34nw4r2ef6EffectFv + .4byte DestroyFunc__Q34nw4r2ef6EffectFv + .4byte Initialize__Q34nw4r2ef6EffectFPQ34nw4r2ef12EffectSystemPQ34nw4r2ef15EmitterResourceUs + .4byte CreateEmitter__Q34nw4r2ef6EffectFQ34nw4r2ef10ResEmitterUcUs + .4byte Calc__Q34nw4r2ef6EffectFQ34nw4r2ef10CalcOption + .4byte Draw__Q34nw4r2ef6EffectFRCQ34nw4r2ef8DrawInfo .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28467 diff --git a/asm/libnw4r_ef/ef_effectsystem.s b/asm/libnw4r_ef/ef_effectsystem.s index 1f2f378c..5599e27e 100644 --- a/asm/libnw4r_ef/ef_effectsystem.s +++ b/asm/libnw4r_ef/ef_effectsystem.s @@ -489,7 +489,7 @@ lbl_800A4D04: /* 800A4D4C 000A0B8C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ef_effectsystem_cpp + .4byte __sinit_$$3ef_effectsystem_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$27903 @@ -500,7 +500,7 @@ $$27903: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global NW4R_EF_Version___29$$2unnamed$$2ef_effectsystem_cpp$$2 NW4R_EF_Version___29$$2unnamed$$2ef_effectsystem_cpp$$2: - .byte4 $$27903 + .4byte $$27903 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_ef/ef_emform.s b/asm/libnw4r_ef/ef_emform.s index 4b005914..42b0871d 100644 --- a/asm/libnw4r_ef/ef_emform.s +++ b/asm/libnw4r_ef/ef_emform.s @@ -72,14 +72,14 @@ __sinit_$$3ef_emform_cpp: /* 800B4BAC 000B09EC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ef_emform_cpp + .4byte __sinit_$$3ef_emform_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef15EmitFormBuilder __vt__Q34nw4r2ef15EmitFormBuilder: .4byte 0 .4byte 0 - .byte4 Create__Q34nw4r2ef15EmitFormBuilderFQ34nw4r2ef12EmitFormType + .4byte Create__Q34nw4r2ef15EmitFormBuilderFQ34nw4r2ef12EmitFormType .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/libnw4r_ef/ef_emitter.s b/asm/libnw4r_ef/ef_emitter.s index e4e271a6..90912039 100644 --- a/asm/libnw4r_ef/ef_emitter.s +++ b/asm/libnw4r_ef/ef_emitter.s @@ -2353,14 +2353,14 @@ lbl_800A6ED8: __vt__Q34nw4r2ef7Emitter: .4byte 0 .4byte 0 - .byte4 SendClosing__Q34nw4r2ef7EmitterFv - .byte4 DestroyFunc__Q34nw4r2ef7EmitterFv - .byte4 Initialize__Q34nw4r2ef7EmitterFPQ34nw4r2ef6EffectPQ34nw4r2ef15EmitterResourceUc - .byte4 CreateEmitter__Q34nw4r2ef7EmitterFPQ34nw4r2ef15EmitterResourcePQ34nw4r2ef21EmitterInheritSettingPQ34nw4r2ef8ParticleUsPQ34nw4r4math4VEC3 - .byte4 CalcEmitter__Q34nw4r2ef7EmitterFv - .byte4 CalcParticle__Q34nw4r2ef7EmitterFv - .byte4 CalcEmission__Q34nw4r2ef7EmitterFv - .byte4 CalcBillboard__Q34nw4r2ef7EmitterFv + .4byte SendClosing__Q34nw4r2ef7EmitterFv + .4byte DestroyFunc__Q34nw4r2ef7EmitterFv + .4byte Initialize__Q34nw4r2ef7EmitterFPQ34nw4r2ef6EffectPQ34nw4r2ef15EmitterResourceUc + .4byte CreateEmitter__Q34nw4r2ef7EmitterFPQ34nw4r2ef15EmitterResourcePQ34nw4r2ef21EmitterInheritSettingPQ34nw4r2ef8ParticleUsPQ34nw4r4math4VEC3 + .4byte CalcEmitter__Q34nw4r2ef7EmitterFv + .4byte CalcParticle__Q34nw4r2ef7EmitterFv + .4byte CalcEmission__Q34nw4r2ef7EmitterFv + .4byte CalcBillboard__Q34nw4r2ef7EmitterFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29108 diff --git a/asm/libnw4r_ef/ef_line.s b/asm/libnw4r_ef/ef_line.s index e74acb70..320e13c1 100644 --- a/asm/libnw4r_ef/ef_line.s +++ b/asm/libnw4r_ef/ef_line.s @@ -224,7 +224,7 @@ lbl_800B51D8: __vt__Q34nw4r2ef15EmitterFormLine: .4byte 0 .4byte 0 - .byte4 Emission__Q34nw4r2ef15EmitterFormLineFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 + .4byte Emission__Q34nw4r2ef15EmitterFormLineFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_ef/ef_particle.s b/asm/libnw4r_ef/ef_particle.s index d665f3ce..50e1eb40 100644 --- a/asm/libnw4r_ef/ef_particle.s +++ b/asm/libnw4r_ef/ef_particle.s @@ -950,9 +950,9 @@ lbl_800B023C: __vt__Q34nw4r2ef8Particle: .4byte 0 .4byte 0 - .byte4 SendClosing__Q34nw4r2ef8ParticleFv - .byte4 DestroyFunc__Q34nw4r2ef8ParticleFv - .byte4 Initialize__Q34nw4r2ef8ParticleFUsQ34nw4r4math4VEC3Q34nw4r4math4VEC3PQ34nw4r2ef15ParticleManagerPCQ34nw4r4math5MTX34fPCQ34nw4r2ef21EmitterInheritSettingPQ34nw4r2ef8Particle + .4byte SendClosing__Q34nw4r2ef8ParticleFv + .4byte DestroyFunc__Q34nw4r2ef8ParticleFv + .4byte Initialize__Q34nw4r2ef8ParticleFUsQ34nw4r4math4VEC3Q34nw4r4math4VEC3PQ34nw4r2ef15ParticleManagerPCQ34nw4r4math5MTX34fPCQ34nw4r2ef21EmitterInheritSettingPQ34nw4r2ef8Particle .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_ef/ef_particlemanager.s b/asm/libnw4r_ef/ef_particlemanager.s index 73a3e8ce..ebb14f50 100644 --- a/asm/libnw4r_ef/ef_particlemanager.s +++ b/asm/libnw4r_ef/ef_particlemanager.s @@ -2380,7 +2380,7 @@ __sinit_$$3ef_particlemanager_cpp: /* 800B253C 000AE37C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ef_particlemanager_cpp + .4byte __sinit_$$3ef_particlemanager_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$211043 @@ -2399,12 +2399,12 @@ $$211043: __vt__Q34nw4r2ef15ParticleManager: .4byte 0 .4byte 0 - .byte4 SendClosing__Q34nw4r2ef15ParticleManagerFv - .byte4 DestroyFunc__Q34nw4r2ef15ParticleManagerFv - .byte4 Initialize__Q34nw4r2ef15ParticleManagerFPQ34nw4r2ef7EmitterPQ34nw4r2ef15EmitterResource - .byte4 CreateParticle__Q34nw4r2ef15ParticleManagerFUsQ34nw4r4math4VEC3Q34nw4r4math4VEC3PCQ34nw4r4math5MTX34fPCQ34nw4r2ef21EmitterInheritSettingPQ34nw4r2ef8ParticleUs - .byte4 Calc__Q34nw4r2ef15ParticleManagerFv - .byte4 Draw__Q34nw4r2ef15ParticleManagerFRCQ34nw4r2ef8DrawInfo + .4byte SendClosing__Q34nw4r2ef15ParticleManagerFv + .4byte DestroyFunc__Q34nw4r2ef15ParticleManagerFv + .4byte Initialize__Q34nw4r2ef15ParticleManagerFPQ34nw4r2ef7EmitterPQ34nw4r2ef15EmitterResource + .4byte CreateParticle__Q34nw4r2ef15ParticleManagerFUsQ34nw4r4math4VEC3Q34nw4r4math4VEC3PCQ34nw4r4math5MTX34fPCQ34nw4r2ef21EmitterInheritSettingPQ34nw4r2ef8ParticleUs + .4byte Calc__Q34nw4r2ef15ParticleManagerFv + .4byte Draw__Q34nw4r2ef15ParticleManagerFRCQ34nw4r2ef8DrawInfo .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210377 diff --git a/asm/libnw4r_ef/ef_point.s b/asm/libnw4r_ef/ef_point.s index 58b2547e..3246476f 100644 --- a/asm/libnw4r_ef/ef_point.s +++ b/asm/libnw4r_ef/ef_point.s @@ -228,7 +228,7 @@ lbl_800B4E80: __vt__Q34nw4r2ef16EmitterFormPoint: .4byte 0 .4byte 0 - .byte4 Emission__Q34nw4r2ef16EmitterFormPointFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 + .4byte Emission__Q34nw4r2ef16EmitterFormPointFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_ef/ef_resource.s b/asm/libnw4r_ef/ef_resource.s index 2de07eb2..a9f2130c 100644 --- a/asm/libnw4r_ef/ef_resource.s +++ b/asm/libnw4r_ef/ef_resource.s @@ -852,7 +852,7 @@ __sinit_$$3ef_resource_cpp: /* 800B30AC 000AEEEC 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ef_resource_cpp + .4byte __sinit_$$3ef_resource_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global mResource__Q34nw4r2ef8Resource diff --git a/asm/libnw4r_ef/ef_sphere.s b/asm/libnw4r_ef/ef_sphere.s index af40bb42..da4d7b5d 100644 --- a/asm/libnw4r_ef/ef_sphere.s +++ b/asm/libnw4r_ef/ef_sphere.s @@ -572,7 +572,7 @@ lbl_800B5F2C: __vt__Q34nw4r2ef17EmitterFormSphere: .4byte 0 .4byte 0 - .byte4 Emission__Q34nw4r2ef17EmitterFormSphereFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 + .4byte Emission__Q34nw4r2ef17EmitterFormSphereFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_ef/ef_torus.s b/asm/libnw4r_ef/ef_torus.s index 73f5e410..f492fd5a 100644 --- a/asm/libnw4r_ef/ef_torus.s +++ b/asm/libnw4r_ef/ef_torus.s @@ -430,7 +430,7 @@ lbl_800B6D24: __vt__Q34nw4r2ef16EmitterFormTorus: .4byte 0 .4byte 0 - .byte4 Emission__Q34nw4r2ef16EmitterFormTorusFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 + .4byte Emission__Q34nw4r2ef16EmitterFormTorusFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_g3d/g3d_3dsmax.s b/asm/libnw4r_g3d/g3d_3dsmax.s index a0f230de..332fea93 100644 --- a/asm/libnw4r_g3d/g3d_3dsmax.s +++ b/asm/libnw4r_g3d/g3d_3dsmax.s @@ -757,22 +757,22 @@ lbl_800E90F8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable $$2LOCAL$$2CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable: - .byte4 MakeTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_T__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_R__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_T__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_R__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt .global $$2LOCAL$$2CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20 $$2LOCAL$$2CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20: - .byte4 ProductTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_T__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_R__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_S__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_T__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_R__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_S__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$26188 diff --git a/asm/libnw4r_g3d/g3d_anmchr.s b/asm/libnw4r_g3d/g3d_anmchr.s index fe2e98f5..a96e4c7e 100644 --- a/asm/libnw4r_g3d/g3d_anmchr.s +++ b/asm/libnw4r_g3d/g3d_anmchr.s @@ -1948,96 +1948,96 @@ TYPE_NAME__Q34nw4r3g3d12AnmObjChrRes: __vt__Q34nw4r3g3d12AnmObjChrRes: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d12AnmObjChrResCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d12AnmObjChrResFUlUlPv - .byte4 __dt__Q34nw4r3g3d12AnmObjChrResFv - .byte4 GetTypeObj__Q34nw4r3g3d12AnmObjChrResCFv - .byte4 GetTypeName__Q34nw4r3g3d12AnmObjChrResCFv - .byte4 SetFrame__Q34nw4r3g3d12AnmObjChrResFf - .byte4 GetFrame__Q34nw4r3g3d12AnmObjChrResCFv - .byte4 UpdateFrame__Q34nw4r3g3d12AnmObjChrResFv - .byte4 SetUpdateRate__Q34nw4r3g3d12AnmObjChrResFf - .byte4 GetUpdateRate__Q34nw4r3g3d12AnmObjChrResCFv - .byte4 Bind__Q34nw4r3g3d12AnmObjChrResFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d9AnmObjChrFv - .byte4 GetResult__Q34nw4r3g3d12AnmObjChrResFPQ34nw4r3g3d12ChrAnmResultUl - .byte4 Attach__Q34nw4r3g3d9AnmObjChrFiPQ34nw4r3g3d12AnmObjChrRes - .byte4 Detach__Q34nw4r3g3d9AnmObjChrFi - .byte4 DetachAll__Q34nw4r3g3d9AnmObjChrFv - .byte4 SetWeight__Q34nw4r3g3d9AnmObjChrFif - .byte4 GetWeight__Q34nw4r3g3d9AnmObjChrCFi - .byte4 Bind__Q34nw4r3g3d12AnmObjChrResFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption - .byte4 Release__Q34nw4r3g3d12AnmObjChrResFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption + .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjChrResCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d12AnmObjChrResFUlUlPv + .4byte __dt__Q34nw4r3g3d12AnmObjChrResFv + .4byte GetTypeObj__Q34nw4r3g3d12AnmObjChrResCFv + .4byte GetTypeName__Q34nw4r3g3d12AnmObjChrResCFv + .4byte SetFrame__Q34nw4r3g3d12AnmObjChrResFf + .4byte GetFrame__Q34nw4r3g3d12AnmObjChrResCFv + .4byte UpdateFrame__Q34nw4r3g3d12AnmObjChrResFv + .4byte SetUpdateRate__Q34nw4r3g3d12AnmObjChrResFf + .4byte GetUpdateRate__Q34nw4r3g3d12AnmObjChrResCFv + .4byte Bind__Q34nw4r3g3d12AnmObjChrResFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d9AnmObjChrFv + .4byte GetResult__Q34nw4r3g3d12AnmObjChrResFPQ34nw4r3g3d12ChrAnmResultUl + .4byte Attach__Q34nw4r3g3d9AnmObjChrFiPQ34nw4r3g3d12AnmObjChrRes + .4byte Detach__Q34nw4r3g3d9AnmObjChrFi + .4byte DetachAll__Q34nw4r3g3d9AnmObjChrFv + .4byte SetWeight__Q34nw4r3g3d9AnmObjChrFif + .4byte GetWeight__Q34nw4r3g3d9AnmObjChrCFi + .4byte Bind__Q34nw4r3g3d12AnmObjChrResFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption + .4byte Release__Q34nw4r3g3d12AnmObjChrResFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption .global __vt__Q34nw4r3g3d14AnmObjChrBlend __vt__Q34nw4r3g3d14AnmObjChrBlend: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d14AnmObjChrBlendCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d13AnmObjChrNodeFUlUlPv - .byte4 __dt__Q34nw4r3g3d14AnmObjChrBlendFv - .byte4 GetTypeObj__Q34nw4r3g3d14AnmObjChrBlendCFv - .byte4 GetTypeName__Q34nw4r3g3d14AnmObjChrBlendCFv - .byte4 SetFrame__Q34nw4r3g3d13AnmObjChrNodeFf - .byte4 GetFrame__Q34nw4r3g3d13AnmObjChrNodeCFv - .byte4 UpdateFrame__Q34nw4r3g3d13AnmObjChrNodeFv - .byte4 SetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeFf - .byte4 GetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeCFv - .byte4 Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d13AnmObjChrNodeFv - .byte4 GetResult__Q34nw4r3g3d14AnmObjChrBlendFPQ34nw4r3g3d12ChrAnmResultUl - .byte4 Attach__Q34nw4r3g3d13AnmObjChrNodeFiPQ34nw4r3g3d12AnmObjChrRes - .byte4 Detach__Q34nw4r3g3d13AnmObjChrNodeFi - .byte4 DetachAll__Q34nw4r3g3d13AnmObjChrNodeFv - .byte4 SetWeight__Q34nw4r3g3d14AnmObjChrBlendFif - .byte4 GetWeight__Q34nw4r3g3d14AnmObjChrBlendCFi - .byte4 Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption - .byte4 Release__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption + .4byte IsDerivedFrom__Q34nw4r3g3d14AnmObjChrBlendCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d13AnmObjChrNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d14AnmObjChrBlendFv + .4byte GetTypeObj__Q34nw4r3g3d14AnmObjChrBlendCFv + .4byte GetTypeName__Q34nw4r3g3d14AnmObjChrBlendCFv + .4byte SetFrame__Q34nw4r3g3d13AnmObjChrNodeFf + .4byte GetFrame__Q34nw4r3g3d13AnmObjChrNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeCFv + .4byte Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte GetResult__Q34nw4r3g3d14AnmObjChrBlendFPQ34nw4r3g3d12ChrAnmResultUl + .4byte Attach__Q34nw4r3g3d13AnmObjChrNodeFiPQ34nw4r3g3d12AnmObjChrRes + .4byte Detach__Q34nw4r3g3d13AnmObjChrNodeFi + .4byte DetachAll__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte SetWeight__Q34nw4r3g3d14AnmObjChrBlendFif + .4byte GetWeight__Q34nw4r3g3d14AnmObjChrBlendCFi + .4byte Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption + .4byte Release__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption .global __vt__Q34nw4r3g3d13AnmObjChrNode __vt__Q34nw4r3g3d13AnmObjChrNode: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d13AnmObjChrNodeCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d13AnmObjChrNodeFUlUlPv - .byte4 __dt__Q34nw4r3g3d13AnmObjChrNodeFv - .byte4 GetTypeObj__Q34nw4r3g3d13AnmObjChrNodeCFv - .byte4 GetTypeName__Q34nw4r3g3d13AnmObjChrNodeCFv - .byte4 SetFrame__Q34nw4r3g3d13AnmObjChrNodeFf - .byte4 GetFrame__Q34nw4r3g3d13AnmObjChrNodeCFv - .byte4 UpdateFrame__Q34nw4r3g3d13AnmObjChrNodeFv - .byte4 SetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeFf - .byte4 GetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeCFv - .byte4 Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte IsDerivedFrom__Q34nw4r3g3d13AnmObjChrNodeCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d13AnmObjChrNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte GetTypeObj__Q34nw4r3g3d13AnmObjChrNodeCFv + .4byte GetTypeName__Q34nw4r3g3d13AnmObjChrNodeCFv + .4byte SetFrame__Q34nw4r3g3d13AnmObjChrNodeFf + .4byte GetFrame__Q34nw4r3g3d13AnmObjChrNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeCFv + .4byte Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d13AnmObjChrNodeFv .4byte 0 - .byte4 Attach__Q34nw4r3g3d13AnmObjChrNodeFiPQ34nw4r3g3d12AnmObjChrRes - .byte4 Detach__Q34nw4r3g3d13AnmObjChrNodeFi - .byte4 DetachAll__Q34nw4r3g3d13AnmObjChrNodeFv - .byte4 SetWeight__Q34nw4r3g3d9AnmObjChrFif - .byte4 GetWeight__Q34nw4r3g3d9AnmObjChrCFi - .byte4 Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption - .byte4 Release__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption + .4byte Attach__Q34nw4r3g3d13AnmObjChrNodeFiPQ34nw4r3g3d12AnmObjChrRes + .4byte Detach__Q34nw4r3g3d13AnmObjChrNodeFi + .4byte DetachAll__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte SetWeight__Q34nw4r3g3d9AnmObjChrFif + .4byte GetWeight__Q34nw4r3g3d9AnmObjChrCFi + .4byte Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption + .4byte Release__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption .global __vt__Q34nw4r3g3d9AnmObjChr __vt__Q34nw4r3g3d9AnmObjChr: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d9AnmObjChrCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte IsDerivedFrom__Q34nw4r3g3d9AnmObjChrCFQ44nw4r3g3d6G3dObj7TypeObj .4byte 0 - .byte4 __dt__Q34nw4r3g3d9AnmObjChrFv - .byte4 GetTypeObj__Q34nw4r3g3d9AnmObjChrCFv - .byte4 GetTypeName__Q34nw4r3g3d9AnmObjChrCFv + .4byte __dt__Q34nw4r3g3d9AnmObjChrFv + .4byte GetTypeObj__Q34nw4r3g3d9AnmObjChrCFv + .4byte GetTypeName__Q34nw4r3g3d9AnmObjChrCFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 Release__Q34nw4r3g3d9AnmObjChrFv + .4byte Release__Q34nw4r3g3d9AnmObjChrFv .4byte 0 - .byte4 Attach__Q34nw4r3g3d9AnmObjChrFiPQ34nw4r3g3d12AnmObjChrRes - .byte4 Detach__Q34nw4r3g3d9AnmObjChrFi - .byte4 DetachAll__Q34nw4r3g3d9AnmObjChrFv - .byte4 SetWeight__Q34nw4r3g3d9AnmObjChrFif - .byte4 GetWeight__Q34nw4r3g3d9AnmObjChrCFi + .4byte Attach__Q34nw4r3g3d9AnmObjChrFiPQ34nw4r3g3d12AnmObjChrRes + .4byte Detach__Q34nw4r3g3d9AnmObjChrFi + .4byte DetachAll__Q34nw4r3g3d9AnmObjChrFv + .4byte SetWeight__Q34nw4r3g3d9AnmObjChrFif + .4byte GetWeight__Q34nw4r3g3d9AnmObjChrCFi .4byte 0 .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmclr.s b/asm/libnw4r_g3d/g3d_anmclr.s index 476b98b6..23dff8d3 100644 --- a/asm/libnw4r_g3d/g3d_anmclr.s +++ b/asm/libnw4r_g3d/g3d_anmclr.s @@ -1743,82 +1743,82 @@ TYPE_NAME__Q34nw4r3g3d15AnmObjMatClrRes: __vt__Q34nw4r3g3d15AnmObjMatClrRes: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d15AnmObjMatClrResCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d15AnmObjMatClrResFUlUlPv - .byte4 __dt__Q34nw4r3g3d15AnmObjMatClrResFv - .byte4 GetTypeObj__Q34nw4r3g3d15AnmObjMatClrResCFv - .byte4 GetTypeName__Q34nw4r3g3d15AnmObjMatClrResCFv - .byte4 SetFrame__Q34nw4r3g3d15AnmObjMatClrResFf - .byte4 GetFrame__Q34nw4r3g3d15AnmObjMatClrResCFv - .byte4 UpdateFrame__Q34nw4r3g3d15AnmObjMatClrResFv - .byte4 SetUpdateRate__Q34nw4r3g3d15AnmObjMatClrResFf - .byte4 GetUpdateRate__Q34nw4r3g3d15AnmObjMatClrResCFv - .byte4 Bind__Q34nw4r3g3d15AnmObjMatClrResFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d12AnmObjMatClrFv - .byte4 GetResult__Q34nw4r3g3d15AnmObjMatClrResFPQ34nw4r3g3d12ClrAnmResultUl - .byte4 Attach__Q34nw4r3g3d12AnmObjMatClrFiPQ34nw4r3g3d15AnmObjMatClrRes - .byte4 Detach__Q34nw4r3g3d12AnmObjMatClrFi - .byte4 DetachAll__Q34nw4r3g3d12AnmObjMatClrFv + .4byte IsDerivedFrom__Q34nw4r3g3d15AnmObjMatClrResCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d15AnmObjMatClrResFUlUlPv + .4byte __dt__Q34nw4r3g3d15AnmObjMatClrResFv + .4byte GetTypeObj__Q34nw4r3g3d15AnmObjMatClrResCFv + .4byte GetTypeName__Q34nw4r3g3d15AnmObjMatClrResCFv + .4byte SetFrame__Q34nw4r3g3d15AnmObjMatClrResFf + .4byte GetFrame__Q34nw4r3g3d15AnmObjMatClrResCFv + .4byte UpdateFrame__Q34nw4r3g3d15AnmObjMatClrResFv + .4byte SetUpdateRate__Q34nw4r3g3d15AnmObjMatClrResFf + .4byte GetUpdateRate__Q34nw4r3g3d15AnmObjMatClrResCFv + .4byte Bind__Q34nw4r3g3d15AnmObjMatClrResFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d12AnmObjMatClrFv + .4byte GetResult__Q34nw4r3g3d15AnmObjMatClrResFPQ34nw4r3g3d12ClrAnmResultUl + .4byte Attach__Q34nw4r3g3d12AnmObjMatClrFiPQ34nw4r3g3d15AnmObjMatClrRes + .4byte Detach__Q34nw4r3g3d12AnmObjMatClrFi + .4byte DetachAll__Q34nw4r3g3d12AnmObjMatClrFv .global __vt__Q34nw4r3g3d20AnmObjMatClrOverride __vt__Q34nw4r3g3d20AnmObjMatClrOverride: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d20AnmObjMatClrOverrideCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d16AnmObjMatClrNodeFUlUlPv - .byte4 __dt__Q34nw4r3g3d20AnmObjMatClrOverrideFv - .byte4 GetTypeObj__Q34nw4r3g3d20AnmObjMatClrOverrideCFv - .byte4 GetTypeName__Q34nw4r3g3d20AnmObjMatClrOverrideCFv - .byte4 SetFrame__Q34nw4r3g3d16AnmObjMatClrNodeFf - .byte4 GetFrame__Q34nw4r3g3d16AnmObjMatClrNodeCFv - .byte4 UpdateFrame__Q34nw4r3g3d16AnmObjMatClrNodeFv - .byte4 SetUpdateRate__Q34nw4r3g3d16AnmObjMatClrNodeFf - .byte4 GetUpdateRate__Q34nw4r3g3d16AnmObjMatClrNodeCFv - .byte4 Bind__Q34nw4r3g3d16AnmObjMatClrNodeFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d16AnmObjMatClrNodeFv - .byte4 GetResult__Q34nw4r3g3d20AnmObjMatClrOverrideFPQ34nw4r3g3d12ClrAnmResultUl - .byte4 Attach__Q34nw4r3g3d16AnmObjMatClrNodeFiPQ34nw4r3g3d15AnmObjMatClrRes - .byte4 Detach__Q34nw4r3g3d16AnmObjMatClrNodeFi - .byte4 DetachAll__Q34nw4r3g3d16AnmObjMatClrNodeFv + .4byte IsDerivedFrom__Q34nw4r3g3d20AnmObjMatClrOverrideCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d16AnmObjMatClrNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d20AnmObjMatClrOverrideFv + .4byte GetTypeObj__Q34nw4r3g3d20AnmObjMatClrOverrideCFv + .4byte GetTypeName__Q34nw4r3g3d20AnmObjMatClrOverrideCFv + .4byte SetFrame__Q34nw4r3g3d16AnmObjMatClrNodeFf + .4byte GetFrame__Q34nw4r3g3d16AnmObjMatClrNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d16AnmObjMatClrNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjMatClrNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjMatClrNodeCFv + .4byte Bind__Q34nw4r3g3d16AnmObjMatClrNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d16AnmObjMatClrNodeFv + .4byte GetResult__Q34nw4r3g3d20AnmObjMatClrOverrideFPQ34nw4r3g3d12ClrAnmResultUl + .4byte Attach__Q34nw4r3g3d16AnmObjMatClrNodeFiPQ34nw4r3g3d15AnmObjMatClrRes + .4byte Detach__Q34nw4r3g3d16AnmObjMatClrNodeFi + .4byte DetachAll__Q34nw4r3g3d16AnmObjMatClrNodeFv .global __vt__Q34nw4r3g3d16AnmObjMatClrNode __vt__Q34nw4r3g3d16AnmObjMatClrNode: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d16AnmObjMatClrNodeCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d16AnmObjMatClrNodeFUlUlPv - .byte4 __dt__Q34nw4r3g3d16AnmObjMatClrNodeFv - .byte4 GetTypeObj__Q34nw4r3g3d16AnmObjMatClrNodeCFv - .byte4 GetTypeName__Q34nw4r3g3d16AnmObjMatClrNodeCFv - .byte4 SetFrame__Q34nw4r3g3d16AnmObjMatClrNodeFf - .byte4 GetFrame__Q34nw4r3g3d16AnmObjMatClrNodeCFv - .byte4 UpdateFrame__Q34nw4r3g3d16AnmObjMatClrNodeFv - .byte4 SetUpdateRate__Q34nw4r3g3d16AnmObjMatClrNodeFf - .byte4 GetUpdateRate__Q34nw4r3g3d16AnmObjMatClrNodeCFv - .byte4 Bind__Q34nw4r3g3d16AnmObjMatClrNodeFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d16AnmObjMatClrNodeFv + .4byte IsDerivedFrom__Q34nw4r3g3d16AnmObjMatClrNodeCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d16AnmObjMatClrNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d16AnmObjMatClrNodeFv + .4byte GetTypeObj__Q34nw4r3g3d16AnmObjMatClrNodeCFv + .4byte GetTypeName__Q34nw4r3g3d16AnmObjMatClrNodeCFv + .4byte SetFrame__Q34nw4r3g3d16AnmObjMatClrNodeFf + .4byte GetFrame__Q34nw4r3g3d16AnmObjMatClrNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d16AnmObjMatClrNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjMatClrNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjMatClrNodeCFv + .4byte Bind__Q34nw4r3g3d16AnmObjMatClrNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d16AnmObjMatClrNodeFv .4byte 0 - .byte4 Attach__Q34nw4r3g3d16AnmObjMatClrNodeFiPQ34nw4r3g3d15AnmObjMatClrRes - .byte4 Detach__Q34nw4r3g3d16AnmObjMatClrNodeFi - .byte4 DetachAll__Q34nw4r3g3d16AnmObjMatClrNodeFv + .4byte Attach__Q34nw4r3g3d16AnmObjMatClrNodeFiPQ34nw4r3g3d15AnmObjMatClrRes + .4byte Detach__Q34nw4r3g3d16AnmObjMatClrNodeFi + .4byte DetachAll__Q34nw4r3g3d16AnmObjMatClrNodeFv .global __vt__Q34nw4r3g3d12AnmObjMatClr __vt__Q34nw4r3g3d12AnmObjMatClr: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d12AnmObjMatClrCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjMatClrCFQ44nw4r3g3d6G3dObj7TypeObj .4byte 0 - .byte4 __dt__Q34nw4r3g3d12AnmObjMatClrFv - .byte4 GetTypeObj__Q34nw4r3g3d12AnmObjMatClrCFv - .byte4 GetTypeName__Q34nw4r3g3d12AnmObjMatClrCFv + .4byte __dt__Q34nw4r3g3d12AnmObjMatClrFv + .4byte GetTypeObj__Q34nw4r3g3d12AnmObjMatClrCFv + .4byte GetTypeName__Q34nw4r3g3d12AnmObjMatClrCFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 Release__Q34nw4r3g3d12AnmObjMatClrFv + .4byte Release__Q34nw4r3g3d12AnmObjMatClrFv .4byte 0 - .byte4 Attach__Q34nw4r3g3d12AnmObjMatClrFiPQ34nw4r3g3d15AnmObjMatClrRes - .byte4 Detach__Q34nw4r3g3d12AnmObjMatClrFi - .byte4 DetachAll__Q34nw4r3g3d12AnmObjMatClrFv + .4byte Attach__Q34nw4r3g3d12AnmObjMatClrFiPQ34nw4r3g3d15AnmObjMatClrRes + .4byte Detach__Q34nw4r3g3d12AnmObjMatClrFi + .4byte DetachAll__Q34nw4r3g3d12AnmObjMatClrFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28993 diff --git a/asm/libnw4r_g3d/g3d_anmscn.s b/asm/libnw4r_g3d/g3d_anmscn.s index 58963f3d..36b1484e 100644 --- a/asm/libnw4r_g3d/g3d_anmscn.s +++ b/asm/libnw4r_g3d/g3d_anmscn.s @@ -1613,56 +1613,56 @@ TYPE_NAME__Q34nw4r3g3d9AnmScnRes: __vt__Q34nw4r3g3d9AnmScnRes: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d9AnmScnResCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d9AnmScnResFUlUlPv - .byte4 __dt__Q34nw4r3g3d9AnmScnResFv - .byte4 GetTypeObj__Q34nw4r3g3d9AnmScnResCFv - .byte4 GetTypeName__Q34nw4r3g3d9AnmScnResCFv - .byte4 SetFrame__Q34nw4r3g3d9AnmScnResFf - .byte4 GetFrame__Q34nw4r3g3d9AnmScnResCFv - .byte4 SetUpdateRate__Q34nw4r3g3d9AnmScnResFf - .byte4 GetUpdateRate__Q34nw4r3g3d9AnmScnResCFv - .byte4 UpdateFrame__Q34nw4r3g3d9AnmScnResFv - .byte4 Attach__Q34nw4r3g3d6AnmScnFiPQ34nw4r3g3d9AnmScnRes - .byte4 Detach__Q34nw4r3g3d6AnmScnFi - .byte4 GetNumLightSet__Q34nw4r3g3d9AnmScnResCFv - .byte4 GetNumAmbLight__Q34nw4r3g3d9AnmScnResCFv - .byte4 GetNumDiffuseLight__Q34nw4r3g3d9AnmScnResCFv - .byte4 GetNumSpecularLight__Q34nw4r3g3d9AnmScnResCFv - .byte4 GetNumFog__Q34nw4r3g3d9AnmScnResCFv - .byte4 GetNumCamera__Q34nw4r3g3d9AnmScnResCFv - .byte4 GetLightSetMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv - .byte4 GetAmbLightMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv - .byte4 GetDiffuseLightMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv - .byte4 GetFogMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv - .byte4 GetCameraMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv - .byte4 GetLightSet__Q34nw4r3g3d9AnmScnResFQ34nw4r3g3d8LightSetUl - .byte4 GetAmbLightColor__Q34nw4r3g3d9AnmScnResFUl - .byte4 GetLight__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d8LightObjPQ34nw4r3g3d8LightObjUl - .byte4 GetFog__Q34nw4r3g3d9AnmScnResFQ34nw4r3g3d3FogUl - .byte4 GetCamera__Q34nw4r3g3d9AnmScnResFQ34nw4r3g3d6CameraUl - .byte4 GetSpecularLightID__Q34nw4r3g3d9AnmScnResCFUl - .byte4 HasSpecularLight__Q34nw4r3g3d9AnmScnResCFUl - .byte4 GetAmbLightResult__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d17AmbLightAnmResultUl - .byte4 GetLightResult__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d14LightAnmResultUl - .byte4 GetFogResult__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d12FogAnmResultUl - .byte4 GetCameraResult__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d15CameraAnmResultUl + .4byte IsDerivedFrom__Q34nw4r3g3d9AnmScnResCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d9AnmScnResFUlUlPv + .4byte __dt__Q34nw4r3g3d9AnmScnResFv + .4byte GetTypeObj__Q34nw4r3g3d9AnmScnResCFv + .4byte GetTypeName__Q34nw4r3g3d9AnmScnResCFv + .4byte SetFrame__Q34nw4r3g3d9AnmScnResFf + .4byte GetFrame__Q34nw4r3g3d9AnmScnResCFv + .4byte SetUpdateRate__Q34nw4r3g3d9AnmScnResFf + .4byte GetUpdateRate__Q34nw4r3g3d9AnmScnResCFv + .4byte UpdateFrame__Q34nw4r3g3d9AnmScnResFv + .4byte Attach__Q34nw4r3g3d6AnmScnFiPQ34nw4r3g3d9AnmScnRes + .4byte Detach__Q34nw4r3g3d6AnmScnFi + .4byte GetNumLightSet__Q34nw4r3g3d9AnmScnResCFv + .4byte GetNumAmbLight__Q34nw4r3g3d9AnmScnResCFv + .4byte GetNumDiffuseLight__Q34nw4r3g3d9AnmScnResCFv + .4byte GetNumSpecularLight__Q34nw4r3g3d9AnmScnResCFv + .4byte GetNumFog__Q34nw4r3g3d9AnmScnResCFv + .4byte GetNumCamera__Q34nw4r3g3d9AnmScnResCFv + .4byte GetLightSetMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv + .4byte GetAmbLightMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv + .4byte GetDiffuseLightMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv + .4byte GetFogMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv + .4byte GetCameraMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv + .4byte GetLightSet__Q34nw4r3g3d9AnmScnResFQ34nw4r3g3d8LightSetUl + .4byte GetAmbLightColor__Q34nw4r3g3d9AnmScnResFUl + .4byte GetLight__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d8LightObjPQ34nw4r3g3d8LightObjUl + .4byte GetFog__Q34nw4r3g3d9AnmScnResFQ34nw4r3g3d3FogUl + .4byte GetCamera__Q34nw4r3g3d9AnmScnResFQ34nw4r3g3d6CameraUl + .4byte GetSpecularLightID__Q34nw4r3g3d9AnmScnResCFUl + .4byte HasSpecularLight__Q34nw4r3g3d9AnmScnResCFUl + .4byte GetAmbLightResult__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d17AmbLightAnmResultUl + .4byte GetLightResult__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d14LightAnmResultUl + .4byte GetFogResult__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d12FogAnmResultUl + .4byte GetCameraResult__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d15CameraAnmResultUl .global __vt__Q34nw4r3g3d6AnmScn __vt__Q34nw4r3g3d6AnmScn: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d6AnmScnCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte IsDerivedFrom__Q34nw4r3g3d6AnmScnCFQ44nw4r3g3d6G3dObj7TypeObj .4byte 0 - .byte4 __dt__Q34nw4r3g3d6AnmScnFv - .byte4 GetTypeObj__Q34nw4r3g3d6AnmScnCFv - .byte4 GetTypeName__Q34nw4r3g3d6AnmScnCFv + .4byte __dt__Q34nw4r3g3d6AnmScnFv + .4byte GetTypeObj__Q34nw4r3g3d6AnmScnCFv + .4byte GetTypeName__Q34nw4r3g3d6AnmScnCFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 Attach__Q34nw4r3g3d6AnmScnFiPQ34nw4r3g3d9AnmScnRes - .byte4 Detach__Q34nw4r3g3d6AnmScnFi + .4byte Attach__Q34nw4r3g3d6AnmScnFiPQ34nw4r3g3d9AnmScnRes + .4byte Detach__Q34nw4r3g3d6AnmScnFi .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmshp.s b/asm/libnw4r_g3d/g3d_anmshp.s index e07aec5d..587f4f00 100644 --- a/asm/libnw4r_g3d/g3d_anmshp.s +++ b/asm/libnw4r_g3d/g3d_anmshp.s @@ -1328,90 +1328,90 @@ TYPE_NAME__Q34nw4r3g3d12AnmObjShpRes: __vt__Q34nw4r3g3d12AnmObjShpRes: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d12AnmObjShpResCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d12AnmObjShpResFUlUlPv - .byte4 __dt__Q34nw4r3g3d12AnmObjShpResFv - .byte4 GetTypeObj__Q34nw4r3g3d12AnmObjShpResCFv - .byte4 GetTypeName__Q34nw4r3g3d12AnmObjShpResCFv - .byte4 SetFrame__Q34nw4r3g3d12AnmObjShpResFf - .byte4 GetFrame__Q34nw4r3g3d12AnmObjShpResCFv - .byte4 UpdateFrame__Q34nw4r3g3d12AnmObjShpResFv - .byte4 SetUpdateRate__Q34nw4r3g3d12AnmObjShpResFf - .byte4 GetUpdateRate__Q34nw4r3g3d12AnmObjShpResCFv - .byte4 Bind__Q34nw4r3g3d12AnmObjShpResFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d9AnmObjShpFv - .byte4 GetResult__Q34nw4r3g3d12AnmObjShpResFPQ34nw4r3g3d12ShpAnmResultUl - .byte4 Attach__Q34nw4r3g3d9AnmObjShpFiPQ34nw4r3g3d12AnmObjShpRes - .byte4 Detach__Q34nw4r3g3d9AnmObjShpFi - .byte4 DetachAll__Q34nw4r3g3d9AnmObjShpFv - .byte4 SetWeight__Q34nw4r3g3d9AnmObjShpFif - .byte4 GetWeight__Q34nw4r3g3d9AnmObjShpCFi + .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjShpResCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d12AnmObjShpResFUlUlPv + .4byte __dt__Q34nw4r3g3d12AnmObjShpResFv + .4byte GetTypeObj__Q34nw4r3g3d12AnmObjShpResCFv + .4byte GetTypeName__Q34nw4r3g3d12AnmObjShpResCFv + .4byte SetFrame__Q34nw4r3g3d12AnmObjShpResFf + .4byte GetFrame__Q34nw4r3g3d12AnmObjShpResCFv + .4byte UpdateFrame__Q34nw4r3g3d12AnmObjShpResFv + .4byte SetUpdateRate__Q34nw4r3g3d12AnmObjShpResFf + .4byte GetUpdateRate__Q34nw4r3g3d12AnmObjShpResCFv + .4byte Bind__Q34nw4r3g3d12AnmObjShpResFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d9AnmObjShpFv + .4byte GetResult__Q34nw4r3g3d12AnmObjShpResFPQ34nw4r3g3d12ShpAnmResultUl + .4byte Attach__Q34nw4r3g3d9AnmObjShpFiPQ34nw4r3g3d12AnmObjShpRes + .4byte Detach__Q34nw4r3g3d9AnmObjShpFi + .4byte DetachAll__Q34nw4r3g3d9AnmObjShpFv + .4byte SetWeight__Q34nw4r3g3d9AnmObjShpFif + .4byte GetWeight__Q34nw4r3g3d9AnmObjShpCFi .global __vt__Q34nw4r3g3d14AnmObjShpBlend __vt__Q34nw4r3g3d14AnmObjShpBlend: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d14AnmObjShpBlendCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d13AnmObjShpNodeFUlUlPv - .byte4 __dt__Q34nw4r3g3d14AnmObjShpBlendFv - .byte4 GetTypeObj__Q34nw4r3g3d14AnmObjShpBlendCFv - .byte4 GetTypeName__Q34nw4r3g3d14AnmObjShpBlendCFv - .byte4 SetFrame__Q34nw4r3g3d13AnmObjShpNodeFf - .byte4 GetFrame__Q34nw4r3g3d13AnmObjShpNodeCFv - .byte4 UpdateFrame__Q34nw4r3g3d13AnmObjShpNodeFv - .byte4 SetUpdateRate__Q34nw4r3g3d13AnmObjShpNodeFf - .byte4 GetUpdateRate__Q34nw4r3g3d13AnmObjShpNodeCFv - .byte4 Bind__Q34nw4r3g3d13AnmObjShpNodeFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d13AnmObjShpNodeFv - .byte4 GetResult__Q34nw4r3g3d14AnmObjShpBlendFPQ34nw4r3g3d12ShpAnmResultUl - .byte4 Attach__Q34nw4r3g3d13AnmObjShpNodeFiPQ34nw4r3g3d12AnmObjShpRes - .byte4 Detach__Q34nw4r3g3d13AnmObjShpNodeFi - .byte4 DetachAll__Q34nw4r3g3d13AnmObjShpNodeFv - .byte4 SetWeight__Q34nw4r3g3d14AnmObjShpBlendFif - .byte4 GetWeight__Q34nw4r3g3d14AnmObjShpBlendCFi + .4byte IsDerivedFrom__Q34nw4r3g3d14AnmObjShpBlendCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d13AnmObjShpNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d14AnmObjShpBlendFv + .4byte GetTypeObj__Q34nw4r3g3d14AnmObjShpBlendCFv + .4byte GetTypeName__Q34nw4r3g3d14AnmObjShpBlendCFv + .4byte SetFrame__Q34nw4r3g3d13AnmObjShpNodeFf + .4byte GetFrame__Q34nw4r3g3d13AnmObjShpNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d13AnmObjShpNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjShpNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjShpNodeCFv + .4byte Bind__Q34nw4r3g3d13AnmObjShpNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d13AnmObjShpNodeFv + .4byte GetResult__Q34nw4r3g3d14AnmObjShpBlendFPQ34nw4r3g3d12ShpAnmResultUl + .4byte Attach__Q34nw4r3g3d13AnmObjShpNodeFiPQ34nw4r3g3d12AnmObjShpRes + .4byte Detach__Q34nw4r3g3d13AnmObjShpNodeFi + .4byte DetachAll__Q34nw4r3g3d13AnmObjShpNodeFv + .4byte SetWeight__Q34nw4r3g3d14AnmObjShpBlendFif + .4byte GetWeight__Q34nw4r3g3d14AnmObjShpBlendCFi .global __vt__Q34nw4r3g3d13AnmObjShpNode __vt__Q34nw4r3g3d13AnmObjShpNode: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d13AnmObjShpNodeCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d13AnmObjShpNodeFUlUlPv - .byte4 __dt__Q34nw4r3g3d13AnmObjShpNodeFv - .byte4 GetTypeObj__Q34nw4r3g3d13AnmObjShpNodeCFv - .byte4 GetTypeName__Q34nw4r3g3d13AnmObjShpNodeCFv - .byte4 SetFrame__Q34nw4r3g3d13AnmObjShpNodeFf - .byte4 GetFrame__Q34nw4r3g3d13AnmObjShpNodeCFv - .byte4 UpdateFrame__Q34nw4r3g3d13AnmObjShpNodeFv - .byte4 SetUpdateRate__Q34nw4r3g3d13AnmObjShpNodeFf - .byte4 GetUpdateRate__Q34nw4r3g3d13AnmObjShpNodeCFv - .byte4 Bind__Q34nw4r3g3d13AnmObjShpNodeFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d13AnmObjShpNodeFv + .4byte IsDerivedFrom__Q34nw4r3g3d13AnmObjShpNodeCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d13AnmObjShpNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d13AnmObjShpNodeFv + .4byte GetTypeObj__Q34nw4r3g3d13AnmObjShpNodeCFv + .4byte GetTypeName__Q34nw4r3g3d13AnmObjShpNodeCFv + .4byte SetFrame__Q34nw4r3g3d13AnmObjShpNodeFf + .4byte GetFrame__Q34nw4r3g3d13AnmObjShpNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d13AnmObjShpNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjShpNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjShpNodeCFv + .4byte Bind__Q34nw4r3g3d13AnmObjShpNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d13AnmObjShpNodeFv .4byte 0 - .byte4 Attach__Q34nw4r3g3d13AnmObjShpNodeFiPQ34nw4r3g3d12AnmObjShpRes - .byte4 Detach__Q34nw4r3g3d13AnmObjShpNodeFi - .byte4 DetachAll__Q34nw4r3g3d13AnmObjShpNodeFv - .byte4 SetWeight__Q34nw4r3g3d9AnmObjShpFif - .byte4 GetWeight__Q34nw4r3g3d9AnmObjShpCFi + .4byte Attach__Q34nw4r3g3d13AnmObjShpNodeFiPQ34nw4r3g3d12AnmObjShpRes + .4byte Detach__Q34nw4r3g3d13AnmObjShpNodeFi + .4byte DetachAll__Q34nw4r3g3d13AnmObjShpNodeFv + .4byte SetWeight__Q34nw4r3g3d9AnmObjShpFif + .4byte GetWeight__Q34nw4r3g3d9AnmObjShpCFi .global __vt__Q34nw4r3g3d9AnmObjShp __vt__Q34nw4r3g3d9AnmObjShp: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d9AnmObjShpCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte IsDerivedFrom__Q34nw4r3g3d9AnmObjShpCFQ44nw4r3g3d6G3dObj7TypeObj .4byte 0 - .byte4 __dt__Q34nw4r3g3d9AnmObjShpFv - .byte4 GetTypeObj__Q34nw4r3g3d9AnmObjShpCFv - .byte4 GetTypeName__Q34nw4r3g3d9AnmObjShpCFv + .4byte __dt__Q34nw4r3g3d9AnmObjShpFv + .4byte GetTypeObj__Q34nw4r3g3d9AnmObjShpCFv + .4byte GetTypeName__Q34nw4r3g3d9AnmObjShpCFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 Release__Q34nw4r3g3d9AnmObjShpFv + .4byte Release__Q34nw4r3g3d9AnmObjShpFv .4byte 0 - .byte4 Attach__Q34nw4r3g3d9AnmObjShpFiPQ34nw4r3g3d12AnmObjShpRes - .byte4 Detach__Q34nw4r3g3d9AnmObjShpFi - .byte4 DetachAll__Q34nw4r3g3d9AnmObjShpFv - .byte4 SetWeight__Q34nw4r3g3d9AnmObjShpFif - .byte4 GetWeight__Q34nw4r3g3d9AnmObjShpCFi + .4byte Attach__Q34nw4r3g3d9AnmObjShpFiPQ34nw4r3g3d12AnmObjShpRes + .4byte Detach__Q34nw4r3g3d9AnmObjShpFi + .4byte DetachAll__Q34nw4r3g3d9AnmObjShpFv + .4byte SetWeight__Q34nw4r3g3d9AnmObjShpFif + .4byte GetWeight__Q34nw4r3g3d9AnmObjShpCFi .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28380 diff --git a/asm/libnw4r_g3d/g3d_anmtexpat.s b/asm/libnw4r_g3d/g3d_anmtexpat.s index 08c1f38d..6886315b 100644 --- a/asm/libnw4r_g3d/g3d_anmtexpat.s +++ b/asm/libnw4r_g3d/g3d_anmtexpat.s @@ -1181,82 +1181,82 @@ TYPE_NAME__Q34nw4r3g3d15AnmObjTexPatRes: __vt__Q34nw4r3g3d15AnmObjTexPatRes: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d15AnmObjTexPatResCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d15AnmObjTexPatResFUlUlPv - .byte4 __dt__Q34nw4r3g3d15AnmObjTexPatResFv - .byte4 GetTypeObj__Q34nw4r3g3d15AnmObjTexPatResCFv - .byte4 GetTypeName__Q34nw4r3g3d15AnmObjTexPatResCFv - .byte4 SetFrame__Q34nw4r3g3d15AnmObjTexPatResFf - .byte4 GetFrame__Q34nw4r3g3d15AnmObjTexPatResCFv - .byte4 UpdateFrame__Q34nw4r3g3d15AnmObjTexPatResFv - .byte4 SetUpdateRate__Q34nw4r3g3d15AnmObjTexPatResFf - .byte4 GetUpdateRate__Q34nw4r3g3d15AnmObjTexPatResCFv - .byte4 Bind__Q34nw4r3g3d15AnmObjTexPatResFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d12AnmObjTexPatFv - .byte4 GetResult__Q34nw4r3g3d15AnmObjTexPatResFPQ34nw4r3g3d15TexPatAnmResultUl - .byte4 Attach__Q34nw4r3g3d12AnmObjTexPatFiPQ34nw4r3g3d15AnmObjTexPatRes - .byte4 Detach__Q34nw4r3g3d12AnmObjTexPatFi - .byte4 DetachAll__Q34nw4r3g3d12AnmObjTexPatFv + .4byte IsDerivedFrom__Q34nw4r3g3d15AnmObjTexPatResCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d15AnmObjTexPatResFUlUlPv + .4byte __dt__Q34nw4r3g3d15AnmObjTexPatResFv + .4byte GetTypeObj__Q34nw4r3g3d15AnmObjTexPatResCFv + .4byte GetTypeName__Q34nw4r3g3d15AnmObjTexPatResCFv + .4byte SetFrame__Q34nw4r3g3d15AnmObjTexPatResFf + .4byte GetFrame__Q34nw4r3g3d15AnmObjTexPatResCFv + .4byte UpdateFrame__Q34nw4r3g3d15AnmObjTexPatResFv + .4byte SetUpdateRate__Q34nw4r3g3d15AnmObjTexPatResFf + .4byte GetUpdateRate__Q34nw4r3g3d15AnmObjTexPatResCFv + .4byte Bind__Q34nw4r3g3d15AnmObjTexPatResFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d12AnmObjTexPatFv + .4byte GetResult__Q34nw4r3g3d15AnmObjTexPatResFPQ34nw4r3g3d15TexPatAnmResultUl + .4byte Attach__Q34nw4r3g3d12AnmObjTexPatFiPQ34nw4r3g3d15AnmObjTexPatRes + .4byte Detach__Q34nw4r3g3d12AnmObjTexPatFi + .4byte DetachAll__Q34nw4r3g3d12AnmObjTexPatFv .global __vt__Q34nw4r3g3d20AnmObjTexPatOverride __vt__Q34nw4r3g3d20AnmObjTexPatOverride: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d20AnmObjTexPatOverrideCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d16AnmObjTexPatNodeFUlUlPv - .byte4 __dt__Q34nw4r3g3d20AnmObjTexPatOverrideFv - .byte4 GetTypeObj__Q34nw4r3g3d20AnmObjTexPatOverrideCFv - .byte4 GetTypeName__Q34nw4r3g3d20AnmObjTexPatOverrideCFv - .byte4 SetFrame__Q34nw4r3g3d16AnmObjTexPatNodeFf - .byte4 GetFrame__Q34nw4r3g3d16AnmObjTexPatNodeCFv - .byte4 UpdateFrame__Q34nw4r3g3d16AnmObjTexPatNodeFv - .byte4 SetUpdateRate__Q34nw4r3g3d16AnmObjTexPatNodeFf - .byte4 GetUpdateRate__Q34nw4r3g3d16AnmObjTexPatNodeCFv - .byte4 Bind__Q34nw4r3g3d16AnmObjTexPatNodeFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d16AnmObjTexPatNodeFv - .byte4 GetResult__Q34nw4r3g3d20AnmObjTexPatOverrideFPQ34nw4r3g3d15TexPatAnmResultUl - .byte4 Attach__Q34nw4r3g3d16AnmObjTexPatNodeFiPQ34nw4r3g3d15AnmObjTexPatRes - .byte4 Detach__Q34nw4r3g3d16AnmObjTexPatNodeFi - .byte4 DetachAll__Q34nw4r3g3d16AnmObjTexPatNodeFv + .4byte IsDerivedFrom__Q34nw4r3g3d20AnmObjTexPatOverrideCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d16AnmObjTexPatNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d20AnmObjTexPatOverrideFv + .4byte GetTypeObj__Q34nw4r3g3d20AnmObjTexPatOverrideCFv + .4byte GetTypeName__Q34nw4r3g3d20AnmObjTexPatOverrideCFv + .4byte SetFrame__Q34nw4r3g3d16AnmObjTexPatNodeFf + .4byte GetFrame__Q34nw4r3g3d16AnmObjTexPatNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d16AnmObjTexPatNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjTexPatNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjTexPatNodeCFv + .4byte Bind__Q34nw4r3g3d16AnmObjTexPatNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d16AnmObjTexPatNodeFv + .4byte GetResult__Q34nw4r3g3d20AnmObjTexPatOverrideFPQ34nw4r3g3d15TexPatAnmResultUl + .4byte Attach__Q34nw4r3g3d16AnmObjTexPatNodeFiPQ34nw4r3g3d15AnmObjTexPatRes + .4byte Detach__Q34nw4r3g3d16AnmObjTexPatNodeFi + .4byte DetachAll__Q34nw4r3g3d16AnmObjTexPatNodeFv .global __vt__Q34nw4r3g3d16AnmObjTexPatNode __vt__Q34nw4r3g3d16AnmObjTexPatNode: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d16AnmObjTexPatNodeCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d16AnmObjTexPatNodeFUlUlPv - .byte4 __dt__Q34nw4r3g3d16AnmObjTexPatNodeFv - .byte4 GetTypeObj__Q34nw4r3g3d16AnmObjTexPatNodeCFv - .byte4 GetTypeName__Q34nw4r3g3d16AnmObjTexPatNodeCFv - .byte4 SetFrame__Q34nw4r3g3d16AnmObjTexPatNodeFf - .byte4 GetFrame__Q34nw4r3g3d16AnmObjTexPatNodeCFv - .byte4 UpdateFrame__Q34nw4r3g3d16AnmObjTexPatNodeFv - .byte4 SetUpdateRate__Q34nw4r3g3d16AnmObjTexPatNodeFf - .byte4 GetUpdateRate__Q34nw4r3g3d16AnmObjTexPatNodeCFv - .byte4 Bind__Q34nw4r3g3d16AnmObjTexPatNodeFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d16AnmObjTexPatNodeFv + .4byte IsDerivedFrom__Q34nw4r3g3d16AnmObjTexPatNodeCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d16AnmObjTexPatNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d16AnmObjTexPatNodeFv + .4byte GetTypeObj__Q34nw4r3g3d16AnmObjTexPatNodeCFv + .4byte GetTypeName__Q34nw4r3g3d16AnmObjTexPatNodeCFv + .4byte SetFrame__Q34nw4r3g3d16AnmObjTexPatNodeFf + .4byte GetFrame__Q34nw4r3g3d16AnmObjTexPatNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d16AnmObjTexPatNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjTexPatNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjTexPatNodeCFv + .4byte Bind__Q34nw4r3g3d16AnmObjTexPatNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d16AnmObjTexPatNodeFv .4byte 0 - .byte4 Attach__Q34nw4r3g3d16AnmObjTexPatNodeFiPQ34nw4r3g3d15AnmObjTexPatRes - .byte4 Detach__Q34nw4r3g3d16AnmObjTexPatNodeFi - .byte4 DetachAll__Q34nw4r3g3d16AnmObjTexPatNodeFv + .4byte Attach__Q34nw4r3g3d16AnmObjTexPatNodeFiPQ34nw4r3g3d15AnmObjTexPatRes + .4byte Detach__Q34nw4r3g3d16AnmObjTexPatNodeFi + .4byte DetachAll__Q34nw4r3g3d16AnmObjTexPatNodeFv .global __vt__Q34nw4r3g3d12AnmObjTexPat __vt__Q34nw4r3g3d12AnmObjTexPat: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d12AnmObjTexPatCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjTexPatCFQ44nw4r3g3d6G3dObj7TypeObj .4byte 0 - .byte4 __dt__Q34nw4r3g3d12AnmObjTexPatFv - .byte4 GetTypeObj__Q34nw4r3g3d12AnmObjTexPatCFv - .byte4 GetTypeName__Q34nw4r3g3d12AnmObjTexPatCFv + .4byte __dt__Q34nw4r3g3d12AnmObjTexPatFv + .4byte GetTypeObj__Q34nw4r3g3d12AnmObjTexPatCFv + .4byte GetTypeName__Q34nw4r3g3d12AnmObjTexPatCFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 Release__Q34nw4r3g3d12AnmObjTexPatFv + .4byte Release__Q34nw4r3g3d12AnmObjTexPatFv .4byte 0 - .byte4 Attach__Q34nw4r3g3d12AnmObjTexPatFiPQ34nw4r3g3d15AnmObjTexPatRes - .byte4 Detach__Q34nw4r3g3d12AnmObjTexPatFi - .byte4 DetachAll__Q34nw4r3g3d12AnmObjTexPatFv + .4byte Attach__Q34nw4r3g3d12AnmObjTexPatFiPQ34nw4r3g3d15AnmObjTexPatRes + .4byte Detach__Q34nw4r3g3d12AnmObjTexPatFi + .4byte DetachAll__Q34nw4r3g3d12AnmObjTexPatFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210745 diff --git a/asm/libnw4r_g3d/g3d_anmtexsrt.s b/asm/libnw4r_g3d/g3d_anmtexsrt.s index 3dc8b301..e2cfe890 100644 --- a/asm/libnw4r_g3d/g3d_anmtexsrt.s +++ b/asm/libnw4r_g3d/g3d_anmtexsrt.s @@ -1143,82 +1143,82 @@ TYPE_NAME__Q34nw4r3g3d15AnmObjTexSrtRes: __vt__Q34nw4r3g3d15AnmObjTexSrtRes: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d15AnmObjTexSrtResCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d15AnmObjTexSrtResFUlUlPv - .byte4 __dt__Q34nw4r3g3d15AnmObjTexSrtResFv - .byte4 GetTypeObj__Q34nw4r3g3d15AnmObjTexSrtResCFv - .byte4 GetTypeName__Q34nw4r3g3d15AnmObjTexSrtResCFv - .byte4 SetFrame__Q34nw4r3g3d15AnmObjTexSrtResFf - .byte4 GetFrame__Q34nw4r3g3d15AnmObjTexSrtResCFv - .byte4 UpdateFrame__Q34nw4r3g3d15AnmObjTexSrtResFv - .byte4 SetUpdateRate__Q34nw4r3g3d15AnmObjTexSrtResFf - .byte4 GetUpdateRate__Q34nw4r3g3d15AnmObjTexSrtResCFv - .byte4 Bind__Q34nw4r3g3d15AnmObjTexSrtResFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d12AnmObjTexSrtFv - .byte4 GetResult__Q34nw4r3g3d15AnmObjTexSrtResFPQ34nw4r3g3d15TexSrtAnmResultUl - .byte4 Attach__Q34nw4r3g3d12AnmObjTexSrtFiPQ34nw4r3g3d15AnmObjTexSrtRes - .byte4 Detach__Q34nw4r3g3d12AnmObjTexSrtFi - .byte4 DetachAll__Q34nw4r3g3d12AnmObjTexSrtFv + .4byte IsDerivedFrom__Q34nw4r3g3d15AnmObjTexSrtResCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d15AnmObjTexSrtResFUlUlPv + .4byte __dt__Q34nw4r3g3d15AnmObjTexSrtResFv + .4byte GetTypeObj__Q34nw4r3g3d15AnmObjTexSrtResCFv + .4byte GetTypeName__Q34nw4r3g3d15AnmObjTexSrtResCFv + .4byte SetFrame__Q34nw4r3g3d15AnmObjTexSrtResFf + .4byte GetFrame__Q34nw4r3g3d15AnmObjTexSrtResCFv + .4byte UpdateFrame__Q34nw4r3g3d15AnmObjTexSrtResFv + .4byte SetUpdateRate__Q34nw4r3g3d15AnmObjTexSrtResFf + .4byte GetUpdateRate__Q34nw4r3g3d15AnmObjTexSrtResCFv + .4byte Bind__Q34nw4r3g3d15AnmObjTexSrtResFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d12AnmObjTexSrtFv + .4byte GetResult__Q34nw4r3g3d15AnmObjTexSrtResFPQ34nw4r3g3d15TexSrtAnmResultUl + .4byte Attach__Q34nw4r3g3d12AnmObjTexSrtFiPQ34nw4r3g3d15AnmObjTexSrtRes + .4byte Detach__Q34nw4r3g3d12AnmObjTexSrtFi + .4byte DetachAll__Q34nw4r3g3d12AnmObjTexSrtFv .global __vt__Q34nw4r3g3d20AnmObjTexSrtOverride __vt__Q34nw4r3g3d20AnmObjTexSrtOverride: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d20AnmObjTexSrtOverrideCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d16AnmObjTexSrtNodeFUlUlPv - .byte4 __dt__Q34nw4r3g3d20AnmObjTexSrtOverrideFv - .byte4 GetTypeObj__Q34nw4r3g3d20AnmObjTexSrtOverrideCFv - .byte4 GetTypeName__Q34nw4r3g3d20AnmObjTexSrtOverrideCFv - .byte4 SetFrame__Q34nw4r3g3d16AnmObjTexSrtNodeFf - .byte4 GetFrame__Q34nw4r3g3d16AnmObjTexSrtNodeCFv - .byte4 UpdateFrame__Q34nw4r3g3d16AnmObjTexSrtNodeFv - .byte4 SetUpdateRate__Q34nw4r3g3d16AnmObjTexSrtNodeFf - .byte4 GetUpdateRate__Q34nw4r3g3d16AnmObjTexSrtNodeCFv - .byte4 Bind__Q34nw4r3g3d16AnmObjTexSrtNodeFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d16AnmObjTexSrtNodeFv - .byte4 GetResult__Q34nw4r3g3d20AnmObjTexSrtOverrideFPQ34nw4r3g3d15TexSrtAnmResultUl - .byte4 Attach__Q34nw4r3g3d16AnmObjTexSrtNodeFiPQ34nw4r3g3d15AnmObjTexSrtRes - .byte4 Detach__Q34nw4r3g3d16AnmObjTexSrtNodeFi - .byte4 DetachAll__Q34nw4r3g3d16AnmObjTexSrtNodeFv + .4byte IsDerivedFrom__Q34nw4r3g3d20AnmObjTexSrtOverrideCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d16AnmObjTexSrtNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d20AnmObjTexSrtOverrideFv + .4byte GetTypeObj__Q34nw4r3g3d20AnmObjTexSrtOverrideCFv + .4byte GetTypeName__Q34nw4r3g3d20AnmObjTexSrtOverrideCFv + .4byte SetFrame__Q34nw4r3g3d16AnmObjTexSrtNodeFf + .4byte GetFrame__Q34nw4r3g3d16AnmObjTexSrtNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d16AnmObjTexSrtNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjTexSrtNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjTexSrtNodeCFv + .4byte Bind__Q34nw4r3g3d16AnmObjTexSrtNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d16AnmObjTexSrtNodeFv + .4byte GetResult__Q34nw4r3g3d20AnmObjTexSrtOverrideFPQ34nw4r3g3d15TexSrtAnmResultUl + .4byte Attach__Q34nw4r3g3d16AnmObjTexSrtNodeFiPQ34nw4r3g3d15AnmObjTexSrtRes + .4byte Detach__Q34nw4r3g3d16AnmObjTexSrtNodeFi + .4byte DetachAll__Q34nw4r3g3d16AnmObjTexSrtNodeFv .global __vt__Q34nw4r3g3d16AnmObjTexSrtNode __vt__Q34nw4r3g3d16AnmObjTexSrtNode: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d16AnmObjTexSrtNodeCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d16AnmObjTexSrtNodeFUlUlPv - .byte4 __dt__Q34nw4r3g3d16AnmObjTexSrtNodeFv - .byte4 GetTypeObj__Q34nw4r3g3d16AnmObjTexSrtNodeCFv - .byte4 GetTypeName__Q34nw4r3g3d16AnmObjTexSrtNodeCFv - .byte4 SetFrame__Q34nw4r3g3d16AnmObjTexSrtNodeFf - .byte4 GetFrame__Q34nw4r3g3d16AnmObjTexSrtNodeCFv - .byte4 UpdateFrame__Q34nw4r3g3d16AnmObjTexSrtNodeFv - .byte4 SetUpdateRate__Q34nw4r3g3d16AnmObjTexSrtNodeFf - .byte4 GetUpdateRate__Q34nw4r3g3d16AnmObjTexSrtNodeCFv - .byte4 Bind__Q34nw4r3g3d16AnmObjTexSrtNodeFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d16AnmObjTexSrtNodeFv + .4byte IsDerivedFrom__Q34nw4r3g3d16AnmObjTexSrtNodeCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d16AnmObjTexSrtNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d16AnmObjTexSrtNodeFv + .4byte GetTypeObj__Q34nw4r3g3d16AnmObjTexSrtNodeCFv + .4byte GetTypeName__Q34nw4r3g3d16AnmObjTexSrtNodeCFv + .4byte SetFrame__Q34nw4r3g3d16AnmObjTexSrtNodeFf + .4byte GetFrame__Q34nw4r3g3d16AnmObjTexSrtNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d16AnmObjTexSrtNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjTexSrtNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjTexSrtNodeCFv + .4byte Bind__Q34nw4r3g3d16AnmObjTexSrtNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d16AnmObjTexSrtNodeFv .4byte 0 - .byte4 Attach__Q34nw4r3g3d16AnmObjTexSrtNodeFiPQ34nw4r3g3d15AnmObjTexSrtRes - .byte4 Detach__Q34nw4r3g3d16AnmObjTexSrtNodeFi - .byte4 DetachAll__Q34nw4r3g3d16AnmObjTexSrtNodeFv + .4byte Attach__Q34nw4r3g3d16AnmObjTexSrtNodeFiPQ34nw4r3g3d15AnmObjTexSrtRes + .4byte Detach__Q34nw4r3g3d16AnmObjTexSrtNodeFi + .4byte DetachAll__Q34nw4r3g3d16AnmObjTexSrtNodeFv .global __vt__Q34nw4r3g3d12AnmObjTexSrt __vt__Q34nw4r3g3d12AnmObjTexSrt: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d12AnmObjTexSrtCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjTexSrtCFQ44nw4r3g3d6G3dObj7TypeObj .4byte 0 - .byte4 __dt__Q34nw4r3g3d12AnmObjTexSrtFv - .byte4 GetTypeObj__Q34nw4r3g3d12AnmObjTexSrtCFv - .byte4 GetTypeName__Q34nw4r3g3d12AnmObjTexSrtCFv + .4byte __dt__Q34nw4r3g3d12AnmObjTexSrtFv + .4byte GetTypeObj__Q34nw4r3g3d12AnmObjTexSrtCFv + .4byte GetTypeName__Q34nw4r3g3d12AnmObjTexSrtCFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 Release__Q34nw4r3g3d12AnmObjTexSrtFv + .4byte Release__Q34nw4r3g3d12AnmObjTexSrtFv .4byte 0 - .byte4 Attach__Q34nw4r3g3d12AnmObjTexSrtFiPQ34nw4r3g3d15AnmObjTexSrtRes - .byte4 Detach__Q34nw4r3g3d12AnmObjTexSrtFi - .byte4 DetachAll__Q34nw4r3g3d12AnmObjTexSrtFv + .4byte Attach__Q34nw4r3g3d12AnmObjTexSrtFiPQ34nw4r3g3d15AnmObjTexSrtRes + .4byte Detach__Q34nw4r3g3d12AnmObjTexSrtFi + .4byte DetachAll__Q34nw4r3g3d12AnmObjTexSrtFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29106 diff --git a/asm/libnw4r_g3d/g3d_anmvis.s b/asm/libnw4r_g3d/g3d_anmvis.s index 6d4a5b67..2400c0a8 100644 --- a/asm/libnw4r_g3d/g3d_anmvis.s +++ b/asm/libnw4r_g3d/g3d_anmvis.s @@ -1412,84 +1412,84 @@ TYPE_NAME__Q34nw4r3g3d12AnmObjVisRes: __vt__Q34nw4r3g3d12AnmObjVisRes: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d12AnmObjVisResCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d9AnmObjVisFUlUlPv - .byte4 __dt__Q34nw4r3g3d12AnmObjVisResFv - .byte4 GetTypeObj__Q34nw4r3g3d12AnmObjVisResCFv - .byte4 GetTypeName__Q34nw4r3g3d12AnmObjVisResCFv - .byte4 SetFrame__Q34nw4r3g3d12AnmObjVisResFf - .byte4 GetFrame__Q34nw4r3g3d12AnmObjVisResCFv - .byte4 UpdateFrame__Q34nw4r3g3d12AnmObjVisResFv - .byte4 SetUpdateRate__Q34nw4r3g3d12AnmObjVisResFf - .byte4 GetUpdateRate__Q34nw4r3g3d12AnmObjVisResCFv - .byte4 Bind__Q34nw4r3g3d12AnmObjVisResFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d9AnmObjVisFv - .byte4 GetResult__Q34nw4r3g3d12AnmObjVisResFUl - .byte4 Attach__Q34nw4r3g3d9AnmObjVisFiPQ34nw4r3g3d12AnmObjVisRes - .byte4 Detach__Q34nw4r3g3d9AnmObjVisFi + .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjVisResCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d9AnmObjVisFUlUlPv + .4byte __dt__Q34nw4r3g3d12AnmObjVisResFv + .4byte GetTypeObj__Q34nw4r3g3d12AnmObjVisResCFv + .4byte GetTypeName__Q34nw4r3g3d12AnmObjVisResCFv + .4byte SetFrame__Q34nw4r3g3d12AnmObjVisResFf + .4byte GetFrame__Q34nw4r3g3d12AnmObjVisResCFv + .4byte UpdateFrame__Q34nw4r3g3d12AnmObjVisResFv + .4byte SetUpdateRate__Q34nw4r3g3d12AnmObjVisResFf + .4byte GetUpdateRate__Q34nw4r3g3d12AnmObjVisResCFv + .4byte Bind__Q34nw4r3g3d12AnmObjVisResFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d9AnmObjVisFv + .4byte GetResult__Q34nw4r3g3d12AnmObjVisResFUl + .4byte Attach__Q34nw4r3g3d9AnmObjVisFiPQ34nw4r3g3d12AnmObjVisRes + .4byte Detach__Q34nw4r3g3d9AnmObjVisFi .global __vt__Q34nw4r3g3d11AnmObjVisOR __vt__Q34nw4r3g3d11AnmObjVisOR: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d11AnmObjVisORCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d13AnmObjVisNodeFUlUlPv - .byte4 __dt__Q34nw4r3g3d11AnmObjVisORFv - .byte4 GetTypeObj__Q34nw4r3g3d11AnmObjVisORCFv - .byte4 GetTypeName__Q34nw4r3g3d11AnmObjVisORCFv - .byte4 SetFrame__Q34nw4r3g3d13AnmObjVisNodeFf - .byte4 GetFrame__Q34nw4r3g3d13AnmObjVisNodeCFv - .byte4 UpdateFrame__Q34nw4r3g3d13AnmObjVisNodeFv - .byte4 SetUpdateRate__Q34nw4r3g3d13AnmObjVisNodeFf - .byte4 GetUpdateRate__Q34nw4r3g3d13AnmObjVisNodeCFv - .byte4 Bind__Q34nw4r3g3d13AnmObjVisNodeFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d13AnmObjVisNodeFv - .byte4 GetResult__Q34nw4r3g3d11AnmObjVisORFUl - .byte4 Attach__Q34nw4r3g3d13AnmObjVisNodeFiPQ34nw4r3g3d12AnmObjVisRes - .byte4 Detach__Q34nw4r3g3d13AnmObjVisNodeFi + .4byte IsDerivedFrom__Q34nw4r3g3d11AnmObjVisORCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d13AnmObjVisNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d11AnmObjVisORFv + .4byte GetTypeObj__Q34nw4r3g3d11AnmObjVisORCFv + .4byte GetTypeName__Q34nw4r3g3d11AnmObjVisORCFv + .4byte SetFrame__Q34nw4r3g3d13AnmObjVisNodeFf + .4byte GetFrame__Q34nw4r3g3d13AnmObjVisNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d13AnmObjVisNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjVisNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjVisNodeCFv + .4byte Bind__Q34nw4r3g3d13AnmObjVisNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d13AnmObjVisNodeFv + .4byte GetResult__Q34nw4r3g3d11AnmObjVisORFUl + .4byte Attach__Q34nw4r3g3d13AnmObjVisNodeFiPQ34nw4r3g3d12AnmObjVisRes + .4byte Detach__Q34nw4r3g3d13AnmObjVisNodeFi .global __vt__Q34nw4r3g3d13AnmObjVisNode __vt__Q34nw4r3g3d13AnmObjVisNode: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d13AnmObjVisNodeCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d13AnmObjVisNodeFUlUlPv - .byte4 __dt__Q34nw4r3g3d13AnmObjVisNodeFv - .byte4 GetTypeObj__Q34nw4r3g3d13AnmObjVisNodeCFv - .byte4 GetTypeName__Q34nw4r3g3d13AnmObjVisNodeCFv - .byte4 SetFrame__Q34nw4r3g3d13AnmObjVisNodeFf - .byte4 GetFrame__Q34nw4r3g3d13AnmObjVisNodeCFv - .byte4 UpdateFrame__Q34nw4r3g3d13AnmObjVisNodeFv - .byte4 SetUpdateRate__Q34nw4r3g3d13AnmObjVisNodeFf - .byte4 GetUpdateRate__Q34nw4r3g3d13AnmObjVisNodeCFv - .byte4 Bind__Q34nw4r3g3d13AnmObjVisNodeFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d13AnmObjVisNodeFv + .4byte IsDerivedFrom__Q34nw4r3g3d13AnmObjVisNodeCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d13AnmObjVisNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d13AnmObjVisNodeFv + .4byte GetTypeObj__Q34nw4r3g3d13AnmObjVisNodeCFv + .4byte GetTypeName__Q34nw4r3g3d13AnmObjVisNodeCFv + .4byte SetFrame__Q34nw4r3g3d13AnmObjVisNodeFf + .4byte GetFrame__Q34nw4r3g3d13AnmObjVisNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d13AnmObjVisNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjVisNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjVisNodeCFv + .4byte Bind__Q34nw4r3g3d13AnmObjVisNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d13AnmObjVisNodeFv .4byte 0 - .byte4 Attach__Q34nw4r3g3d13AnmObjVisNodeFiPQ34nw4r3g3d12AnmObjVisRes - .byte4 Detach__Q34nw4r3g3d13AnmObjVisNodeFi + .4byte Attach__Q34nw4r3g3d13AnmObjVisNodeFiPQ34nw4r3g3d12AnmObjVisRes + .4byte Detach__Q34nw4r3g3d13AnmObjVisNodeFi .global __vt__Q34nw4r3g3d9AnmObjVis __vt__Q34nw4r3g3d9AnmObjVis: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d9AnmObjVisCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d9AnmObjVisFUlUlPv - .byte4 __dt__Q34nw4r3g3d9AnmObjVisFv - .byte4 GetTypeObj__Q34nw4r3g3d9AnmObjVisCFv - .byte4 GetTypeName__Q34nw4r3g3d9AnmObjVisCFv + .4byte IsDerivedFrom__Q34nw4r3g3d9AnmObjVisCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d9AnmObjVisFUlUlPv + .4byte __dt__Q34nw4r3g3d9AnmObjVisFv + .4byte GetTypeObj__Q34nw4r3g3d9AnmObjVisCFv + .4byte GetTypeName__Q34nw4r3g3d9AnmObjVisCFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 Release__Q34nw4r3g3d9AnmObjVisFv + .4byte Release__Q34nw4r3g3d9AnmObjVisFv .4byte 0 - .byte4 Attach__Q34nw4r3g3d9AnmObjVisFiPQ34nw4r3g3d12AnmObjVisRes - .byte4 Detach__Q34nw4r3g3d9AnmObjVisFi + .4byte Attach__Q34nw4r3g3d9AnmObjVisFiPQ34nw4r3g3d12AnmObjVisRes + .4byte Detach__Q34nw4r3g3d9AnmObjVisFi .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2LOCAL$$2GetAnmPlayPolicy__Q24nw4r3g3dFQ34nw4r3g3d9AnmPolicy$$2policyTable $$2LOCAL$$2GetAnmPlayPolicy__Q24nw4r3g3dFQ34nw4r3g3d9AnmPolicy$$2policyTable: - .byte4 PlayPolicy_Onetime__Q24nw4r3g3dFfff - .byte4 PlayPolicy_Loop__Q24nw4r3g3dFfff + .4byte PlayPolicy_Onetime__Q24nw4r3g3dFfff + .4byte PlayPolicy_Loop__Q24nw4r3g3dFfff .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27650 diff --git a/asm/libnw4r_g3d/g3d_calcview.s b/asm/libnw4r_g3d/g3d_calcview.s index 4a0f2ba4..af5e66dc 100644 --- a/asm/libnw4r_g3d/g3d_calcview.s +++ b/asm/libnw4r_g3d/g3d_calcview.s @@ -2422,12 +2422,12 @@ lbl_800E303C: .global bbFunc__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2 bbFunc__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2: .4byte 0 - .byte4 Calc_BILLBOARD_STD__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl - .byte4 Calc_BILLBOARD_PERSP_STD__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl - .byte4 Calc_BILLBOARD_ROT__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl - .byte4 Calc_BILLBOARD_PERSP_ROT__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl - .byte4 Calc_BILLBOARD_Y__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl - .byte4 Calc_BILLBOARD_PERSP_Y__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl + .4byte Calc_BILLBOARD_STD__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl + .4byte Calc_BILLBOARD_PERSP_STD__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl + .4byte Calc_BILLBOARD_ROT__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl + .4byte Calc_BILLBOARD_PERSP_ROT__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl + .4byte Calc_BILLBOARD_Y__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl + .4byte Calc_BILLBOARD_PERSP_Y__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_g3d/g3d_init.s b/asm/libnw4r_g3d/g3d_init.s index e0bbbc1f..454ba84e 100644 --- a/asm/libnw4r_g3d/g3d_init.s +++ b/asm/libnw4r_g3d/g3d_init.s @@ -81,5 +81,5 @@ $$28056: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global NW4R_G3D_Version___22$$2unnamed$$2g3d_init_cpp$$2 NW4R_G3D_Version___22$$2unnamed$$2g3d_init_cpp$$2: - .byte4 $$28056 + .4byte $$28056 .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_maya.s b/asm/libnw4r_g3d/g3d_maya.s index 015f9cd6..affac04f 100644 --- a/asm/libnw4r_g3d/g3d_maya.s +++ b/asm/libnw4r_g3d/g3d_maya.s @@ -901,22 +901,22 @@ lbl_800E79CC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable $$2LOCAL$$2CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable: - .byte4 MakeTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_T__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_R__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_T__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_R__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt .global $$2LOCAL$$2CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20 $$2LOCAL$$2CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20: - .byte4 ProductTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_T__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_R__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_S__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_T__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_R__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_S__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27167 diff --git a/asm/libnw4r_g3d/g3d_obj.s b/asm/libnw4r_g3d/g3d_obj.s index 33083d42..601e916f 100644 --- a/asm/libnw4r_g3d/g3d_obj.s +++ b/asm/libnw4r_g3d/g3d_obj.s @@ -128,9 +128,9 @@ TYPE_NAME__Q34nw4r3g3d6G3dObj: __vt__Q34nw4r3g3d6G3dObj: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d6G3dObjCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte IsDerivedFrom__Q34nw4r3g3d6G3dObjCFQ44nw4r3g3d6G3dObj7TypeObj .4byte 0 - .byte4 __dt__Q34nw4r3g3d6G3dObjFv - .byte4 GetTypeObj__Q34nw4r3g3d6G3dObjCFv - .byte4 GetTypeName__Q34nw4r3g3d6G3dObjCFv + .4byte __dt__Q34nw4r3g3d6G3dObjFv + .4byte GetTypeObj__Q34nw4r3g3d6G3dObjCFv + .4byte GetTypeName__Q34nw4r3g3d6G3dObjCFv .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmchr.s b/asm/libnw4r_g3d/g3d_resanmchr.s index e3023d80..52e9ce03 100644 --- a/asm/libnw4r_g3d/g3d_resanmchr.s +++ b/asm/libnw4r_g3d/g3d_resanmchr.s @@ -2037,14 +2037,14 @@ lbl_800D1F10: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global gGetAnmResultTable__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2 gGetAnmResultTable__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2: - .byte4 GetAnmResult___Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf - .byte4 GetAnmResult_S__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf - .byte4 GetAnmResult_R__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf - .byte4 GetAnmResult_SR__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf - .byte4 GetAnmResult_T__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf - .byte4 GetAnmResult_ST__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf - .byte4 GetAnmResult_RT__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf - .byte4 GetAnmResult_SRT__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf + .4byte GetAnmResult___Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf + .4byte GetAnmResult_S__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf + .4byte GetAnmResult_R__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf + .4byte GetAnmResult_SR__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf + .4byte GetAnmResult_T__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf + .4byte GetAnmResult_ST__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf + .4byte GetAnmResult_RT__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf + .4byte GetAnmResult_SRT__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28848 diff --git a/asm/libnw4r_g3d/g3d_scnmdl.s b/asm/libnw4r_g3d/g3d_scnmdl.s index 073ed1fa..e4eaa461 100644 --- a/asm/libnw4r_g3d/g3d_scnmdl.s +++ b/asm/libnw4r_g3d/g3d_scnmdl.s @@ -2991,19 +2991,19 @@ TYPE_NAME__Q34nw4r3g3d6ScnMdl: __vt__Q34nw4r3g3d6ScnMdl: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d6ScnMdlCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d6ScnMdlFUlUlPv - .byte4 __dt__Q34nw4r3g3d6ScnMdlFv - .byte4 GetTypeObj__Q34nw4r3g3d6ScnMdlCFv - .byte4 GetTypeName__Q34nw4r3g3d6ScnMdlCFv - .byte4 ForEach__Q34nw4r3g3d7ScnLeafFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb - .byte4 SetScnObjOption__Q34nw4r3g3d6ScnMdlFUlUl - .byte4 GetScnObjOption__Q34nw4r3g3d6ScnMdlCFUlPUl - .byte4 GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv - .byte4 GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv - .byte4 CalcWorldMtx__Q34nw4r3g3d7ScnLeafFPCQ34nw4r4math5MTX34PUl - .byte4 SetAnmObj__Q34nw4r3g3d6ScnMdlFPQ34nw4r3g3d6AnmObjQ44nw4r3g3d12ScnMdlSimple10AnmObjType - .byte4 RemoveAnmObj__Q34nw4r3g3d6ScnMdlFPQ34nw4r3g3d6AnmObj - .byte4 RemoveAnmObj__Q34nw4r3g3d6ScnMdlFQ44nw4r3g3d12ScnMdlSimple10AnmObjType - .byte4 GetAnmObj__Q34nw4r3g3d6ScnMdlFQ44nw4r3g3d12ScnMdlSimple10AnmObjType - .byte4 GetAnmObj__Q34nw4r3g3d6ScnMdlCFQ44nw4r3g3d12ScnMdlSimple10AnmObjType + .4byte IsDerivedFrom__Q34nw4r3g3d6ScnMdlCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d6ScnMdlFUlUlPv + .4byte __dt__Q34nw4r3g3d6ScnMdlFv + .4byte GetTypeObj__Q34nw4r3g3d6ScnMdlCFv + .4byte GetTypeName__Q34nw4r3g3d6ScnMdlCFv + .4byte ForEach__Q34nw4r3g3d7ScnLeafFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb + .4byte SetScnObjOption__Q34nw4r3g3d6ScnMdlFUlUl + .4byte GetScnObjOption__Q34nw4r3g3d6ScnMdlCFUlPUl + .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv + .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv + .4byte CalcWorldMtx__Q34nw4r3g3d7ScnLeafFPCQ34nw4r4math5MTX34PUl + .4byte SetAnmObj__Q34nw4r3g3d6ScnMdlFPQ34nw4r3g3d6AnmObjQ44nw4r3g3d12ScnMdlSimple10AnmObjType + .4byte RemoveAnmObj__Q34nw4r3g3d6ScnMdlFPQ34nw4r3g3d6AnmObj + .4byte RemoveAnmObj__Q34nw4r3g3d6ScnMdlFQ44nw4r3g3d12ScnMdlSimple10AnmObjType + .4byte GetAnmObj__Q34nw4r3g3d6ScnMdlFQ44nw4r3g3d12ScnMdlSimple10AnmObjType + .4byte GetAnmObj__Q34nw4r3g3d6ScnMdlCFQ44nw4r3g3d12ScnMdlSimple10AnmObjType diff --git a/asm/libnw4r_g3d/g3d_scnmdlexpand.s b/asm/libnw4r_g3d/g3d_scnmdlexpand.s index 70776825..7c614883 100644 --- a/asm/libnw4r_g3d/g3d_scnmdlexpand.s +++ b/asm/libnw4r_g3d/g3d_scnmdlexpand.s @@ -718,20 +718,20 @@ TYPE_NAME__Q34nw4r3g3d12ScnMdlExpand: __vt__Q34nw4r3g3d12ScnMdlExpand: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d12ScnMdlExpandCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d12ScnMdlExpandFUlUlPv - .byte4 __dt__Q34nw4r3g3d12ScnMdlExpandFv - .byte4 GetTypeObj__Q34nw4r3g3d12ScnMdlExpandCFv - .byte4 GetTypeName__Q34nw4r3g3d12ScnMdlExpandCFv - .byte4 ForEach__Q34nw4r3g3d8ScnGroupFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb - .byte4 SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl - .byte4 GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl - .byte4 GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv - .byte4 GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv - .byte4 CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl - .byte4 Insert__Q34nw4r3g3d12ScnMdlExpandFUlPQ34nw4r3g3d6ScnObj - .byte4 Remove__Q34nw4r3g3d12ScnMdlExpandFUl - .byte4 Remove__Q34nw4r3g3d12ScnMdlExpandFPQ34nw4r3g3d6ScnObj + .4byte IsDerivedFrom__Q34nw4r3g3d12ScnMdlExpandCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d12ScnMdlExpandFUlUlPv + .4byte __dt__Q34nw4r3g3d12ScnMdlExpandFv + .4byte GetTypeObj__Q34nw4r3g3d12ScnMdlExpandCFv + .4byte GetTypeName__Q34nw4r3g3d12ScnMdlExpandCFv + .4byte ForEach__Q34nw4r3g3d8ScnGroupFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb + .4byte SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl + .4byte GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl + .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv + .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv + .4byte CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl + .4byte Insert__Q34nw4r3g3d12ScnMdlExpandFUlPQ34nw4r3g3d6ScnObj + .4byte Remove__Q34nw4r3g3d12ScnMdlExpandFUl + .4byte Remove__Q34nw4r3g3d12ScnMdlExpandFPQ34nw4r3g3d6ScnObj .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global INVALID_NODE_ID__Q34nw4r3g3d30$$2unnamed$$2g3d_scnmdlexpand_cpp$$2 diff --git a/asm/libnw4r_g3d/g3d_scnmdlsmpl.s b/asm/libnw4r_g3d/g3d_scnmdlsmpl.s index 57d119c9..c4ebaa42 100644 --- a/asm/libnw4r_g3d/g3d_scnmdlsmpl.s +++ b/asm/libnw4r_g3d/g3d_scnmdlsmpl.s @@ -2253,22 +2253,22 @@ $$214160: __vt__Q34nw4r3g3d12ScnMdlSimple: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d12ScnMdlSimpleCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d12ScnMdlSimpleFUlUlPv - .byte4 __dt__Q34nw4r3g3d12ScnMdlSimpleFv - .byte4 GetTypeObj__Q34nw4r3g3d12ScnMdlSimpleCFv - .byte4 GetTypeName__Q34nw4r3g3d12ScnMdlSimpleCFv - .byte4 ForEach__Q34nw4r3g3d7ScnLeafFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb - .byte4 SetScnObjOption__Q34nw4r3g3d12ScnMdlSimpleFUlUl - .byte4 GetScnObjOption__Q34nw4r3g3d12ScnMdlSimpleCFUlPUl - .byte4 GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv - .byte4 GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv - .byte4 CalcWorldMtx__Q34nw4r3g3d7ScnLeafFPCQ34nw4r4math5MTX34PUl - .byte4 SetAnmObj__Q34nw4r3g3d12ScnMdlSimpleFPQ34nw4r3g3d6AnmObjQ44nw4r3g3d12ScnMdlSimple10AnmObjType - .byte4 RemoveAnmObj__Q34nw4r3g3d12ScnMdlSimpleFPQ34nw4r3g3d6AnmObj - .byte4 RemoveAnmObj__Q34nw4r3g3d12ScnMdlSimpleFQ44nw4r3g3d12ScnMdlSimple10AnmObjType - .byte4 GetAnmObj__Q34nw4r3g3d12ScnMdlSimpleFQ44nw4r3g3d12ScnMdlSimple10AnmObjType - .byte4 GetAnmObj__Q34nw4r3g3d12ScnMdlSimpleCFQ44nw4r3g3d12ScnMdlSimple10AnmObjType + .4byte IsDerivedFrom__Q34nw4r3g3d12ScnMdlSimpleCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d12ScnMdlSimpleFUlUlPv + .4byte __dt__Q34nw4r3g3d12ScnMdlSimpleFv + .4byte GetTypeObj__Q34nw4r3g3d12ScnMdlSimpleCFv + .4byte GetTypeName__Q34nw4r3g3d12ScnMdlSimpleCFv + .4byte ForEach__Q34nw4r3g3d7ScnLeafFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb + .4byte SetScnObjOption__Q34nw4r3g3d12ScnMdlSimpleFUlUl + .4byte GetScnObjOption__Q34nw4r3g3d12ScnMdlSimpleCFUlPUl + .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv + .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv + .4byte CalcWorldMtx__Q34nw4r3g3d7ScnLeafFPCQ34nw4r4math5MTX34PUl + .4byte SetAnmObj__Q34nw4r3g3d12ScnMdlSimpleFPQ34nw4r3g3d6AnmObjQ44nw4r3g3d12ScnMdlSimple10AnmObjType + .4byte RemoveAnmObj__Q34nw4r3g3d12ScnMdlSimpleFPQ34nw4r3g3d6AnmObj + .4byte RemoveAnmObj__Q34nw4r3g3d12ScnMdlSimpleFQ44nw4r3g3d12ScnMdlSimple10AnmObjType + .4byte GetAnmObj__Q34nw4r3g3d12ScnMdlSimpleFQ44nw4r3g3d12ScnMdlSimple10AnmObjType + .4byte GetAnmObj__Q34nw4r3g3d12ScnMdlSimpleCFQ44nw4r3g3d12ScnMdlSimple10AnmObjType .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$214161 diff --git a/asm/libnw4r_g3d/g3d_scnobj.s b/asm/libnw4r_g3d/g3d_scnobj.s index a8001cac..076e5570 100644 --- a/asm/libnw4r_g3d/g3d_scnobj.s +++ b/asm/libnw4r_g3d/g3d_scnobj.s @@ -1831,35 +1831,35 @@ $$211656: __vt__Q34nw4r3g3d8ScnGroup: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d8ScnGroupCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d8ScnGroupFUlUlPv - .byte4 __dt__Q34nw4r3g3d8ScnGroupFv - .byte4 GetTypeObj__Q34nw4r3g3d8ScnGroupCFv - .byte4 GetTypeName__Q34nw4r3g3d8ScnGroupCFv - .byte4 ForEach__Q34nw4r3g3d8ScnGroupFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb - .byte4 SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl - .byte4 GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl - .byte4 GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv - .byte4 GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv - .byte4 CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl - .byte4 Insert__Q34nw4r3g3d8ScnGroupFUlPQ34nw4r3g3d6ScnObj - .byte4 Remove__Q34nw4r3g3d8ScnGroupFUl - .byte4 Remove__Q34nw4r3g3d8ScnGroupFPQ34nw4r3g3d6ScnObj + .4byte IsDerivedFrom__Q34nw4r3g3d8ScnGroupCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d8ScnGroupFUlUlPv + .4byte __dt__Q34nw4r3g3d8ScnGroupFv + .4byte GetTypeObj__Q34nw4r3g3d8ScnGroupCFv + .4byte GetTypeName__Q34nw4r3g3d8ScnGroupCFv + .4byte ForEach__Q34nw4r3g3d8ScnGroupFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb + .4byte SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl + .4byte GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl + .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv + .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv + .4byte CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl + .4byte Insert__Q34nw4r3g3d8ScnGroupFUlPQ34nw4r3g3d6ScnObj + .4byte Remove__Q34nw4r3g3d8ScnGroupFUl + .4byte Remove__Q34nw4r3g3d8ScnGroupFPQ34nw4r3g3d6ScnObj .global __vt__Q34nw4r3g3d6ScnObj __vt__Q34nw4r3g3d6ScnObj: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d6ScnObjCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte IsDerivedFrom__Q34nw4r3g3d6ScnObjCFQ44nw4r3g3d6G3dObj7TypeObj .4byte 0 - .byte4 __dt__Q34nw4r3g3d6ScnObjFv - .byte4 GetTypeObj__Q34nw4r3g3d6ScnObjCFv - .byte4 GetTypeName__Q34nw4r3g3d6ScnObjCFv + .4byte __dt__Q34nw4r3g3d6ScnObjFv + .4byte GetTypeObj__Q34nw4r3g3d6ScnObjCFv + .4byte GetTypeName__Q34nw4r3g3d6ScnObjCFv .4byte 0 - .byte4 SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl - .byte4 GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl - .byte4 GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv - .byte4 GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv - .byte4 CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl + .4byte SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl + .4byte GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl + .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv + .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv + .4byte CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_g3d/g3d_scnroot.s b/asm/libnw4r_g3d/g3d_scnroot.s index 63346cb7..d3075de5 100644 --- a/asm/libnw4r_g3d/g3d_scnroot.s +++ b/asm/libnw4r_g3d/g3d_scnroot.s @@ -1944,34 +1944,34 @@ TYPE_NAME__Q34nw4r3g3d7ScnRoot: __vt__Q34nw4r3g3d12ScnObjGather: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3g3d12ScnObjGatherFv - .byte4 Add__Q34nw4r3g3d12ScnObjGatherFPQ34nw4r3g3d6ScnObjbb - .byte4 Clear__Q34nw4r3g3d12ScnObjGatherFv - .byte4 ZSort__Q34nw4r3g3d12ScnObjGatherFv - .byte4 Sort__Q34nw4r3g3d12ScnObjGatherFv - .byte4 Sort__Q34nw4r3g3d12ScnObjGatherFPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_bPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b - .byte4 DrawOpa__Q34nw4r3g3d12ScnObjGatherFPQ34nw4r3g3d14ResMdlDrawMode - .byte4 DrawXlu__Q34nw4r3g3d12ScnObjGatherFPQ34nw4r3g3d14ResMdlDrawMode - .byte4 CheckScnObj__Q34nw4r3g3d12ScnObjGatherFPQ34nw4r3g3d6ScnObj + .4byte __dt__Q34nw4r3g3d12ScnObjGatherFv + .4byte Add__Q34nw4r3g3d12ScnObjGatherFPQ34nw4r3g3d6ScnObjbb + .4byte Clear__Q34nw4r3g3d12ScnObjGatherFv + .4byte ZSort__Q34nw4r3g3d12ScnObjGatherFv + .4byte Sort__Q34nw4r3g3d12ScnObjGatherFv + .4byte Sort__Q34nw4r3g3d12ScnObjGatherFPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_bPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b + .4byte DrawOpa__Q34nw4r3g3d12ScnObjGatherFPQ34nw4r3g3d14ResMdlDrawMode + .4byte DrawXlu__Q34nw4r3g3d12ScnObjGatherFPQ34nw4r3g3d14ResMdlDrawMode + .4byte CheckScnObj__Q34nw4r3g3d12ScnObjGatherFPQ34nw4r3g3d6ScnObj .4byte 0 .global __vt__Q34nw4r3g3d7ScnRoot __vt__Q34nw4r3g3d7ScnRoot: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d7ScnRootCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d7ScnRootFUlUlPv - .byte4 __dt__Q34nw4r3g3d7ScnRootFv - .byte4 GetTypeObj__Q34nw4r3g3d7ScnRootCFv - .byte4 GetTypeName__Q34nw4r3g3d7ScnRootCFv - .byte4 ForEach__Q34nw4r3g3d8ScnGroupFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb - .byte4 SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl - .byte4 GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl - .byte4 GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv - .byte4 GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv - .byte4 CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl - .byte4 Insert__Q34nw4r3g3d8ScnGroupFUlPQ34nw4r3g3d6ScnObj - .byte4 Remove__Q34nw4r3g3d8ScnGroupFUl - .byte4 Remove__Q34nw4r3g3d8ScnGroupFPQ34nw4r3g3d6ScnObj + .4byte IsDerivedFrom__Q34nw4r3g3d7ScnRootCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d7ScnRootFUlUlPv + .4byte __dt__Q34nw4r3g3d7ScnRootFv + .4byte GetTypeObj__Q34nw4r3g3d7ScnRootCFv + .4byte GetTypeName__Q34nw4r3g3d7ScnRootCFv + .4byte ForEach__Q34nw4r3g3d8ScnGroupFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb + .4byte SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl + .4byte GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl + .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv + .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv + .4byte CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl + .4byte Insert__Q34nw4r3g3d8ScnGroupFUlPQ34nw4r3g3d6ScnObj + .4byte Remove__Q34nw4r3g3d8ScnGroupFUl + .4byte Remove__Q34nw4r3g3d8ScnGroupFPQ34nw4r3g3d6ScnObj .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$213447 diff --git a/asm/libnw4r_g3d/g3d_state.s b/asm/libnw4r_g3d/g3d_state.s index cb1e5f42..f6607c67 100644 --- a/asm/libnw4r_g3d/g3d_state.s +++ b/asm/libnw4r_g3d/g3d_state.s @@ -3882,7 +3882,7 @@ lbl_800E0018: /* 800E006C 000DBEAC 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3g3d_state_cpp + .4byte __sinit_$$3g3d_state_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2EnvironmentMapping__Q44nw4r3g3d6detail19ScnDependentMtxFuncFPQ34nw4r4math5MTX34ScSc$$2envMtx @@ -3905,10 +3905,10 @@ $$2LOCAL$$2EnvironmentMapping__Q44nw4r3g3d6detail19ScnDependentMtxFuncFPQ34nw4r4 __vt__Q44nw4r3g3d8G3DState11IndMtxOpStd: .4byte 0 .4byte 0 - .byte4 __cl__Q44nw4r3g3d8G3DState11IndMtxOpStdFPQ44nw4r3g3d8G3DState13IndTexMtxInfo - .byte4 __dt__Q44nw4r3g3d8G3DState11IndMtxOpStdFv - .byte4 Reset__Q44nw4r3g3d8G3DState11IndMtxOpStdFv - .byte4 SetNrmMapMtx__Q44nw4r3g3d8G3DState11IndMtxOpStdF14_GXIndTexMtxIDPCQ34nw4r4math4VEC3PCQ34nw4r4math5MTX34Q44nw4r3g3d14ResMatMiscData14IndirectMethod + .4byte __cl__Q44nw4r3g3d8G3DState11IndMtxOpStdFPQ44nw4r3g3d8G3DState13IndTexMtxInfo + .4byte __dt__Q44nw4r3g3d8G3DState11IndMtxOpStdFv + .4byte Reset__Q44nw4r3g3d8G3DState11IndMtxOpStdFv + .4byte SetNrmMapMtx__Q44nw4r3g3d8G3DState11IndMtxOpStdF14_GXIndTexMtxIDPCQ34nw4r4math4VEC3PCQ34nw4r4math5MTX34Q44nw4r3g3d14ResMatMiscData14IndirectMethod .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$213345 @@ -3916,7 +3916,7 @@ $$213345: .4byte 0xFFFFFFFF .global pG3DStateIndMtxOp__Q44nw4r3g3d8G3DState23$$2unnamed$$2g3d_state_cpp$$2 pG3DStateIndMtxOp__Q44nw4r3g3d8G3DState23$$2unnamed$$2g3d_state_cpp$$2: - .byte4 IndMtxOpDefault__Q44nw4r3g3d8G3DState23$$2unnamed$$2g3d_state_cpp$$2 + .4byte IndMtxOpDefault__Q44nw4r3g3d8G3DState23$$2unnamed$$2g3d_state_cpp$$2 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global cm2hw__Q34nw4r3g3d4fifo diff --git a/asm/libnw4r_g3d/g3d_xsi.s b/asm/libnw4r_g3d/g3d_xsi.s index 5101c1c1..26454c4a 100644 --- a/asm/libnw4r_g3d/g3d_xsi.s +++ b/asm/libnw4r_g3d/g3d_xsi.s @@ -841,22 +841,22 @@ lbl_800E85EC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable $$2LOCAL$$2CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable: - .byte4 MakeTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_T__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_R__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_T__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_R__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt .global $$2LOCAL$$2CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20 $$2LOCAL$$2CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20: - .byte4 ProductTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_T__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_R__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt - .byte4 ProductTexSrtMtx_S__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_T__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_R__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt + .4byte ProductTexSrtMtx_S__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27161 diff --git a/asm/libnw4r_lyt/lyt_animation.s b/asm/libnw4r_lyt/lyt_animation.s index eef301b3..24ed3d24 100644 --- a/asm/libnw4r_lyt/lyt_animation.s +++ b/asm/libnw4r_lyt/lyt_animation.s @@ -1660,13 +1660,13 @@ lbl_800FD854: __vt__Q34nw4r3lyt18AnimTransformBasic: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3lyt18AnimTransformBasicFv - .byte4 SetResource__Q34nw4r3lyt18AnimTransformBasicFPCQ44nw4r3lyt3res14AnimationBlockPQ34nw4r3lyt16ResourceAccessor - .byte4 SetResource__Q34nw4r3lyt18AnimTransformBasicFPCQ44nw4r3lyt3res14AnimationBlockPQ34nw4r3lyt16ResourceAccessorUs - .byte4 Bind__Q34nw4r3lyt18AnimTransformBasicFPQ34nw4r3lyt4Panebb - .byte4 Bind__Q34nw4r3lyt18AnimTransformBasicFPQ34nw4r3lyt8Materialb - .byte4 Animate__Q34nw4r3lyt18AnimTransformBasicFUlPQ34nw4r3lyt4Pane - .byte4 Animate__Q34nw4r3lyt18AnimTransformBasicFUlPQ34nw4r3lyt8Material + .4byte __dt__Q34nw4r3lyt18AnimTransformBasicFv + .4byte SetResource__Q34nw4r3lyt18AnimTransformBasicFPCQ44nw4r3lyt3res14AnimationBlockPQ34nw4r3lyt16ResourceAccessor + .4byte SetResource__Q34nw4r3lyt18AnimTransformBasicFPCQ44nw4r3lyt3res14AnimationBlockPQ34nw4r3lyt16ResourceAccessorUs + .4byte Bind__Q34nw4r3lyt18AnimTransformBasicFPQ34nw4r3lyt4Panebb + .4byte Bind__Q34nw4r3lyt18AnimTransformBasicFPQ34nw4r3lyt8Materialb + .4byte Animate__Q34nw4r3lyt18AnimTransformBasicFUlPQ34nw4r3lyt4Pane + .4byte Animate__Q34nw4r3lyt18AnimTransformBasicFUlPQ34nw4r3lyt8Material .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_lyt/lyt_arcResourceAccessor.s b/asm/libnw4r_lyt/lyt_arcResourceAccessor.s index fad66d9c..1566082a 100644 --- a/asm/libnw4r_lyt/lyt_arcResourceAccessor.s +++ b/asm/libnw4r_lyt/lyt_arcResourceAccessor.s @@ -346,9 +346,9 @@ lbl_800FDD20: __vt__Q34nw4r3lyt19ArcResourceAccessor: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3lyt19ArcResourceAccessorFv - .byte4 GetResource__Q34nw4r3lyt19ArcResourceAccessorFUlPCcPUl - .byte4 GetFont__Q34nw4r3lyt19ArcResourceAccessorFPCc + .4byte __dt__Q34nw4r3lyt19ArcResourceAccessorFv + .4byte GetResource__Q34nw4r3lyt19ArcResourceAccessorFUlPCcPUl + .4byte GetFont__Q34nw4r3lyt19ArcResourceAccessorFPCc .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/libnw4r_lyt/lyt_bounding.s b/asm/libnw4r_lyt/lyt_bounding.s index 209ed07c..883e33b8 100644 --- a/asm/libnw4r_lyt/lyt_bounding.s +++ b/asm/libnw4r_lyt/lyt_bounding.s @@ -70,40 +70,40 @@ __sinit_$$3lyt_bounding_cpp: /* 800F911C 000F4F5C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3lyt_bounding_cpp + .4byte __sinit_$$3lyt_bounding_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt8Bounding __vt__Q34nw4r3lyt8Bounding: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3lyt8BoundingFv - .byte4 GetRuntimeTypeInfo__Q34nw4r3lyt8BoundingCFv - .byte4 CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .byte4 Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .byte4 DrawSelf__Q34nw4r3lyt8BoundingFRCQ34nw4r3lyt8DrawInfo - .byte4 Animate__Q34nw4r3lyt4PaneFUl - .byte4 AnimateSelf__Q34nw4r3lyt4PaneFUl - .byte4 GetVtxColor__Q34nw4r3lyt4PaneCFUl - .byte4 SetVtxColor__Q34nw4r3lyt4PaneFUlQ34nw4r2ut5Color - .byte4 GetColorElement__Q34nw4r3lyt4PaneCFUl - .byte4 SetColorElement__Q34nw4r3lyt4PaneFUlUc - .byte4 GetVtxColorElement__Q34nw4r3lyt4PaneCFUl - .byte4 SetVtxColorElement__Q34nw4r3lyt4PaneFUlUc - .byte4 FindPaneByName__Q34nw4r3lyt4PaneFPCcb - .byte4 FindMaterialByName__Q34nw4r3lyt4PaneFPCcb - .byte4 BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .byte4 UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb - .byte4 UnbindAllAnimation__Q34nw4r3lyt4PaneFb - .byte4 UnbindAnimationSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .byte4 FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .byte4 FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource - .byte4 SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .byte4 SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb - .byte4 GetMaterialNum__Q34nw4r3lyt4PaneCFv - .byte4 GetMaterial__Q34nw4r3lyt4PaneCFv - .byte4 GetMaterial__Q34nw4r3lyt4PaneCFUl - .byte4 LoadMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte __dt__Q34nw4r3lyt8BoundingFv + .4byte GetRuntimeTypeInfo__Q34nw4r3lyt8BoundingCFv + .4byte CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte DrawSelf__Q34nw4r3lyt8BoundingFRCQ34nw4r3lyt8DrawInfo + .4byte Animate__Q34nw4r3lyt4PaneFUl + .4byte AnimateSelf__Q34nw4r3lyt4PaneFUl + .4byte GetVtxColor__Q34nw4r3lyt4PaneCFUl + .4byte SetVtxColor__Q34nw4r3lyt4PaneFUlQ34nw4r2ut5Color + .4byte GetColorElement__Q34nw4r3lyt4PaneCFUl + .4byte SetColorElement__Q34nw4r3lyt4PaneFUlUc + .4byte GetVtxColorElement__Q34nw4r3lyt4PaneCFUl + .4byte SetVtxColorElement__Q34nw4r3lyt4PaneFUlUc + .4byte FindPaneByName__Q34nw4r3lyt4PaneFPCcb + .4byte FindMaterialByName__Q34nw4r3lyt4PaneFPCcb + .4byte BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb + .4byte UnbindAllAnimation__Q34nw4r3lyt4PaneFb + .4byte UnbindAnimationSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb + .4byte GetMaterialNum__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFUl + .4byte LoadMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/libnw4r_lyt/lyt_drawInfo.s b/asm/libnw4r_lyt/lyt_drawInfo.s index 56b6b596..01144223 100644 --- a/asm/libnw4r_lyt/lyt_drawInfo.s +++ b/asm/libnw4r_lyt/lyt_drawInfo.s @@ -48,7 +48,7 @@ __dt__Q34nw4r3lyt8DrawInfoFv: __vt__Q34nw4r3lyt8DrawInfo: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3lyt8DrawInfoFv + .4byte __dt__Q34nw4r3lyt8DrawInfoFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_lyt/lyt_group.s b/asm/libnw4r_lyt/lyt_group.s index 6c366edf..fd0d7649 100644 --- a/asm/libnw4r_lyt/lyt_group.s +++ b/asm/libnw4r_lyt/lyt_group.s @@ -254,5 +254,5 @@ lbl_800F3E2C: __vt__Q34nw4r3lyt5Group: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3lyt5GroupFv + .4byte __dt__Q34nw4r3lyt5GroupFv .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_layout.s b/asm/libnw4r_lyt/lyt_layout.s index 32a03ff7..5d291470 100644 --- a/asm/libnw4r_lyt/lyt_layout.s +++ b/asm/libnw4r_lyt/lyt_layout.s @@ -1167,20 +1167,20 @@ lbl_800F4D94: __vt__Q34nw4r3lyt6Layout: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3lyt6LayoutFv - .byte4 Build__Q34nw4r3lyt6LayoutFPCvPQ34nw4r3lyt16ResourceAccessor - .byte4 CreateAnimTransform__Q34nw4r3lyt6LayoutFv - .byte4 CreateAnimTransform__Q34nw4r3lyt6LayoutFPCvPQ34nw4r3lyt16ResourceAccessor - .byte4 CreateAnimTransform__Q34nw4r3lyt6LayoutFRCQ34nw4r3lyt12AnimResourcePQ34nw4r3lyt16ResourceAccessor - .byte4 BindAnimation__Q34nw4r3lyt6LayoutFPQ34nw4r3lyt13AnimTransform - .byte4 UnbindAnimation__Q34nw4r3lyt6LayoutFPQ34nw4r3lyt13AnimTransform - .byte4 UnbindAllAnimation__Q34nw4r3lyt6LayoutFv - .byte4 BindAnimationAuto__Q34nw4r3lyt6LayoutFRCQ34nw4r3lyt12AnimResourcePQ34nw4r3lyt16ResourceAccessor - .byte4 SetAnimationEnable__Q34nw4r3lyt6LayoutFPQ34nw4r3lyt13AnimTransformb - .byte4 CalculateMtx__Q34nw4r3lyt6LayoutFRCQ34nw4r3lyt8DrawInfo - .byte4 Draw__Q34nw4r3lyt6LayoutFRCQ34nw4r3lyt8DrawInfo - .byte4 Animate__Q34nw4r3lyt6LayoutFUl - .byte4 SetTagProcessor__Q34nw4r3lyt6LayoutFPQ34nw4r2ut19TagProcessorBase$$0w$$1 + .4byte __dt__Q34nw4r3lyt6LayoutFv + .4byte Build__Q34nw4r3lyt6LayoutFPCvPQ34nw4r3lyt16ResourceAccessor + .4byte CreateAnimTransform__Q34nw4r3lyt6LayoutFv + .4byte CreateAnimTransform__Q34nw4r3lyt6LayoutFPCvPQ34nw4r3lyt16ResourceAccessor + .4byte CreateAnimTransform__Q34nw4r3lyt6LayoutFRCQ34nw4r3lyt12AnimResourcePQ34nw4r3lyt16ResourceAccessor + .4byte BindAnimation__Q34nw4r3lyt6LayoutFPQ34nw4r3lyt13AnimTransform + .4byte UnbindAnimation__Q34nw4r3lyt6LayoutFPQ34nw4r3lyt13AnimTransform + .4byte UnbindAllAnimation__Q34nw4r3lyt6LayoutFv + .4byte BindAnimationAuto__Q34nw4r3lyt6LayoutFRCQ34nw4r3lyt12AnimResourcePQ34nw4r3lyt16ResourceAccessor + .4byte SetAnimationEnable__Q34nw4r3lyt6LayoutFPQ34nw4r3lyt13AnimTransformb + .4byte CalculateMtx__Q34nw4r3lyt6LayoutFRCQ34nw4r3lyt8DrawInfo + .4byte Draw__Q34nw4r3lyt6LayoutFRCQ34nw4r3lyt8DrawInfo + .4byte Animate__Q34nw4r3lyt6LayoutFUl + .4byte SetTagProcessor__Q34nw4r3lyt6LayoutFPQ34nw4r2ut19TagProcessorBase$$0w$$1 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210260 diff --git a/asm/libnw4r_lyt/lyt_material.s b/asm/libnw4r_lyt/lyt_material.s index 86216e16..fed3b12d 100644 --- a/asm/libnw4r_lyt/lyt_material.s +++ b/asm/libnw4r_lyt/lyt_material.s @@ -3255,16 +3255,16 @@ $$2LOCAL$$2SetupGX__Q34nw4r3lyt8MaterialFbUc$$2kAlpSels$$20: __vt__Q34nw4r3lyt8Material: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3lyt8MaterialFv - .byte4 SetupGX__Q34nw4r3lyt8MaterialFbUc - .byte4 BindAnimation__Q34nw4r3lyt8MaterialFPQ34nw4r3lyt13AnimTransform - .byte4 UnbindAnimation__Q34nw4r3lyt8MaterialFPQ34nw4r3lyt13AnimTransform - .byte4 UnbindAllAnimation__Q34nw4r3lyt8MaterialFv - .byte4 Animate__Q34nw4r3lyt8MaterialFv - .byte4 FindAnimationLink__Q34nw4r3lyt8MaterialFPQ34nw4r3lyt13AnimTransform - .byte4 FindAnimationLink__Q34nw4r3lyt8MaterialFRCQ34nw4r3lyt12AnimResource - .byte4 SetAnimationEnable__Q34nw4r3lyt8MaterialFPQ34nw4r3lyt13AnimTransformb - .byte4 SetAnimationEnable__Q34nw4r3lyt8MaterialFRCQ34nw4r3lyt12AnimResourceb + .4byte __dt__Q34nw4r3lyt8MaterialFv + .4byte SetupGX__Q34nw4r3lyt8MaterialFbUc + .4byte BindAnimation__Q34nw4r3lyt8MaterialFPQ34nw4r3lyt13AnimTransform + .4byte UnbindAnimation__Q34nw4r3lyt8MaterialFPQ34nw4r3lyt13AnimTransform + .4byte UnbindAllAnimation__Q34nw4r3lyt8MaterialFv + .4byte Animate__Q34nw4r3lyt8MaterialFv + .4byte FindAnimationLink__Q34nw4r3lyt8MaterialFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLink__Q34nw4r3lyt8MaterialFRCQ34nw4r3lyt12AnimResource + .4byte SetAnimationEnable__Q34nw4r3lyt8MaterialFPQ34nw4r3lyt13AnimTransformb + .4byte SetAnimationEnable__Q34nw4r3lyt8MaterialFRCQ34nw4r3lyt12AnimResourceb .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210055 diff --git a/asm/libnw4r_lyt/lyt_pane.s b/asm/libnw4r_lyt/lyt_pane.s index bda06d16..7e61d3b4 100644 --- a/asm/libnw4r_lyt/lyt_pane.s +++ b/asm/libnw4r_lyt/lyt_pane.s @@ -1150,7 +1150,7 @@ __sinit_$$3lyt_pane_cpp: /* 800F3AEC 000EF92C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3lyt_pane_cpp + .4byte __sinit_$$3lyt_pane_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$210224 @@ -1161,33 +1161,33 @@ $$210224: __vt__Q34nw4r3lyt4Pane: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3lyt4PaneFv - .byte4 GetRuntimeTypeInfo__Q34nw4r3lyt4PaneCFv - .byte4 CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .byte4 Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .byte4 DrawSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .byte4 Animate__Q34nw4r3lyt4PaneFUl - .byte4 AnimateSelf__Q34nw4r3lyt4PaneFUl - .byte4 GetVtxColor__Q34nw4r3lyt4PaneCFUl - .byte4 SetVtxColor__Q34nw4r3lyt4PaneFUlQ34nw4r2ut5Color - .byte4 GetColorElement__Q34nw4r3lyt4PaneCFUl - .byte4 SetColorElement__Q34nw4r3lyt4PaneFUlUc - .byte4 GetVtxColorElement__Q34nw4r3lyt4PaneCFUl - .byte4 SetVtxColorElement__Q34nw4r3lyt4PaneFUlUc - .byte4 FindPaneByName__Q34nw4r3lyt4PaneFPCcb - .byte4 FindMaterialByName__Q34nw4r3lyt4PaneFPCcb - .byte4 BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .byte4 UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb - .byte4 UnbindAllAnimation__Q34nw4r3lyt4PaneFb - .byte4 UnbindAnimationSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .byte4 FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .byte4 FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource - .byte4 SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .byte4 SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb - .byte4 GetMaterialNum__Q34nw4r3lyt4PaneCFv - .byte4 GetMaterial__Q34nw4r3lyt4PaneCFv - .byte4 GetMaterial__Q34nw4r3lyt4PaneCFUl - .byte4 LoadMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte __dt__Q34nw4r3lyt4PaneFv + .4byte GetRuntimeTypeInfo__Q34nw4r3lyt4PaneCFv + .4byte CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte DrawSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte Animate__Q34nw4r3lyt4PaneFUl + .4byte AnimateSelf__Q34nw4r3lyt4PaneFUl + .4byte GetVtxColor__Q34nw4r3lyt4PaneCFUl + .4byte SetVtxColor__Q34nw4r3lyt4PaneFUlQ34nw4r2ut5Color + .4byte GetColorElement__Q34nw4r3lyt4PaneCFUl + .4byte SetColorElement__Q34nw4r3lyt4PaneFUlUc + .4byte GetVtxColorElement__Q34nw4r3lyt4PaneCFUl + .4byte SetVtxColorElement__Q34nw4r3lyt4PaneFUlUc + .4byte FindPaneByName__Q34nw4r3lyt4PaneFPCcb + .4byte FindMaterialByName__Q34nw4r3lyt4PaneFPCcb + .4byte BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb + .4byte UnbindAllAnimation__Q34nw4r3lyt4PaneFb + .4byte UnbindAnimationSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb + .4byte GetMaterialNum__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFUl + .4byte LoadMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29820 diff --git a/asm/libnw4r_lyt/lyt_picture.s b/asm/libnw4r_lyt/lyt_picture.s index db22c741..be23ed70 100644 --- a/asm/libnw4r_lyt/lyt_picture.s +++ b/asm/libnw4r_lyt/lyt_picture.s @@ -405,41 +405,41 @@ __sinit_$$3lyt_picture_cpp: /* 800F533C 000F117C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3lyt_picture_cpp + .4byte __sinit_$$3lyt_picture_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt7Picture __vt__Q34nw4r3lyt7Picture: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3lyt7PictureFv - .byte4 GetRuntimeTypeInfo__Q34nw4r3lyt7PictureCFv - .byte4 CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .byte4 Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .byte4 DrawSelf__Q34nw4r3lyt7PictureFRCQ34nw4r3lyt8DrawInfo - .byte4 Animate__Q34nw4r3lyt4PaneFUl - .byte4 AnimateSelf__Q34nw4r3lyt4PaneFUl - .byte4 GetVtxColor__Q34nw4r3lyt7PictureCFUl - .byte4 SetVtxColor__Q34nw4r3lyt7PictureFUlQ34nw4r2ut5Color - .byte4 GetColorElement__Q34nw4r3lyt4PaneCFUl - .byte4 SetColorElement__Q34nw4r3lyt4PaneFUlUc - .byte4 GetVtxColorElement__Q34nw4r3lyt7PictureCFUl - .byte4 SetVtxColorElement__Q34nw4r3lyt7PictureFUlUc - .byte4 FindPaneByName__Q34nw4r3lyt4PaneFPCcb - .byte4 FindMaterialByName__Q34nw4r3lyt4PaneFPCcb - .byte4 BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .byte4 UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb - .byte4 UnbindAllAnimation__Q34nw4r3lyt4PaneFb - .byte4 UnbindAnimationSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .byte4 FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .byte4 FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource - .byte4 SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .byte4 SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb - .byte4 GetMaterialNum__Q34nw4r3lyt4PaneCFv - .byte4 GetMaterial__Q34nw4r3lyt4PaneCFv - .byte4 GetMaterial__Q34nw4r3lyt4PaneCFUl - .byte4 LoadMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .byte4 Append__Q34nw4r3lyt7PictureFRCQ34nw4r3lyt6TexMap + .4byte __dt__Q34nw4r3lyt7PictureFv + .4byte GetRuntimeTypeInfo__Q34nw4r3lyt7PictureCFv + .4byte CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte DrawSelf__Q34nw4r3lyt7PictureFRCQ34nw4r3lyt8DrawInfo + .4byte Animate__Q34nw4r3lyt4PaneFUl + .4byte AnimateSelf__Q34nw4r3lyt4PaneFUl + .4byte GetVtxColor__Q34nw4r3lyt7PictureCFUl + .4byte SetVtxColor__Q34nw4r3lyt7PictureFUlQ34nw4r2ut5Color + .4byte GetColorElement__Q34nw4r3lyt4PaneCFUl + .4byte SetColorElement__Q34nw4r3lyt4PaneFUlUc + .4byte GetVtxColorElement__Q34nw4r3lyt7PictureCFUl + .4byte SetVtxColorElement__Q34nw4r3lyt7PictureFUlUc + .4byte FindPaneByName__Q34nw4r3lyt4PaneFPCcb + .4byte FindMaterialByName__Q34nw4r3lyt4PaneFPCcb + .4byte BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb + .4byte UnbindAllAnimation__Q34nw4r3lyt4PaneFb + .4byte UnbindAnimationSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb + .4byte GetMaterialNum__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFUl + .4byte LoadMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte Append__Q34nw4r3lyt7PictureFRCQ34nw4r3lyt6TexMap .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28804 diff --git a/asm/libnw4r_lyt/lyt_resourceAccessor.s b/asm/libnw4r_lyt/lyt_resourceAccessor.s index f9165c08..01d9f77d 100644 --- a/asm/libnw4r_lyt/lyt_resourceAccessor.s +++ b/asm/libnw4r_lyt/lyt_resourceAccessor.s @@ -27,7 +27,7 @@ GetFont__Q34nw4r3lyt16ResourceAccessorFPCc: __vt__Q34nw4r3lyt16ResourceAccessor: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3lyt16ResourceAccessorFv + .4byte __dt__Q34nw4r3lyt16ResourceAccessorFv .4byte 0 - .byte4 GetFont__Q34nw4r3lyt16ResourceAccessorFPCc + .4byte GetFont__Q34nw4r3lyt16ResourceAccessorFPCc .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_textBox.s b/asm/libnw4r_lyt/lyt_textBox.s index 2dde9c6a..4840d696 100644 --- a/asm/libnw4r_lyt/lyt_textBox.s +++ b/asm/libnw4r_lyt/lyt_textBox.s @@ -1680,44 +1680,44 @@ __sinit_$$3lyt_textBox_cpp: /* 800F6AAC 000F28EC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3lyt_textBox_cpp + .4byte __sinit_$$3lyt_textBox_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt7TextBox __vt__Q34nw4r3lyt7TextBox: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3lyt7TextBoxFv - .byte4 GetRuntimeTypeInfo__Q34nw4r3lyt7TextBoxCFv - .byte4 CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .byte4 Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .byte4 DrawSelf__Q34nw4r3lyt7TextBoxFRCQ34nw4r3lyt8DrawInfo - .byte4 Animate__Q34nw4r3lyt4PaneFUl - .byte4 AnimateSelf__Q34nw4r3lyt4PaneFUl - .byte4 GetVtxColor__Q34nw4r3lyt7TextBoxCFUl - .byte4 SetVtxColor__Q34nw4r3lyt7TextBoxFUlQ34nw4r2ut5Color - .byte4 GetColorElement__Q34nw4r3lyt4PaneCFUl - .byte4 SetColorElement__Q34nw4r3lyt4PaneFUlUc - .byte4 GetVtxColorElement__Q34nw4r3lyt7TextBoxCFUl - .byte4 SetVtxColorElement__Q34nw4r3lyt7TextBoxFUlUc - .byte4 FindPaneByName__Q34nw4r3lyt4PaneFPCcb - .byte4 FindMaterialByName__Q34nw4r3lyt4PaneFPCcb - .byte4 BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .byte4 UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb - .byte4 UnbindAllAnimation__Q34nw4r3lyt4PaneFb - .byte4 UnbindAnimationSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .byte4 FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .byte4 FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource - .byte4 SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .byte4 SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb - .byte4 GetMaterialNum__Q34nw4r3lyt4PaneCFv - .byte4 GetMaterial__Q34nw4r3lyt4PaneCFv - .byte4 GetMaterial__Q34nw4r3lyt4PaneCFUl - .byte4 LoadMtx__Q34nw4r3lyt7TextBoxFRCQ34nw4r3lyt8DrawInfo - .byte4 AllocStringBuffer__Q34nw4r3lyt7TextBoxFUs - .byte4 FreeStringBuffer__Q34nw4r3lyt7TextBoxFv - .byte4 SetString__Q34nw4r3lyt7TextBoxFPCwUs - .byte4 SetString__Q34nw4r3lyt7TextBoxFPCwUsUs + .4byte __dt__Q34nw4r3lyt7TextBoxFv + .4byte GetRuntimeTypeInfo__Q34nw4r3lyt7TextBoxCFv + .4byte CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte DrawSelf__Q34nw4r3lyt7TextBoxFRCQ34nw4r3lyt8DrawInfo + .4byte Animate__Q34nw4r3lyt4PaneFUl + .4byte AnimateSelf__Q34nw4r3lyt4PaneFUl + .4byte GetVtxColor__Q34nw4r3lyt7TextBoxCFUl + .4byte SetVtxColor__Q34nw4r3lyt7TextBoxFUlQ34nw4r2ut5Color + .4byte GetColorElement__Q34nw4r3lyt4PaneCFUl + .4byte SetColorElement__Q34nw4r3lyt4PaneFUlUc + .4byte GetVtxColorElement__Q34nw4r3lyt7TextBoxCFUl + .4byte SetVtxColorElement__Q34nw4r3lyt7TextBoxFUlUc + .4byte FindPaneByName__Q34nw4r3lyt4PaneFPCcb + .4byte FindMaterialByName__Q34nw4r3lyt4PaneFPCcb + .4byte BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb + .4byte UnbindAllAnimation__Q34nw4r3lyt4PaneFb + .4byte UnbindAnimationSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb + .4byte GetMaterialNum__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFUl + .4byte LoadMtx__Q34nw4r3lyt7TextBoxFRCQ34nw4r3lyt8DrawInfo + .4byte AllocStringBuffer__Q34nw4r3lyt7TextBoxFUs + .4byte FreeStringBuffer__Q34nw4r3lyt7TextBoxFv + .4byte SetString__Q34nw4r3lyt7TextBoxFPCwUs + .4byte SetString__Q34nw4r3lyt7TextBoxFPCwUsUs .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/libnw4r_lyt/lyt_window.s b/asm/libnw4r_lyt/lyt_window.s index a6f5e1b4..eebfc3f7 100644 --- a/asm/libnw4r_lyt/lyt_window.s +++ b/asm/libnw4r_lyt/lyt_window.s @@ -2548,7 +2548,7 @@ __sinit_$$3lyt_window_cpp: /* 800F904C 000F4E8C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3lyt_window_cpp + .4byte __sinit_$$3lyt_window_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2LOCAL$$2GetTexutreFlipInfo__Q34nw4r3lyt24$$2unnamed$$2lyt_window_cpp$$2FUc$$2flipInfos @@ -2572,39 +2572,39 @@ $$2LOCAL$$2GetTexutreFlipInfo__Q34nw4r3lyt24$$2unnamed$$2lyt_window_cpp$$2FUc$$2 __vt__Q34nw4r3lyt6Window: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3lyt6WindowFv - .byte4 GetRuntimeTypeInfo__Q34nw4r3lyt6WindowCFv - .byte4 CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .byte4 Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .byte4 DrawSelf__Q34nw4r3lyt6WindowFRCQ34nw4r3lyt8DrawInfo - .byte4 Animate__Q34nw4r3lyt4PaneFUl - .byte4 AnimateSelf__Q34nw4r3lyt6WindowFUl - .byte4 GetVtxColor__Q34nw4r3lyt6WindowCFUl - .byte4 SetVtxColor__Q34nw4r3lyt6WindowFUlQ34nw4r2ut5Color - .byte4 GetColorElement__Q34nw4r3lyt4PaneCFUl - .byte4 SetColorElement__Q34nw4r3lyt4PaneFUlUc - .byte4 GetVtxColorElement__Q34nw4r3lyt6WindowCFUl - .byte4 SetVtxColorElement__Q34nw4r3lyt6WindowFUlUc - .byte4 FindPaneByName__Q34nw4r3lyt4PaneFPCcb - .byte4 FindMaterialByName__Q34nw4r3lyt6WindowFPCcb - .byte4 BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .byte4 UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb - .byte4 UnbindAllAnimation__Q34nw4r3lyt4PaneFb - .byte4 UnbindAnimationSelf__Q34nw4r3lyt6WindowFPQ34nw4r3lyt13AnimTransform - .byte4 FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .byte4 FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource - .byte4 SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .byte4 SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb - .byte4 GetMaterialNum__Q34nw4r3lyt6WindowCFv - .byte4 GetMaterial__Q34nw4r3lyt4PaneCFv - .byte4 GetMaterial__Q34nw4r3lyt6WindowCFUl - .byte4 LoadMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .byte4 GetContentMaterial__Q34nw4r3lyt6WindowCFv - .byte4 GetFrameMaterial__Q34nw4r3lyt6WindowCFUl - .byte4 DrawContent__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ34nw4r3lyt15WindowFrameSizeUc - .byte4 DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc - .byte4 DrawFrame4__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2PCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc - .byte4 DrawFrame8__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2PCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc + .4byte __dt__Q34nw4r3lyt6WindowFv + .4byte GetRuntimeTypeInfo__Q34nw4r3lyt6WindowCFv + .4byte CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte DrawSelf__Q34nw4r3lyt6WindowFRCQ34nw4r3lyt8DrawInfo + .4byte Animate__Q34nw4r3lyt4PaneFUl + .4byte AnimateSelf__Q34nw4r3lyt6WindowFUl + .4byte GetVtxColor__Q34nw4r3lyt6WindowCFUl + .4byte SetVtxColor__Q34nw4r3lyt6WindowFUlQ34nw4r2ut5Color + .4byte GetColorElement__Q34nw4r3lyt4PaneCFUl + .4byte SetColorElement__Q34nw4r3lyt4PaneFUlUc + .4byte GetVtxColorElement__Q34nw4r3lyt6WindowCFUl + .4byte SetVtxColorElement__Q34nw4r3lyt6WindowFUlUc + .4byte FindPaneByName__Q34nw4r3lyt4PaneFPCcb + .4byte FindMaterialByName__Q34nw4r3lyt6WindowFPCcb + .4byte BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb + .4byte UnbindAllAnimation__Q34nw4r3lyt4PaneFb + .4byte UnbindAnimationSelf__Q34nw4r3lyt6WindowFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb + .4byte GetMaterialNum__Q34nw4r3lyt6WindowCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt6WindowCFUl + .4byte LoadMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte GetContentMaterial__Q34nw4r3lyt6WindowCFv + .4byte GetFrameMaterial__Q34nw4r3lyt6WindowCFUl + .4byte DrawContent__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ34nw4r3lyt15WindowFrameSizeUc + .4byte DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc + .4byte DrawFrame4__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2PCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc + .4byte DrawFrame8__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2PCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29836 diff --git a/asm/libnw4r_snd/snd_AxManager.s b/asm/libnw4r_snd/snd_AxManager.s index 4298c506..29b38c8d 100644 --- a/asm/libnw4r_snd/snd_AxManager.s +++ b/asm/libnw4r_snd/snd_AxManager.s @@ -1264,7 +1264,7 @@ __sinit_$$3snd_AxManager_cpp: /* 80100FCC 000FCE0C 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3snd_AxManager_cpp + .4byte __sinit_$$3snd_AxManager_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$24786 diff --git a/asm/libnw4r_snd/snd_BasicPlayer.s b/asm/libnw4r_snd/snd_BasicPlayer.s index ac96facd..01079908 100644 --- a/asm/libnw4r_snd/snd_BasicPlayer.s +++ b/asm/libnw4r_snd/snd_BasicPlayer.s @@ -170,7 +170,7 @@ __dt__Q44nw4r3snd6detail11BasicPlayerFv: __vt__Q44nw4r3snd6detail11BasicPlayer: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd6detail11BasicPlayerFv + .4byte __dt__Q44nw4r3snd6detail11BasicPlayerFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/libnw4r_snd/snd_BasicSound.s b/asm/libnw4r_snd/snd_BasicSound.s index 3232bf2f..3578e786 100644 --- a/asm/libnw4r_snd/snd_BasicSound.s +++ b/asm/libnw4r_snd/snd_BasicSound.s @@ -1644,25 +1644,25 @@ __sinit_$$3snd_BasicSound_cpp: /* 80106B7C 001029BC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3snd_BasicSound_cpp + .4byte __sinit_$$3snd_BasicSound_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail10BasicSound __vt__Q44nw4r3snd6detail10BasicSound: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q44nw4r3snd6detail10BasicSoundCFv - .byte4 __dt__Q44nw4r3snd6detail10BasicSoundFv - .byte4 Shutdown__Q44nw4r3snd6detail10BasicSoundFv + .4byte GetRuntimeTypeInfo__Q44nw4r3snd6detail10BasicSoundCFv + .4byte __dt__Q44nw4r3snd6detail10BasicSoundFv + .4byte Shutdown__Q44nw4r3snd6detail10BasicSoundFv .4byte 0 .4byte 0 .4byte 0 - .byte4 InitParam__Q44nw4r3snd6detail10BasicSoundFv + .4byte InitParam__Q44nw4r3snd6detail10BasicSoundFv .4byte 0 .4byte 0 - .byte4 OnUpdatePlayerPriority__Q44nw4r3snd6detail10BasicSoundFv - .byte4 UpdateMoveValue__Q44nw4r3snd6detail10BasicSoundFv - .byte4 UpdateParam__Q44nw4r3snd6detail10BasicSoundFv + .4byte OnUpdatePlayerPriority__Q44nw4r3snd6detail10BasicSoundFv + .4byte UpdateMoveValue__Q44nw4r3snd6detail10BasicSoundFv + .4byte UpdateParam__Q44nw4r3snd6detail10BasicSoundFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$212466 diff --git a/asm/libnw4r_snd/snd_BiquadFilterPreset.s b/asm/libnw4r_snd/snd_BiquadFilterPreset.s index c302a035..79b3113f 100644 --- a/asm/libnw4r_snd/snd_BiquadFilterPreset.s +++ b/asm/libnw4r_snd/snd_BiquadFilterPreset.s @@ -1564,32 +1564,32 @@ coefTable__Q44nw4r3snd6detail19BiquadFilterBpf2048: __vt__Q44nw4r3snd6detail19BiquadFilterBpf2048: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd6detail19BiquadFilterBpf2048Fv - .byte4 GetCoef__Q44nw4r3snd6detail19BiquadFilterBpf2048CFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef + .4byte __dt__Q44nw4r3snd6detail19BiquadFilterBpf2048Fv + .4byte GetCoef__Q44nw4r3snd6detail19BiquadFilterBpf2048CFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef .global __vt__Q44nw4r3snd6detail19BiquadFilterBpf1024 __vt__Q44nw4r3snd6detail19BiquadFilterBpf1024: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd6detail19BiquadFilterBpf1024Fv - .byte4 GetCoef__Q44nw4r3snd6detail19BiquadFilterBpf1024CFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef + .4byte __dt__Q44nw4r3snd6detail19BiquadFilterBpf1024Fv + .4byte GetCoef__Q44nw4r3snd6detail19BiquadFilterBpf1024CFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef .global __vt__Q44nw4r3snd6detail18BiquadFilterBpf512 __vt__Q44nw4r3snd6detail18BiquadFilterBpf512: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd6detail18BiquadFilterBpf512Fv - .byte4 GetCoef__Q44nw4r3snd6detail18BiquadFilterBpf512CFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef + .4byte __dt__Q44nw4r3snd6detail18BiquadFilterBpf512Fv + .4byte GetCoef__Q44nw4r3snd6detail18BiquadFilterBpf512CFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef .global __vt__Q44nw4r3snd6detail15BiquadFilterHpf __vt__Q44nw4r3snd6detail15BiquadFilterHpf: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd6detail15BiquadFilterHpfFv - .byte4 GetCoef__Q44nw4r3snd6detail15BiquadFilterHpfCFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef + .4byte __dt__Q44nw4r3snd6detail15BiquadFilterHpfFv + .4byte GetCoef__Q44nw4r3snd6detail15BiquadFilterHpfCFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef .global __vt__Q44nw4r3snd6detail15BiquadFilterLpf __vt__Q44nw4r3snd6detail15BiquadFilterLpf: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd6detail15BiquadFilterLpfFv - .byte4 GetCoef__Q44nw4r3snd6detail15BiquadFilterLpfCFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef + .4byte __dt__Q44nw4r3snd6detail15BiquadFilterLpfFv + .4byte GetCoef__Q44nw4r3snd6detail15BiquadFilterLpfCFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2752 diff --git a/asm/libnw4r_snd/snd_DvdSoundArchive.s b/asm/libnw4r_snd/snd_DvdSoundArchive.s index b2351077..6d32ff2c 100644 --- a/asm/libnw4r_snd/snd_DvdSoundArchive.s +++ b/asm/libnw4r_snd/snd_DvdSoundArchive.s @@ -587,37 +587,37 @@ lbl_80108B0C: __vt__Q44nw4r3snd15DvdSoundArchive13DvdFileStream: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q34nw4r2ut19DvdLockedFileStreamCFv - .byte4 __dt__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamFv - .byte4 Close__Q34nw4r2ut19DvdLockedFileStreamFv - .byte4 Read__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamFPvUl - .byte4 ReadAsync__Q34nw4r2ut19DvdLockedFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv - .byte4 Write__Q34nw4r2ut8IOStreamFPCvUl - .byte4 WriteAsync__Q34nw4r2ut8IOStreamFPCvUlPFlPQ34nw4r2ut8IOStreamPv_vPv - .byte4 IsBusy__Q34nw4r2ut13DvdFileStreamCFv - .byte4 CanAsync__Q34nw4r2ut19DvdLockedFileStreamCFv - .byte4 CanRead__Q34nw4r2ut13DvdFileStreamCFv - .byte4 CanWrite__Q34nw4r2ut13DvdFileStreamCFv - .byte4 GetOffsetAlign__Q34nw4r2ut13DvdFileStreamCFv - .byte4 GetSizeAlign__Q34nw4r2ut13DvdFileStreamCFv - .byte4 GetBufferAlign__Q34nw4r2ut13DvdFileStreamCFv - .byte4 GetSize__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamCFv - .byte4 Seek__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamFlUl - .byte4 Cancel__Q34nw4r2ut19DvdLockedFileStreamFv - .byte4 CancelAsync__Q34nw4r2ut13DvdFileStreamFPFlPQ34nw4r2ut8IOStreamPv_vPv - .byte4 CanSeek__Q34nw4r2ut13DvdFileStreamCFv - .byte4 CanCancel__Q34nw4r2ut13DvdFileStreamCFv - .byte4 Tell__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamCFv - .byte4 Peek__Q34nw4r2ut19DvdLockedFileStreamFPvUl - .byte4 PeekAsync__Q34nw4r2ut19DvdLockedFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte GetRuntimeTypeInfo__Q34nw4r2ut19DvdLockedFileStreamCFv + .4byte __dt__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamFv + .4byte Close__Q34nw4r2ut19DvdLockedFileStreamFv + .4byte Read__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamFPvUl + .4byte ReadAsync__Q34nw4r2ut19DvdLockedFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte Write__Q34nw4r2ut8IOStreamFPCvUl + .4byte WriteAsync__Q34nw4r2ut8IOStreamFPCvUlPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte IsBusy__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanAsync__Q34nw4r2ut19DvdLockedFileStreamCFv + .4byte CanRead__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanWrite__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetOffsetAlign__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetSizeAlign__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetBufferAlign__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetSize__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamCFv + .4byte Seek__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamFlUl + .4byte Cancel__Q34nw4r2ut19DvdLockedFileStreamFv + .4byte CancelAsync__Q34nw4r2ut13DvdFileStreamFPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte CanSeek__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanCancel__Q34nw4r2ut13DvdFileStreamCFv + .4byte Tell__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamCFv + .4byte Peek__Q34nw4r2ut19DvdLockedFileStreamFPvUl + .4byte PeekAsync__Q34nw4r2ut19DvdLockedFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv .4byte 0 .global __vt__Q34nw4r3snd15DvdSoundArchive __vt__Q34nw4r3snd15DvdSoundArchive: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3snd15DvdSoundArchiveFv - .byte4 detail_GetFileAddress__Q34nw4r3snd15DvdSoundArchiveCFUl - .byte4 detail_GetWaveDataFileAddress__Q34nw4r3snd15DvdSoundArchiveCFUl - .byte4 detail_GetRequiredStreamBufferSize__Q34nw4r3snd15DvdSoundArchiveCFv - .byte4 OpenStream__Q34nw4r3snd15DvdSoundArchiveCFPviUlUl - .byte4 OpenExtStream__Q34nw4r3snd15DvdSoundArchiveCFPviPCcUlUl + .4byte __dt__Q34nw4r3snd15DvdSoundArchiveFv + .4byte detail_GetFileAddress__Q34nw4r3snd15DvdSoundArchiveCFUl + .4byte detail_GetWaveDataFileAddress__Q34nw4r3snd15DvdSoundArchiveCFUl + .4byte detail_GetRequiredStreamBufferSize__Q34nw4r3snd15DvdSoundArchiveCFv + .4byte OpenStream__Q34nw4r3snd15DvdSoundArchiveCFPviUlUl + .4byte OpenExtStream__Q34nw4r3snd15DvdSoundArchiveCFPviPCcUlUl diff --git a/asm/libnw4r_snd/snd_MmlParser.s b/asm/libnw4r_snd/snd_MmlParser.s index e9fbd8dd..963e60a5 100644 --- a/asm/libnw4r_snd/snd_MmlParser.s +++ b/asm/libnw4r_snd/snd_MmlParser.s @@ -1405,8 +1405,8 @@ $$210414: __vt__Q44nw4r3snd6detail9MmlParser: .4byte 0 .4byte 0 - .byte4 CommandProc__Q44nw4r3snd6detail9MmlParserCFPQ44nw4r3snd6detail11MmlSeqTrackUlll - .byte4 NoteOnCommandProc__Q44nw4r3snd6detail9MmlParserCFPQ44nw4r3snd6detail11MmlSeqTrackiilb + .4byte CommandProc__Q44nw4r3snd6detail9MmlParserCFPQ44nw4r3snd6detail11MmlSeqTrackUlll + .4byte NoteOnCommandProc__Q44nw4r3snd6detail9MmlParserCFPQ44nw4r3snd6detail11MmlSeqTrackiilb .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$210407 diff --git a/asm/libnw4r_snd/snd_MmlSeqTrack.s b/asm/libnw4r_snd/snd_MmlSeqTrack.s index 511d7e1f..78d4dec9 100644 --- a/asm/libnw4r_snd/snd_MmlSeqTrack.s +++ b/asm/libnw4r_snd/snd_MmlSeqTrack.s @@ -64,5 +64,5 @@ lbl_8010B11C: __vt__Q44nw4r3snd6detail11MmlSeqTrack: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd6detail11MmlSeqTrackFv - .byte4 Parse__Q44nw4r3snd6detail11MmlSeqTrackFb + .4byte __dt__Q44nw4r3snd6detail11MmlSeqTrackFv + .4byte Parse__Q44nw4r3snd6detail11MmlSeqTrackFb diff --git a/asm/libnw4r_snd/snd_MmlSeqTrackAllocator.s b/asm/libnw4r_snd/snd_MmlSeqTrackAllocator.s index 7feed93a..30bea988 100644 --- a/asm/libnw4r_snd/snd_MmlSeqTrackAllocator.s +++ b/asm/libnw4r_snd/snd_MmlSeqTrackAllocator.s @@ -100,7 +100,7 @@ __dt__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFv: __vt__Q44nw4r3snd6detail20MmlSeqTrackAllocator: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFv - .byte4 AllocTrack__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFPQ44nw4r3snd6detail9SeqPlayer - .byte4 FreeTrack__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFPQ44nw4r3snd6detail8SeqTrack - .byte4 GetAllocatableTrackCount__Q44nw4r3snd6detail20MmlSeqTrackAllocatorCFv + .4byte __dt__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFv + .4byte AllocTrack__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFPQ44nw4r3snd6detail9SeqPlayer + .4byte FreeTrack__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFPQ44nw4r3snd6detail8SeqTrack + .4byte GetAllocatableTrackCount__Q44nw4r3snd6detail20MmlSeqTrackAllocatorCFv diff --git a/asm/libnw4r_snd/snd_PlayerHeap.s b/asm/libnw4r_snd/snd_PlayerHeap.s index dc150170..609958c5 100644 --- a/asm/libnw4r_snd/snd_PlayerHeap.s +++ b/asm/libnw4r_snd/snd_PlayerHeap.s @@ -155,5 +155,5 @@ GetFreeSize__Q44nw4r3snd6detail10PlayerHeapCFv: __vt__Q44nw4r3snd6detail10PlayerHeap: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd6detail10PlayerHeapFv - .byte4 Alloc__Q44nw4r3snd6detail10PlayerHeapFUl + .4byte __dt__Q44nw4r3snd6detail10PlayerHeapFv + .4byte Alloc__Q44nw4r3snd6detail10PlayerHeapFUl diff --git a/asm/libnw4r_snd/snd_SeqPlayer.s b/asm/libnw4r_snd/snd_SeqPlayer.s index 9f38229f..b0be57f2 100644 --- a/asm/libnw4r_snd/snd_SeqPlayer.s +++ b/asm/libnw4r_snd/snd_SeqPlayer.s @@ -1543,29 +1543,29 @@ $$2192$$2__dt__Q44nw4r3snd6detail9SeqPlayerFv: __vt__Q44nw4r3snd6detail9SeqPlayer: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd6detail9SeqPlayerFv - .byte4 Start__Q44nw4r3snd6detail9SeqPlayerFv - .byte4 Stop__Q44nw4r3snd6detail9SeqPlayerFv - .byte4 Pause__Q44nw4r3snd6detail9SeqPlayerFb - .byte4 IsActive__Q44nw4r3snd6detail9SeqPlayerCFv - .byte4 IsStarted__Q44nw4r3snd6detail9SeqPlayerCFv - .byte4 IsPause__Q44nw4r3snd6detail9SeqPlayerCFv + .4byte __dt__Q44nw4r3snd6detail9SeqPlayerFv + .4byte Start__Q44nw4r3snd6detail9SeqPlayerFv + .4byte Stop__Q44nw4r3snd6detail9SeqPlayerFv + .4byte Pause__Q44nw4r3snd6detail9SeqPlayerFb + .4byte IsActive__Q44nw4r3snd6detail9SeqPlayerCFv + .4byte IsStarted__Q44nw4r3snd6detail9SeqPlayerCFv + .4byte IsPause__Q44nw4r3snd6detail9SeqPlayerCFv .4byte 0 .4byte 0 - .byte4 $$2180$$2__dt__Q44nw4r3snd6detail9SeqPlayerFv - .byte4 $$2180$$2InvalidateData__Q44nw4r3snd6detail9SeqPlayerFPCvPCv - .byte4 $$2180$$2InvalidateWaveData__Q44nw4r3snd6detail9SeqPlayerFPCvPCv + .4byte $$2180$$2__dt__Q44nw4r3snd6detail9SeqPlayerFv + .4byte $$2180$$2InvalidateData__Q44nw4r3snd6detail9SeqPlayerFPCvPCv + .4byte $$2180$$2InvalidateWaveData__Q44nw4r3snd6detail9SeqPlayerFPCvPCv .4byte 0 .4byte 0 - .byte4 $$2192$$2__dt__Q44nw4r3snd6detail9SeqPlayerFv - .byte4 $$2192$$2OnUpdateFrameSoundThread__Q44nw4r3snd6detail9SeqPlayerFv - .byte4 OnUpdateVoiceSoundThread__Q54nw4r3snd6detail11SoundThread14PlayerCallbackFv - .byte4 $$2192$$2OnShutdownSoundThread__Q44nw4r3snd6detail9SeqPlayerFv - .byte4 InvalidateData__Q44nw4r3snd6detail9SeqPlayerFPCvPCv - .byte4 InvalidateWaveData__Q44nw4r3snd6detail9SeqPlayerFPCvPCv - .byte4 ChannelCallback__Q44nw4r3snd6detail9SeqPlayerFPQ44nw4r3snd6detail7Channel - .byte4 OnUpdateFrameSoundThread__Q44nw4r3snd6detail9SeqPlayerFv - .byte4 OnShutdownSoundThread__Q44nw4r3snd6detail9SeqPlayerFv + .4byte $$2192$$2__dt__Q44nw4r3snd6detail9SeqPlayerFv + .4byte $$2192$$2OnUpdateFrameSoundThread__Q44nw4r3snd6detail9SeqPlayerFv + .4byte OnUpdateVoiceSoundThread__Q54nw4r3snd6detail11SoundThread14PlayerCallbackFv + .4byte $$2192$$2OnShutdownSoundThread__Q44nw4r3snd6detail9SeqPlayerFv + .4byte InvalidateData__Q44nw4r3snd6detail9SeqPlayerFPCvPCv + .4byte InvalidateWaveData__Q44nw4r3snd6detail9SeqPlayerFPCvPCv + .4byte ChannelCallback__Q44nw4r3snd6detail9SeqPlayerFPQ44nw4r3snd6detail7Channel + .4byte OnUpdateFrameSoundThread__Q44nw4r3snd6detail9SeqPlayerFv + .4byte OnShutdownSoundThread__Q44nw4r3snd6detail9SeqPlayerFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_snd/snd_SeqSound.s b/asm/libnw4r_snd/snd_SeqSound.s index 9a9681df..1fed0e2e 100644 --- a/asm/libnw4r_snd/snd_SeqSound.s +++ b/asm/libnw4r_snd/snd_SeqSound.s @@ -608,33 +608,33 @@ __sinit_$$3snd_SeqSound_cpp: /* 8010DF0C 00109D4C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3snd_SeqSound_cpp + .4byte __sinit_$$3snd_SeqSound_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail8SeqSound __vt__Q44nw4r3snd6detail8SeqSound: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q44nw4r3snd6detail8SeqSoundCFv - .byte4 __dt__Q44nw4r3snd6detail8SeqSoundFv - .byte4 Shutdown__Q44nw4r3snd6detail8SeqSoundFv - .byte4 IsPrepared__Q44nw4r3snd6detail8SeqSoundCFv - .byte4 IsAttachedTempSpecialHandle__Q44nw4r3snd6detail8SeqSoundFv - .byte4 DetachTempSpecialHandle__Q44nw4r3snd6detail8SeqSoundFv - .byte4 InitParam__Q44nw4r3snd6detail8SeqSoundFv - .byte4 GetBasicPlayer__Q44nw4r3snd6detail8SeqSoundFv - .byte4 GetBasicPlayer__Q44nw4r3snd6detail8SeqSoundCFv - .byte4 OnUpdatePlayerPriority__Q44nw4r3snd6detail8SeqSoundFv - .byte4 UpdateMoveValue__Q44nw4r3snd6detail10BasicSoundFv - .byte4 UpdateParam__Q44nw4r3snd6detail10BasicSoundFv + .4byte GetRuntimeTypeInfo__Q44nw4r3snd6detail8SeqSoundCFv + .4byte __dt__Q44nw4r3snd6detail8SeqSoundFv + .4byte Shutdown__Q44nw4r3snd6detail8SeqSoundFv + .4byte IsPrepared__Q44nw4r3snd6detail8SeqSoundCFv + .4byte IsAttachedTempSpecialHandle__Q44nw4r3snd6detail8SeqSoundFv + .4byte DetachTempSpecialHandle__Q44nw4r3snd6detail8SeqSoundFv + .4byte InitParam__Q44nw4r3snd6detail8SeqSoundFv + .4byte GetBasicPlayer__Q44nw4r3snd6detail8SeqSoundFv + .4byte GetBasicPlayer__Q44nw4r3snd6detail8SeqSoundCFv + .4byte OnUpdatePlayerPriority__Q44nw4r3snd6detail8SeqSoundFv + .4byte UpdateMoveValue__Q44nw4r3snd6detail10BasicSoundFv + .4byte UpdateParam__Q44nw4r3snd6detail10BasicSoundFv .global __vt__Q54nw4r3snd6detail8SeqSound11SeqLoadTask __vt__Q54nw4r3snd6detail8SeqSound11SeqLoadTask: .4byte 0 .4byte 0 - .byte4 __dt__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv - .byte4 Execute__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv - .byte4 Cancel__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv - .byte4 OnCancel__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv + .4byte __dt__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv + .4byte Execute__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv + .4byte Cancel__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv + .4byte OnCancel__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q44nw4r3snd6detail8SeqSound diff --git a/asm/libnw4r_snd/snd_SeqTrack.s b/asm/libnw4r_snd/snd_SeqTrack.s index c98a3ccd..ee99f6d9 100644 --- a/asm/libnw4r_snd/snd_SeqTrack.s +++ b/asm/libnw4r_snd/snd_SeqTrack.s @@ -1472,7 +1472,7 @@ $$29834: .4byte 0 .4byte 0 .4byte 0 - .byte4 ChannelCallbackFunc__Q44nw4r3snd6detail8SeqTrackFPQ44nw4r3snd6detail7ChannelQ54nw4r3snd6detail7Channel21ChannelCallbackStatusUl + .4byte ChannelCallbackFunc__Q44nw4r3snd6detail8SeqTrackFPQ44nw4r3snd6detail7ChannelQ54nw4r3snd6detail7Channel21ChannelCallbackStatusUl .4byte 0 .4byte 0 @@ -1481,7 +1481,7 @@ $$29834: __vt__Q44nw4r3snd6detail8SeqTrack: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd6detail8SeqTrackFv + .4byte __dt__Q44nw4r3snd6detail8SeqTrackFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_snd/snd_SoundActor.s b/asm/libnw4r_snd/snd_SoundActor.s index 29b767f6..e1c44c32 100644 --- a/asm/libnw4r_snd/snd_SoundActor.s +++ b/asm/libnw4r_snd/snd_SoundActor.s @@ -227,11 +227,11 @@ detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc: __vt__Q34nw4r3snd10SoundActor: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3snd10SoundActorFv - .byte4 detail_SetupSound__Q34nw4r3snd10SoundActorFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo - .byte4 detail_ConvertLabelStringToSoundId__Q34nw4r3snd10SoundActorFPCc - .byte4 SetupSound__Q34nw4r3snd10SoundActorFPQ34nw4r3snd11SoundHandleUlPCQ44nw4r3snd14SoundStartable9StartInfoPv - .byte4 detail_SetupSoundWithAmbientInfo__Q34nw4r3snd10SoundActorFPQ34nw4r3snd11SoundHandleUlPCQ44nw4r3snd14SoundStartable9StartInfoPQ54nw4r3snd6detail10BasicSound11AmbientInfoPv + .4byte __dt__Q34nw4r3snd10SoundActorFv + .4byte detail_SetupSound__Q34nw4r3snd10SoundActorFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo + .4byte detail_ConvertLabelStringToSoundId__Q34nw4r3snd10SoundActorFPCc + .4byte SetupSound__Q34nw4r3snd10SoundActorFPQ34nw4r3snd11SoundHandleUlPCQ44nw4r3snd14SoundStartable9StartInfoPv + .4byte detail_SetupSoundWithAmbientInfo__Q34nw4r3snd10SoundActorFPQ34nw4r3snd11SoundHandleUlPCQ44nw4r3snd14SoundStartable9StartInfoPQ54nw4r3snd6detail10BasicSound11AmbientInfoPv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_snd/snd_SoundArchive.s b/asm/libnw4r_snd/snd_SoundArchive.s index d1dc1f3d..bc09cb95 100644 --- a/asm/libnw4r_snd/snd_SoundArchive.s +++ b/asm/libnw4r_snd/snd_SoundArchive.s @@ -516,7 +516,7 @@ lbl_8010FCD8: __vt__Q34nw4r3snd12SoundArchive: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3snd12SoundArchiveFv + .4byte __dt__Q34nw4r3snd12SoundArchiveFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/libnw4r_snd/snd_SoundArchivePlayer.s b/asm/libnw4r_snd/snd_SoundArchivePlayer.s index 0aa715d5..703f7c64 100644 --- a/asm/libnw4r_snd/snd_SoundArchivePlayer.s +++ b/asm/libnw4r_snd/snd_SoundArchivePlayer.s @@ -2991,28 +2991,28 @@ $$212$$2__dt__Q34nw4r3snd18SoundArchivePlayerFv: __vt__Q34nw4r3snd18SoundArchivePlayer: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3snd18SoundArchivePlayerFv - .byte4 InvalidateData__Q34nw4r3snd18SoundArchivePlayerFPCvPCv - .byte4 InvalidateWaveData__Q34nw4r3snd18SoundArchivePlayerFPCvPCv + .4byte __dt__Q34nw4r3snd18SoundArchivePlayerFv + .4byte InvalidateData__Q34nw4r3snd18SoundArchivePlayerFPCvPCv + .4byte InvalidateWaveData__Q34nw4r3snd18SoundArchivePlayerFPCvPCv .4byte 0 .4byte 0 - .byte4 $$212$$2__dt__Q34nw4r3snd18SoundArchivePlayerFv - .byte4 $$212$$2detail_SetupSound__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo - .byte4 $$212$$2detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc - .byte4 detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc - .byte4 detail_SetupSound__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo + .4byte $$212$$2__dt__Q34nw4r3snd18SoundArchivePlayerFv + .4byte $$212$$2detail_SetupSound__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo + .4byte $$212$$2detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc + .4byte detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc + .4byte detail_SetupSound__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo .global __vt__Q44nw4r3snd18SoundArchivePlayer11WsdCallback __vt__Q44nw4r3snd18SoundArchivePlayer11WsdCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd18SoundArchivePlayer11WsdCallbackFv - .byte4 GetWaveSoundData__Q44nw4r3snd18SoundArchivePlayer11WsdCallbackCFPQ44nw4r3snd6detail13WaveSoundInfoPQ44nw4r3snd6detail17WaveSoundNoteInfoPQ44nw4r3snd6detail8WaveInfoPCviiUl + .4byte __dt__Q44nw4r3snd18SoundArchivePlayer11WsdCallbackFv + .4byte GetWaveSoundData__Q44nw4r3snd18SoundArchivePlayer11WsdCallbackCFPQ44nw4r3snd6detail13WaveSoundInfoPQ44nw4r3snd6detail17WaveSoundNoteInfoPQ44nw4r3snd6detail8WaveInfoPCviiUl .global __vt__Q44nw4r3snd18SoundArchivePlayer17SeqNoteOnCallback __vt__Q44nw4r3snd18SoundArchivePlayer17SeqNoteOnCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd18SoundArchivePlayer17SeqNoteOnCallbackFv - .byte4 NoteOn__Q44nw4r3snd18SoundArchivePlayer17SeqNoteOnCallbackFPQ44nw4r3snd6detail9SeqPlayeriRCQ44nw4r3snd6detail10NoteOnInfo + .4byte __dt__Q44nw4r3snd18SoundArchivePlayer17SeqNoteOnCallbackFv + .4byte NoteOn__Q44nw4r3snd18SoundArchivePlayer17SeqNoteOnCallbackFPQ44nw4r3snd6detail9SeqPlayeriRCQ44nw4r3snd6detail10NoteOnInfo .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$218172 diff --git a/asm/libnw4r_snd/snd_SoundHeap.s b/asm/libnw4r_snd/snd_SoundHeap.s index d0bf70c8..ca17d99e 100644 --- a/asm/libnw4r_snd/snd_SoundHeap.s +++ b/asm/libnw4r_snd/snd_SoundHeap.s @@ -137,5 +137,5 @@ DisposeCallbackFunc__Q34nw4r3snd9SoundHeapFPvUlPv: __vt__Q34nw4r3snd9SoundHeap: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3snd9SoundHeapFv - .byte4 Alloc__Q34nw4r3snd9SoundHeapFUl + .4byte __dt__Q34nw4r3snd9SoundHeapFv + .4byte Alloc__Q34nw4r3snd9SoundHeapFUl diff --git a/asm/libnw4r_snd/snd_SoundSystem.s b/asm/libnw4r_snd/snd_SoundSystem.s index 94a1123a..be314607 100644 --- a/asm/libnw4r_snd/snd_SoundSystem.s +++ b/asm/libnw4r_snd/snd_SoundSystem.s @@ -247,7 +247,7 @@ __sinit_$$3snd_SoundSystem_cpp: /* 80114CDC 00110B1C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3snd_SoundSystem_cpp + .4byte __sinit_$$3snd_SoundSystem_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$24759 @@ -258,7 +258,7 @@ $$24759: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global NW4R_SND_Version_ NW4R_SND_Version_: - .byte4 $$24759 + .4byte $$24759 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/libnw4r_snd/snd_StrmPlayer.s b/asm/libnw4r_snd/snd_StrmPlayer.s index bd7fb861..7dd528dc 100644 --- a/asm/libnw4r_snd/snd_StrmPlayer.s +++ b/asm/libnw4r_snd/snd_StrmPlayer.s @@ -3153,38 +3153,38 @@ $$2180$$2__dt__Q44nw4r3snd6detail10StrmPlayerFv: __vt__Q44nw4r3snd6detail10StrmPlayer: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd6detail10StrmPlayerFv - .byte4 Start__Q44nw4r3snd6detail10StrmPlayerFv - .byte4 Stop__Q44nw4r3snd6detail10StrmPlayerFv - .byte4 Pause__Q44nw4r3snd6detail10StrmPlayerFb - .byte4 IsActive__Q44nw4r3snd6detail10StrmPlayerCFv - .byte4 IsStarted__Q44nw4r3snd6detail10StrmPlayerCFv - .byte4 IsPause__Q44nw4r3snd6detail10StrmPlayerCFv + .4byte __dt__Q44nw4r3snd6detail10StrmPlayerFv + .4byte Start__Q44nw4r3snd6detail10StrmPlayerFv + .4byte Stop__Q44nw4r3snd6detail10StrmPlayerFv + .4byte Pause__Q44nw4r3snd6detail10StrmPlayerFb + .4byte IsActive__Q44nw4r3snd6detail10StrmPlayerCFv + .4byte IsStarted__Q44nw4r3snd6detail10StrmPlayerCFv + .4byte IsPause__Q44nw4r3snd6detail10StrmPlayerCFv .4byte 0 .4byte 0 - .byte4 $$2180$$2__dt__Q44nw4r3snd6detail10StrmPlayerFv - .byte4 $$2180$$2OnUpdateFrameSoundThread__Q44nw4r3snd6detail10StrmPlayerFv - .byte4 $$2180$$2OnUpdateVoiceSoundThread__Q44nw4r3snd6detail10StrmPlayerFv - .byte4 $$2180$$2OnShutdownSoundThread__Q44nw4r3snd6detail10StrmPlayerFv - .byte4 OnUpdateFrameSoundThread__Q44nw4r3snd6detail10StrmPlayerFv - .byte4 OnUpdateVoiceSoundThread__Q44nw4r3snd6detail10StrmPlayerFv - .byte4 OnShutdownSoundThread__Q44nw4r3snd6detail10StrmPlayerFv + .4byte $$2180$$2__dt__Q44nw4r3snd6detail10StrmPlayerFv + .4byte $$2180$$2OnUpdateFrameSoundThread__Q44nw4r3snd6detail10StrmPlayerFv + .4byte $$2180$$2OnUpdateVoiceSoundThread__Q44nw4r3snd6detail10StrmPlayerFv + .4byte $$2180$$2OnShutdownSoundThread__Q44nw4r3snd6detail10StrmPlayerFv + .4byte OnUpdateFrameSoundThread__Q44nw4r3snd6detail10StrmPlayerFv + .4byte OnUpdateVoiceSoundThread__Q44nw4r3snd6detail10StrmPlayerFv + .4byte OnShutdownSoundThread__Q44nw4r3snd6detail10StrmPlayerFv .global __vt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTask __vt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTask: .4byte 0 .4byte 0 - .byte4 __dt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv - .byte4 Execute__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv - .byte4 Cancel__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv - .byte4 OnCancel__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv + .4byte __dt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv + .4byte Execute__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv + .4byte Cancel__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv + .4byte OnCancel__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv .global __vt__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTask __vt__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTask: .4byte 0 .4byte 0 - .byte4 __dt__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv - .byte4 Execute__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv - .byte4 Cancel__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv - .byte4 OnCancel__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv + .4byte __dt__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv + .4byte Execute__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv + .4byte Cancel__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv + .4byte OnCancel__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211788 diff --git a/asm/libnw4r_snd/snd_StrmSound.s b/asm/libnw4r_snd/snd_StrmSound.s index 32d27763..8b6a0531 100644 --- a/asm/libnw4r_snd/snd_StrmSound.s +++ b/asm/libnw4r_snd/snd_StrmSound.s @@ -503,25 +503,25 @@ __sinit_$$3snd_StrmSound_cpp: /* 8011911C 00114F5C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3snd_StrmSound_cpp + .4byte __sinit_$$3snd_StrmSound_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail9StrmSound __vt__Q44nw4r3snd6detail9StrmSound: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q44nw4r3snd6detail9StrmSoundCFv - .byte4 __dt__Q44nw4r3snd6detail9StrmSoundFv - .byte4 Shutdown__Q44nw4r3snd6detail9StrmSoundFv - .byte4 IsPrepared__Q44nw4r3snd6detail9StrmSoundCFv - .byte4 IsAttachedTempSpecialHandle__Q44nw4r3snd6detail9StrmSoundFv - .byte4 DetachTempSpecialHandle__Q44nw4r3snd6detail9StrmSoundFv - .byte4 InitParam__Q44nw4r3snd6detail9StrmSoundFv - .byte4 GetBasicPlayer__Q44nw4r3snd6detail9StrmSoundFv - .byte4 GetBasicPlayer__Q44nw4r3snd6detail9StrmSoundCFv - .byte4 OnUpdatePlayerPriority__Q44nw4r3snd6detail9StrmSoundFv - .byte4 UpdateMoveValue__Q44nw4r3snd6detail9StrmSoundFv - .byte4 UpdateParam__Q44nw4r3snd6detail9StrmSoundFv + .4byte GetRuntimeTypeInfo__Q44nw4r3snd6detail9StrmSoundCFv + .4byte __dt__Q44nw4r3snd6detail9StrmSoundFv + .4byte Shutdown__Q44nw4r3snd6detail9StrmSoundFv + .4byte IsPrepared__Q44nw4r3snd6detail9StrmSoundCFv + .4byte IsAttachedTempSpecialHandle__Q44nw4r3snd6detail9StrmSoundFv + .4byte DetachTempSpecialHandle__Q44nw4r3snd6detail9StrmSoundFv + .4byte InitParam__Q44nw4r3snd6detail9StrmSoundFv + .4byte GetBasicPlayer__Q44nw4r3snd6detail9StrmSoundFv + .4byte GetBasicPlayer__Q44nw4r3snd6detail9StrmSoundCFv + .4byte OnUpdatePlayerPriority__Q44nw4r3snd6detail9StrmSoundFv + .4byte UpdateMoveValue__Q44nw4r3snd6detail9StrmSoundFv + .4byte UpdateParam__Q44nw4r3snd6detail9StrmSoundFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210414 diff --git a/asm/libnw4r_snd/snd_Util.s b/asm/libnw4r_snd/snd_Util.s index e7e7414d..e9653545 100644 --- a/asm/libnw4r_snd/snd_Util.s +++ b/asm/libnw4r_snd/snd_Util.s @@ -2742,9 +2742,9 @@ CalcLpfFreqTable__Q44nw4r3snd6detail4Util: .section .data, "wa" # 0x80421040 - 0x80496700 .global PanTableTable__Q44nw4r3snd6detail4Util PanTableTable__Q44nw4r3snd6detail4Util: - .byte4 Pan2RatioTableSqrt__Q44nw4r3snd6detail4Util - .byte4 Pan2RatioTableSinCos__Q44nw4r3snd6detail4Util - .byte4 Pan2RatioTableLinear__Q44nw4r3snd6detail4Util + .4byte Pan2RatioTableSqrt__Q44nw4r3snd6detail4Util + .4byte Pan2RatioTableSinCos__Q44nw4r3snd6detail4Util + .4byte Pan2RatioTableLinear__Q44nw4r3snd6detail4Util .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/libnw4r_snd/snd_Voice.s b/asm/libnw4r_snd/snd_Voice.s index 1ea71c8f..889cc4e4 100644 --- a/asm/libnw4r_snd/snd_Voice.s +++ b/asm/libnw4r_snd/snd_Voice.s @@ -3105,9 +3105,9 @@ $$211607: __vt__Q44nw4r3snd6detail5Voice: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd6detail5VoiceFv - .byte4 InvalidateData__Q44nw4r3snd6detail5VoiceFPCvPCv - .byte4 InvalidateWaveData__Q44nw4r3snd6detail5VoiceFPCvPCv + .4byte __dt__Q44nw4r3snd6detail5VoiceFv + .4byte InvalidateData__Q44nw4r3snd6detail5VoiceFPCvPCv + .4byte InvalidateWaveData__Q44nw4r3snd6detail5VoiceFPCvPCv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210576 diff --git a/asm/libnw4r_snd/snd_WavePlayer.s b/asm/libnw4r_snd/snd_WavePlayer.s index 6f118fa2..9527e614 100644 --- a/asm/libnw4r_snd/snd_WavePlayer.s +++ b/asm/libnw4r_snd/snd_WavePlayer.s @@ -1077,15 +1077,15 @@ __dt__Q44nw4r3snd10WavePlayer10WavePacketFv: __vt__Q34nw4r3snd10WavePlayer: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r3snd10WavePlayerFv - .byte4 OnUpdateFrameSoundThread__Q34nw4r3snd10WavePlayerFv - .byte4 OnUpdateVoiceSoundThread__Q34nw4r3snd10WavePlayerFv - .byte4 OnShutdownSoundThread__Q34nw4r3snd10WavePlayerFv + .4byte __dt__Q34nw4r3snd10WavePlayerFv + .4byte OnUpdateFrameSoundThread__Q34nw4r3snd10WavePlayerFv + .4byte OnUpdateVoiceSoundThread__Q34nw4r3snd10WavePlayerFv + .4byte OnShutdownSoundThread__Q34nw4r3snd10WavePlayerFv .global __vt__Q44nw4r3snd10WavePlayer10WavePacket __vt__Q44nw4r3snd10WavePlayer10WavePacket: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd10WavePlayer10WavePacketFv + .4byte __dt__Q44nw4r3snd10WavePlayer10WavePacketFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_snd/snd_WaveSound.s b/asm/libnw4r_snd/snd_WaveSound.s index 591ac542..5f04f6d0 100644 --- a/asm/libnw4r_snd/snd_WaveSound.s +++ b/asm/libnw4r_snd/snd_WaveSound.s @@ -274,25 +274,25 @@ __sinit_$$3snd_WaveSound_cpp: /* 8011E70C 0011A54C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3snd_WaveSound_cpp + .4byte __sinit_$$3snd_WaveSound_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail9WaveSound __vt__Q44nw4r3snd6detail9WaveSound: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q44nw4r3snd6detail9WaveSoundCFv - .byte4 __dt__Q44nw4r3snd6detail9WaveSoundFv - .byte4 Shutdown__Q44nw4r3snd6detail9WaveSoundFv - .byte4 IsPrepared__Q44nw4r3snd6detail9WaveSoundCFv - .byte4 IsAttachedTempSpecialHandle__Q44nw4r3snd6detail9WaveSoundFv - .byte4 DetachTempSpecialHandle__Q44nw4r3snd6detail9WaveSoundFv - .byte4 InitParam__Q44nw4r3snd6detail10BasicSoundFv - .byte4 GetBasicPlayer__Q44nw4r3snd6detail9WaveSoundFv - .byte4 GetBasicPlayer__Q44nw4r3snd6detail9WaveSoundCFv - .byte4 OnUpdatePlayerPriority__Q44nw4r3snd6detail9WaveSoundFv - .byte4 UpdateMoveValue__Q44nw4r3snd6detail10BasicSoundFv - .byte4 UpdateParam__Q44nw4r3snd6detail10BasicSoundFv + .4byte GetRuntimeTypeInfo__Q44nw4r3snd6detail9WaveSoundCFv + .4byte __dt__Q44nw4r3snd6detail9WaveSoundFv + .4byte Shutdown__Q44nw4r3snd6detail9WaveSoundFv + .4byte IsPrepared__Q44nw4r3snd6detail9WaveSoundCFv + .4byte IsAttachedTempSpecialHandle__Q44nw4r3snd6detail9WaveSoundFv + .4byte DetachTempSpecialHandle__Q44nw4r3snd6detail9WaveSoundFv + .4byte InitParam__Q44nw4r3snd6detail10BasicSoundFv + .4byte GetBasicPlayer__Q44nw4r3snd6detail9WaveSoundFv + .4byte GetBasicPlayer__Q44nw4r3snd6detail9WaveSoundCFv + .4byte OnUpdatePlayerPriority__Q44nw4r3snd6detail9WaveSoundFv + .4byte UpdateMoveValue__Q44nw4r3snd6detail10BasicSoundFv + .4byte UpdateParam__Q44nw4r3snd6detail10BasicSoundFv .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q44nw4r3snd6detail9WaveSound diff --git a/asm/libnw4r_snd/snd_WsdPlayer.s b/asm/libnw4r_snd/snd_WsdPlayer.s index 45139260..7cb15bd8 100644 --- a/asm/libnw4r_snd/snd_WsdPlayer.s +++ b/asm/libnw4r_snd/snd_WsdPlayer.s @@ -1176,28 +1176,28 @@ $$2192$$2__dt__Q44nw4r3snd6detail9WsdPlayerFv: __vt__Q44nw4r3snd6detail9WsdPlayer: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r3snd6detail9WsdPlayerFv - .byte4 Start__Q44nw4r3snd6detail9WsdPlayerFv - .byte4 Stop__Q44nw4r3snd6detail9WsdPlayerFv - .byte4 Pause__Q44nw4r3snd6detail9WsdPlayerFb - .byte4 IsActive__Q44nw4r3snd6detail9WsdPlayerCFv - .byte4 IsStarted__Q44nw4r3snd6detail9WsdPlayerCFv - .byte4 IsPause__Q44nw4r3snd6detail9WsdPlayerCFv + .4byte __dt__Q44nw4r3snd6detail9WsdPlayerFv + .4byte Start__Q44nw4r3snd6detail9WsdPlayerFv + .4byte Stop__Q44nw4r3snd6detail9WsdPlayerFv + .4byte Pause__Q44nw4r3snd6detail9WsdPlayerFb + .4byte IsActive__Q44nw4r3snd6detail9WsdPlayerCFv + .4byte IsStarted__Q44nw4r3snd6detail9WsdPlayerCFv + .4byte IsPause__Q44nw4r3snd6detail9WsdPlayerCFv .4byte 0 .4byte 0 - .byte4 $$2180$$2__dt__Q44nw4r3snd6detail9WsdPlayerFv - .byte4 $$2180$$2InvalidateData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv - .byte4 $$2180$$2InvalidateWaveData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv + .4byte $$2180$$2__dt__Q44nw4r3snd6detail9WsdPlayerFv + .4byte $$2180$$2InvalidateData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv + .4byte $$2180$$2InvalidateWaveData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv .4byte 0 .4byte 0 - .byte4 $$2192$$2__dt__Q44nw4r3snd6detail9WsdPlayerFv - .byte4 $$2192$$2OnUpdateFrameSoundThread__Q44nw4r3snd6detail9WsdPlayerFv - .byte4 OnUpdateVoiceSoundThread__Q54nw4r3snd6detail11SoundThread14PlayerCallbackFv - .byte4 $$2192$$2OnShutdownSoundThread__Q44nw4r3snd6detail9WsdPlayerFv - .byte4 InvalidateData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv - .byte4 InvalidateWaveData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv - .byte4 OnUpdateFrameSoundThread__Q44nw4r3snd6detail9WsdPlayerFv - .byte4 OnShutdownSoundThread__Q44nw4r3snd6detail9WsdPlayerFv + .4byte $$2192$$2__dt__Q44nw4r3snd6detail9WsdPlayerFv + .4byte $$2192$$2OnUpdateFrameSoundThread__Q44nw4r3snd6detail9WsdPlayerFv + .4byte OnUpdateVoiceSoundThread__Q54nw4r3snd6detail11SoundThread14PlayerCallbackFv + .4byte $$2192$$2OnShutdownSoundThread__Q44nw4r3snd6detail9WsdPlayerFv + .4byte InvalidateData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv + .4byte InvalidateWaveData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv + .4byte OnUpdateFrameSoundThread__Q44nw4r3snd6detail9WsdPlayerFv + .4byte OnShutdownSoundThread__Q44nw4r3snd6detail9WsdPlayerFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210015 diff --git a/asm/libnw4r_ut/ut_DvdFileStream.s b/asm/libnw4r_ut/ut_DvdFileStream.s index 4a8db164..896429b2 100644 --- a/asm/libnw4r_ut/ut_DvdFileStream.s +++ b/asm/libnw4r_ut/ut_DvdFileStream.s @@ -540,36 +540,36 @@ __sinit_$$3ut_DvdFileStream_cpp: /* 80120E9C 0011CCDC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ut_DvdFileStream_cpp + .4byte __sinit_$$3ut_DvdFileStream_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ut13DvdFileStream __vt__Q34nw4r2ut13DvdFileStream: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q34nw4r2ut13DvdFileStreamCFv - .byte4 __dt__Q34nw4r2ut13DvdFileStreamFv - .byte4 Close__Q34nw4r2ut13DvdFileStreamFv - .byte4 Read__Q34nw4r2ut13DvdFileStreamFPvUl - .byte4 ReadAsync__Q34nw4r2ut13DvdFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv - .byte4 Write__Q34nw4r2ut8IOStreamFPCvUl - .byte4 WriteAsync__Q34nw4r2ut8IOStreamFPCvUlPFlPQ34nw4r2ut8IOStreamPv_vPv - .byte4 IsBusy__Q34nw4r2ut13DvdFileStreamCFv - .byte4 CanAsync__Q34nw4r2ut13DvdFileStreamCFv - .byte4 CanRead__Q34nw4r2ut13DvdFileStreamCFv - .byte4 CanWrite__Q34nw4r2ut13DvdFileStreamCFv - .byte4 GetOffsetAlign__Q34nw4r2ut13DvdFileStreamCFv - .byte4 GetSizeAlign__Q34nw4r2ut13DvdFileStreamCFv - .byte4 GetBufferAlign__Q34nw4r2ut13DvdFileStreamCFv - .byte4 GetSize__Q34nw4r2ut13DvdFileStreamCFv - .byte4 Seek__Q34nw4r2ut13DvdFileStreamFlUl - .byte4 Cancel__Q34nw4r2ut13DvdFileStreamFv - .byte4 CancelAsync__Q34nw4r2ut13DvdFileStreamFPFlPQ34nw4r2ut8IOStreamPv_vPv - .byte4 CanSeek__Q34nw4r2ut13DvdFileStreamCFv - .byte4 CanCancel__Q34nw4r2ut13DvdFileStreamCFv - .byte4 Tell__Q34nw4r2ut13DvdFileStreamCFv - .byte4 Peek__Q34nw4r2ut13DvdFileStreamFPvUl - .byte4 PeekAsync__Q34nw4r2ut13DvdFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte GetRuntimeTypeInfo__Q34nw4r2ut13DvdFileStreamCFv + .4byte __dt__Q34nw4r2ut13DvdFileStreamFv + .4byte Close__Q34nw4r2ut13DvdFileStreamFv + .4byte Read__Q34nw4r2ut13DvdFileStreamFPvUl + .4byte ReadAsync__Q34nw4r2ut13DvdFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte Write__Q34nw4r2ut8IOStreamFPCvUl + .4byte WriteAsync__Q34nw4r2ut8IOStreamFPCvUlPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte IsBusy__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanAsync__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanRead__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanWrite__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetOffsetAlign__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetSizeAlign__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetBufferAlign__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetSize__Q34nw4r2ut13DvdFileStreamCFv + .4byte Seek__Q34nw4r2ut13DvdFileStreamFlUl + .4byte Cancel__Q34nw4r2ut13DvdFileStreamFv + .4byte CancelAsync__Q34nw4r2ut13DvdFileStreamFPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte CanSeek__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanCancel__Q34nw4r2ut13DvdFileStreamCFv + .4byte Tell__Q34nw4r2ut13DvdFileStreamCFv + .4byte Peek__Q34nw4r2ut13DvdFileStreamFPvUl + .4byte PeekAsync__Q34nw4r2ut13DvdFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/libnw4r_ut/ut_DvdLockedFileStream.s b/asm/libnw4r_ut/ut_DvdLockedFileStream.s index af8f6a93..729fd5d3 100644 --- a/asm/libnw4r_ut/ut_DvdLockedFileStream.s +++ b/asm/libnw4r_ut/ut_DvdLockedFileStream.s @@ -291,36 +291,36 @@ __sinit_$$3ut_DvdLockedFileStream_cpp: /* 8012128C 0011D0CC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ut_DvdLockedFileStream_cpp + .4byte __sinit_$$3ut_DvdLockedFileStream_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ut19DvdLockedFileStream __vt__Q34nw4r2ut19DvdLockedFileStream: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q34nw4r2ut19DvdLockedFileStreamCFv - .byte4 __dt__Q34nw4r2ut19DvdLockedFileStreamFv - .byte4 Close__Q34nw4r2ut19DvdLockedFileStreamFv - .byte4 Read__Q34nw4r2ut19DvdLockedFileStreamFPvUl - .byte4 ReadAsync__Q34nw4r2ut19DvdLockedFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv - .byte4 Write__Q34nw4r2ut8IOStreamFPCvUl - .byte4 WriteAsync__Q34nw4r2ut8IOStreamFPCvUlPFlPQ34nw4r2ut8IOStreamPv_vPv - .byte4 IsBusy__Q34nw4r2ut13DvdFileStreamCFv - .byte4 CanAsync__Q34nw4r2ut19DvdLockedFileStreamCFv - .byte4 CanRead__Q34nw4r2ut13DvdFileStreamCFv - .byte4 CanWrite__Q34nw4r2ut13DvdFileStreamCFv - .byte4 GetOffsetAlign__Q34nw4r2ut13DvdFileStreamCFv - .byte4 GetSizeAlign__Q34nw4r2ut13DvdFileStreamCFv - .byte4 GetBufferAlign__Q34nw4r2ut13DvdFileStreamCFv - .byte4 GetSize__Q34nw4r2ut13DvdFileStreamCFv - .byte4 Seek__Q34nw4r2ut13DvdFileStreamFlUl - .byte4 Cancel__Q34nw4r2ut19DvdLockedFileStreamFv - .byte4 CancelAsync__Q34nw4r2ut13DvdFileStreamFPFlPQ34nw4r2ut8IOStreamPv_vPv - .byte4 CanSeek__Q34nw4r2ut13DvdFileStreamCFv - .byte4 CanCancel__Q34nw4r2ut13DvdFileStreamCFv - .byte4 Tell__Q34nw4r2ut13DvdFileStreamCFv - .byte4 Peek__Q34nw4r2ut19DvdLockedFileStreamFPvUl - .byte4 PeekAsync__Q34nw4r2ut19DvdLockedFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte GetRuntimeTypeInfo__Q34nw4r2ut19DvdLockedFileStreamCFv + .4byte __dt__Q34nw4r2ut19DvdLockedFileStreamFv + .4byte Close__Q34nw4r2ut19DvdLockedFileStreamFv + .4byte Read__Q34nw4r2ut19DvdLockedFileStreamFPvUl + .4byte ReadAsync__Q34nw4r2ut19DvdLockedFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte Write__Q34nw4r2ut8IOStreamFPCvUl + .4byte WriteAsync__Q34nw4r2ut8IOStreamFPCvUlPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte IsBusy__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanAsync__Q34nw4r2ut19DvdLockedFileStreamCFv + .4byte CanRead__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanWrite__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetOffsetAlign__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetSizeAlign__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetBufferAlign__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetSize__Q34nw4r2ut13DvdFileStreamCFv + .4byte Seek__Q34nw4r2ut13DvdFileStreamFlUl + .4byte Cancel__Q34nw4r2ut19DvdLockedFileStreamFv + .4byte CancelAsync__Q34nw4r2ut13DvdFileStreamFPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte CanSeek__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanCancel__Q34nw4r2ut13DvdFileStreamCFv + .4byte Tell__Q34nw4r2ut13DvdFileStreamCFv + .4byte Peek__Q34nw4r2ut19DvdLockedFileStreamFPvUl + .4byte PeekAsync__Q34nw4r2ut19DvdLockedFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/libnw4r_ut/ut_FileStream.s b/asm/libnw4r_ut/ut_FileStream.s index 1ccffca8..564beac6 100644 --- a/asm/libnw4r_ut/ut_FileStream.s +++ b/asm/libnw4r_ut/ut_FileStream.s @@ -89,7 +89,7 @@ __sinit_$$3ut_FileStream_cpp: /* 8012076C 0011C5AC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ut_FileStream_cpp + .4byte __sinit_$$3ut_FileStream_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q34nw4r2ut10FileStream diff --git a/asm/libnw4r_ut/ut_Font.s b/asm/libnw4r_ut/ut_Font.s index 7a405281..a6cce06e 100644 --- a/asm/libnw4r_ut/ut_Font.s +++ b/asm/libnw4r_ut/ut_Font.s @@ -57,19 +57,19 @@ lbl_801214F4: $$2560: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ReadNextCharUTF8__Q34nw4r2ut14CharStrmReaderFv + .4byte ReadNextCharUTF8__Q34nw4r2ut14CharStrmReaderFv .global $$2561 $$2561: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ReadNextCharUTF16__Q34nw4r2ut14CharStrmReaderFv + .4byte ReadNextCharUTF16__Q34nw4r2ut14CharStrmReaderFv .global $$2562 $$2562: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ReadNextCharSJIS__Q34nw4r2ut14CharStrmReaderFv + .4byte ReadNextCharSJIS__Q34nw4r2ut14CharStrmReaderFv .global $$2563 $$2563: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ReadNextCharCP1252__Q34nw4r2ut14CharStrmReaderFv + .4byte ReadNextCharCP1252__Q34nw4r2ut14CharStrmReaderFv diff --git a/asm/libnw4r_ut/ut_IOStream.s b/asm/libnw4r_ut/ut_IOStream.s index 66794e5d..b4b5011b 100644 --- a/asm/libnw4r_ut/ut_IOStream.s +++ b/asm/libnw4r_ut/ut_IOStream.s @@ -23,7 +23,7 @@ __sinit_$$3ut_IOStream_cpp: /* 8012065C 0011C49C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ut_IOStream_cpp + .4byte __sinit_$$3ut_IOStream_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q34nw4r2ut8IOStream diff --git a/asm/libnw4r_ut/ut_LockedCache.s b/asm/libnw4r_ut/ut_LockedCache.s index eae92cea..7bf1d084 100644 --- a/asm/libnw4r_ut/ut_LockedCache.s +++ b/asm/libnw4r_ut/ut_LockedCache.s @@ -156,7 +156,7 @@ __sinit_$$3ut_LockedCache_cpp: /* 8012146C 0011D2AC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ut_LockedCache_cpp + .4byte __sinit_$$3ut_LockedCache_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global sLCImpl__Q34nw4r2ut28$$2unnamed$$2ut_LockedCache_cpp$$2 diff --git a/asm/libnw4r_ut/ut_ResFont.s b/asm/libnw4r_ut/ut_ResFont.s index 8682c09b..f9710c01 100644 --- a/asm/libnw4r_ut/ut_ResFont.s +++ b/asm/libnw4r_ut/ut_ResFont.s @@ -236,25 +236,25 @@ lbl_801225EC: __vt__Q34nw4r2ut7ResFont: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r2ut7ResFontFv - .byte4 GetWidth__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetHeight__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetAscent__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetDescent__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetBaselinePos__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetCellHeight__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetCellWidth__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetMaxCharWidth__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetType__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetTextureFormat__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetLineFeed__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetDefaultCharWidths__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 SetDefaultCharWidths__Q44nw4r2ut6detail11ResFontBaseFRCQ34nw4r2ut10CharWidths - .byte4 SetAlternateChar__Q44nw4r2ut6detail11ResFontBaseFUs - .byte4 SetLineFeed__Q44nw4r2ut6detail11ResFontBaseFi - .byte4 GetCharWidth__Q44nw4r2ut6detail11ResFontBaseCFUs - .byte4 GetCharWidths__Q44nw4r2ut6detail11ResFontBaseCFUs - .byte4 GetGlyph__Q44nw4r2ut6detail11ResFontBaseCFPQ34nw4r2ut5GlyphUs - .byte4 HasGlyph__Q44nw4r2ut6detail11ResFontBaseCFUs - .byte4 GetEncoding__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte __dt__Q34nw4r2ut7ResFontFv + .4byte GetWidth__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetHeight__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetAscent__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetDescent__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetBaselinePos__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetCellHeight__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetCellWidth__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetMaxCharWidth__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetType__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetTextureFormat__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetLineFeed__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetDefaultCharWidths__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte SetDefaultCharWidths__Q44nw4r2ut6detail11ResFontBaseFRCQ34nw4r2ut10CharWidths + .4byte SetAlternateChar__Q44nw4r2ut6detail11ResFontBaseFUs + .4byte SetLineFeed__Q44nw4r2ut6detail11ResFontBaseFi + .4byte GetCharWidth__Q44nw4r2ut6detail11ResFontBaseCFUs + .4byte GetCharWidths__Q44nw4r2ut6detail11ResFontBaseCFUs + .4byte GetGlyph__Q44nw4r2ut6detail11ResFontBaseCFPQ34nw4r2ut5GlyphUs + .4byte HasGlyph__Q44nw4r2ut6detail11ResFontBaseCFUs + .4byte GetEncoding__Q44nw4r2ut6detail11ResFontBaseCFv .4byte 0 diff --git a/asm/libnw4r_ut/ut_ResFontBase.s b/asm/libnw4r_ut/ut_ResFontBase.s index cc3b6c0a..dd59d4d6 100644 --- a/asm/libnw4r_ut/ut_ResFontBase.s +++ b/asm/libnw4r_ut/ut_ResFontBase.s @@ -601,29 +601,29 @@ lbl_801222A0: $$21039: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ReadNextCharCP1252__Q34nw4r2ut14CharStrmReaderFv + .4byte ReadNextCharCP1252__Q34nw4r2ut14CharStrmReaderFv .global __vt__Q44nw4r2ut6detail11ResFontBase __vt__Q44nw4r2ut6detail11ResFontBase: .4byte 0 .4byte 0 - .byte4 __dt__Q44nw4r2ut6detail11ResFontBaseFv - .byte4 GetWidth__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetHeight__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetAscent__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetDescent__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetBaselinePos__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetCellHeight__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetCellWidth__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetMaxCharWidth__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetType__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetTextureFormat__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetLineFeed__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 GetDefaultCharWidths__Q44nw4r2ut6detail11ResFontBaseCFv - .byte4 SetDefaultCharWidths__Q44nw4r2ut6detail11ResFontBaseFRCQ34nw4r2ut10CharWidths - .byte4 SetAlternateChar__Q44nw4r2ut6detail11ResFontBaseFUs - .byte4 SetLineFeed__Q44nw4r2ut6detail11ResFontBaseFi - .byte4 GetCharWidth__Q44nw4r2ut6detail11ResFontBaseCFUs - .byte4 GetCharWidths__Q44nw4r2ut6detail11ResFontBaseCFUs - .byte4 GetGlyph__Q44nw4r2ut6detail11ResFontBaseCFPQ34nw4r2ut5GlyphUs - .byte4 HasGlyph__Q44nw4r2ut6detail11ResFontBaseCFUs - .byte4 GetEncoding__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte __dt__Q44nw4r2ut6detail11ResFontBaseFv + .4byte GetWidth__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetHeight__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetAscent__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetDescent__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetBaselinePos__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetCellHeight__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetCellWidth__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetMaxCharWidth__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetType__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetTextureFormat__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetLineFeed__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetDefaultCharWidths__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte SetDefaultCharWidths__Q44nw4r2ut6detail11ResFontBaseFRCQ34nw4r2ut10CharWidths + .4byte SetAlternateChar__Q44nw4r2ut6detail11ResFontBaseFUs + .4byte SetLineFeed__Q44nw4r2ut6detail11ResFontBaseFi + .4byte GetCharWidth__Q44nw4r2ut6detail11ResFontBaseCFUs + .4byte GetCharWidths__Q44nw4r2ut6detail11ResFontBaseCFUs + .4byte GetGlyph__Q44nw4r2ut6detail11ResFontBaseCFPQ34nw4r2ut5GlyphUs + .4byte HasGlyph__Q44nw4r2ut6detail11ResFontBaseCFUs + .4byte GetEncoding__Q44nw4r2ut6detail11ResFontBaseCFv diff --git a/asm/libnw4r_ut/ut_RomFont.s b/asm/libnw4r_ut/ut_RomFont.s index 94959756..4d065ec8 100644 --- a/asm/libnw4r_ut/ut_RomFont.s +++ b/asm/libnw4r_ut/ut_RomFont.s @@ -523,37 +523,37 @@ lbl_80121B88: $$2943: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ReadNextCharCP1252__Q34nw4r2ut14CharStrmReaderFv + .4byte ReadNextCharCP1252__Q34nw4r2ut14CharStrmReaderFv .global __vt__Q34nw4r2ut7RomFont __vt__Q34nw4r2ut7RomFont: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r2ut7RomFontFv - .byte4 GetWidth__Q34nw4r2ut7RomFontCFv - .byte4 GetHeight__Q34nw4r2ut7RomFontCFv - .byte4 GetAscent__Q34nw4r2ut7RomFontCFv - .byte4 GetDescent__Q34nw4r2ut7RomFontCFv - .byte4 GetBaselinePos__Q34nw4r2ut7RomFontCFv - .byte4 GetCellHeight__Q34nw4r2ut7RomFontCFv - .byte4 GetCellWidth__Q34nw4r2ut7RomFontCFv - .byte4 GetMaxCharWidth__Q34nw4r2ut7RomFontCFv - .byte4 GetType__Q34nw4r2ut7RomFontCFv - .byte4 GetTextureFormat__Q34nw4r2ut7RomFontCFv - .byte4 GetLineFeed__Q34nw4r2ut7RomFontCFv - .byte4 GetDefaultCharWidths__Q34nw4r2ut7RomFontCFv - .byte4 SetDefaultCharWidths__Q34nw4r2ut7RomFontFRCQ34nw4r2ut10CharWidths - .byte4 SetAlternateChar__Q34nw4r2ut7RomFontFUs - .byte4 SetLineFeed__Q34nw4r2ut7RomFontFi - .byte4 GetCharWidth__Q34nw4r2ut7RomFontCFUs - .byte4 GetCharWidths__Q34nw4r2ut7RomFontCFUs - .byte4 GetGlyph__Q34nw4r2ut7RomFontCFPQ34nw4r2ut5GlyphUs - .byte4 HasGlyph__Q34nw4r2ut7RomFontCFUs - .byte4 GetEncoding__Q34nw4r2ut7RomFontCFv + .4byte __dt__Q34nw4r2ut7RomFontFv + .4byte GetWidth__Q34nw4r2ut7RomFontCFv + .4byte GetHeight__Q34nw4r2ut7RomFontCFv + .4byte GetAscent__Q34nw4r2ut7RomFontCFv + .4byte GetDescent__Q34nw4r2ut7RomFontCFv + .4byte GetBaselinePos__Q34nw4r2ut7RomFontCFv + .4byte GetCellHeight__Q34nw4r2ut7RomFontCFv + .4byte GetCellWidth__Q34nw4r2ut7RomFontCFv + .4byte GetMaxCharWidth__Q34nw4r2ut7RomFontCFv + .4byte GetType__Q34nw4r2ut7RomFontCFv + .4byte GetTextureFormat__Q34nw4r2ut7RomFontCFv + .4byte GetLineFeed__Q34nw4r2ut7RomFontCFv + .4byte GetDefaultCharWidths__Q34nw4r2ut7RomFontCFv + .4byte SetDefaultCharWidths__Q34nw4r2ut7RomFontFRCQ34nw4r2ut10CharWidths + .4byte SetAlternateChar__Q34nw4r2ut7RomFontFUs + .4byte SetLineFeed__Q34nw4r2ut7RomFontFi + .4byte GetCharWidth__Q34nw4r2ut7RomFontCFUs + .4byte GetCharWidths__Q34nw4r2ut7RomFontCFUs + .4byte GetGlyph__Q34nw4r2ut7RomFontCFPQ34nw4r2ut5GlyphUs + .4byte HasGlyph__Q34nw4r2ut7RomFontCFUs + .4byte GetEncoding__Q34nw4r2ut7RomFontCFv .global __vt__Q34nw4r2ut4Font __vt__Q34nw4r2ut4Font: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r2ut4FontFv + .4byte __dt__Q34nw4r2ut4FontFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/libnw4r_ut/ut_TagProcessorBase.s b/asm/libnw4r_ut/ut_TagProcessorBase.s index 9096764b..3fb80c7d 100644 --- a/asm/libnw4r_ut/ut_TagProcessorBase.s +++ b/asm/libnw4r_ut/ut_TagProcessorBase.s @@ -474,16 +474,16 @@ lbl_801205FC: __vt__Q34nw4r2ut19TagProcessorBase$$0w$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r2ut19TagProcessorBase$$0w$$1Fv - .byte4 Process__Q34nw4r2ut19TagProcessorBase$$0w$$1FUsPQ34nw4r2ut15PrintContext$$0w$$1 - .byte4 CalcRect__Q34nw4r2ut19TagProcessorBase$$0w$$1FPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext$$0w$$1 + .4byte __dt__Q34nw4r2ut19TagProcessorBase$$0w$$1Fv + .4byte Process__Q34nw4r2ut19TagProcessorBase$$0w$$1FUsPQ34nw4r2ut15PrintContext$$0w$$1 + .4byte CalcRect__Q34nw4r2ut19TagProcessorBase$$0w$$1FPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext$$0w$$1 .global __vt__Q34nw4r2ut19TagProcessorBase$$0c$$1 __vt__Q34nw4r2ut19TagProcessorBase$$0c$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r2ut19TagProcessorBase$$0c$$1Fv - .byte4 Process__Q34nw4r2ut19TagProcessorBase$$0c$$1FUsPQ34nw4r2ut15PrintContext$$0c$$1 - .byte4 CalcRect__Q34nw4r2ut19TagProcessorBase$$0c$$1FPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext$$0c$$1 + .4byte __dt__Q34nw4r2ut19TagProcessorBase$$0c$$1Fv + .4byte Process__Q34nw4r2ut19TagProcessorBase$$0c$$1FUsPQ34nw4r2ut15PrintContext$$0c$$1 + .4byte CalcRect__Q34nw4r2ut19TagProcessorBase$$0c$$1FPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext$$0c$$1 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$24919 diff --git a/asm/libnw4r_ut/ut_TextWriterBase.s b/asm/libnw4r_ut/ut_TextWriterBase.s index 77513aa6..68e3a43a 100644 --- a/asm/libnw4r_ut/ut_TextWriterBase.s +++ b/asm/libnw4r_ut/ut_TextWriterBase.s @@ -3295,7 +3295,7 @@ lbl_80126CC4: /* 80126CDC 00122B1C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ut_TextWriterBase_cpp + .4byte __sinit_$$3ut_TextWriterBase_cpp .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global mFormatBufferSize__Q34nw4r2ut17TextWriterBase$$0c$$1 diff --git a/asm/mem/mem_allocator.s b/asm/mem/mem_allocator.s index 5310223a..940864eb 100644 --- a/asm/mem/mem_allocator.s +++ b/asm/mem/mem_allocator.s @@ -43,5 +43,5 @@ MEMInitAllocatorForExpHeap: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2MEMInitAllocatorForExpHeap__FP12MEMAllocatorP12MEMiHeapHeadi$$2sAllocatorFunc $$2LOCAL$$2MEMInitAllocatorForExpHeap__FP12MEMAllocatorP12MEMiHeapHeadi$$2sAllocatorFunc: - .byte4 AllocatorAllocForExpHeap_ - .byte4 AllocatorFreeForExpHeap_ + .4byte AllocatorAllocForExpHeap_ + .4byte AllocatorFreeForExpHeap_ diff --git a/asm/nand/NANDCheck.s b/asm/nand/NANDCheck.s index df112eeb..c8c0d2b8 100644 --- a/asm/nand/NANDCheck.s +++ b/asm/nand/NANDCheck.s @@ -164,16 +164,16 @@ $$22301: .balign 4 .global USER_DIR_LIST USER_DIR_LIST: - .byte4 $$22292 - .byte4 $$22293 - .byte4 $$22294 - .byte4 $$22295 - .byte4 $$22296 - .byte4 $$22297 - .byte4 $$22298 - .byte4 $$22299 - .byte4 $$22300 - .byte4 $$22301 + .4byte $$22292 + .4byte $$22293 + .4byte $$22294 + .4byte $$22295 + .4byte $$22296 + .4byte $$22297 + .4byte $$22298 + .4byte $$22299 + .4byte $$22300 + .4byte $$22301 .4byte 0 .4byte 0 diff --git a/asm/nand/NANDCore.s b/asm/nand/NANDCore.s index bf78e1bf..9a49a865 100644 --- a/asm/nand/NANDCore.s +++ b/asm/nand/NANDCore.s @@ -1410,7 +1410,7 @@ s_currentDir: .4byte 0 .global s_shutdownFuncInfo s_shutdownFuncInfo: - .byte4 nandOnShutdown + .4byte nandOnShutdown .4byte 0x000000FF .4byte 0 .4byte 0 @@ -1441,7 +1441,7 @@ $$23880: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __NANDVersion __NANDVersion: - .byte4 $$22807 + .4byte $$22807 .global $$23783 $$23783: .4byte 0x2F000000 diff --git a/asm/nand/NANDErrorMessage.s b/asm/nand/NANDErrorMessage.s index d7a585ec..38fd88f2 100644 --- a/asm/nand/NANDErrorMessage.s +++ b/asm/nand/NANDErrorMessage.s @@ -228,159 +228,159 @@ __NANDPrintErrorMessage: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global __NANDMaxBlocksErrorMessageDefault __NANDMaxBlocksErrorMessageDefault: - .byte4 $$21805 - .byte4 $$21806 - .byte4 $$21807 - .byte4 $$21808 - .byte4 $$21809 - .byte4 $$21810 - .byte4 $$21811 + .4byte $$21805 + .4byte $$21806 + .4byte $$21807 + .4byte $$21808 + .4byte $$21809 + .4byte $$21810 + .4byte $$21811 .global __NANDMaxBlocksErrorMessageEurope __NANDMaxBlocksErrorMessageEurope: - .byte4 $$21805 - .byte4 $$21812 - .byte4 $$21807 - .byte4 $$21813 - .byte4 $$21814 - .byte4 $$21810 - .byte4 $$21811 + .4byte $$21805 + .4byte $$21812 + .4byte $$21807 + .4byte $$21813 + .4byte $$21814 + .4byte $$21810 + .4byte $$21811 .global __NANDMaxFilesErrorMessageDefault __NANDMaxFilesErrorMessageDefault: - .byte4 $$21817 - .byte4 $$21806 - .byte4 $$21807 - .byte4 $$21818 - .byte4 $$21819 - .byte4 $$21820 - .byte4 $$21821 + .4byte $$21817 + .4byte $$21806 + .4byte $$21807 + .4byte $$21818 + .4byte $$21819 + .4byte $$21820 + .4byte $$21821 .global __NANDMaxFilesErrorMessageEurope __NANDMaxFilesErrorMessageEurope: - .byte4 $$21817 - .byte4 $$21812 - .byte4 $$21807 - .byte4 $$21813 - .byte4 $$21814 - .byte4 $$21820 - .byte4 $$21821 + .4byte $$21817 + .4byte $$21812 + .4byte $$21807 + .4byte $$21813 + .4byte $$21814 + .4byte $$21820 + .4byte $$21821 .global __NANDCorruptErrorMessageDefault __NANDCorruptErrorMessageDefault: - .byte4 $$21824 - .byte4 $$21825 - .byte4 $$21826 - .byte4 $$21827 - .byte4 $$21828 - .byte4 $$21829 - .byte4 $$21830 + .4byte $$21824 + .4byte $$21825 + .4byte $$21826 + .4byte $$21827 + .4byte $$21828 + .4byte $$21829 + .4byte $$21830 .global __NANDCorruptErrorMessageEurope __NANDCorruptErrorMessageEurope: - .byte4 $$21824 - .byte4 $$21831 - .byte4 $$21832 - .byte4 $$21833 - .byte4 $$21834 - .byte4 $$21829 - .byte4 $$21830 + .4byte $$21824 + .4byte $$21831 + .4byte $$21832 + .4byte $$21833 + .4byte $$21834 + .4byte $$21829 + .4byte $$21830 .global __NANDBusyErrorMessageDefault __NANDBusyErrorMessageDefault: - .byte4 $$21837 - .byte4 $$21838 - .byte4 $$21839 - .byte4 $$21840 - .byte4 $$21841 - .byte4 $$21842 - .byte4 $$21843 + .4byte $$21837 + .4byte $$21838 + .4byte $$21839 + .4byte $$21840 + .4byte $$21841 + .4byte $$21842 + .4byte $$21843 .global __NANDBusyErrorMessageEurope __NANDBusyErrorMessageEurope: - .byte4 $$21837 - .byte4 $$21844 - .byte4 $$21839 - .byte4 $$21845 - .byte4 $$21846 - .byte4 $$21842 - .byte4 $$21843 + .4byte $$21837 + .4byte $$21844 + .4byte $$21839 + .4byte $$21845 + .4byte $$21846 + .4byte $$21842 + .4byte $$21843 .global __NANDUnknownErrorMessageDefault __NANDUnknownErrorMessageDefault: - .byte4 $$21849 - .byte4 $$21850 - .byte4 $$21851 - .byte4 $$21852 - .byte4 $$21853 - .byte4 $$21854 - .byte4 $$21855 + .4byte $$21849 + .4byte $$21850 + .4byte $$21851 + .4byte $$21852 + .4byte $$21853 + .4byte $$21854 + .4byte $$21855 .global __NANDUnknownErrorMessageEurope __NANDUnknownErrorMessageEurope: - .byte4 $$21849 - .byte4 $$21856 - .byte4 $$21851 - .byte4 $$21857 - .byte4 $$21858 - .byte4 $$21854 - .byte4 $$21855 + .4byte $$21849 + .4byte $$21856 + .4byte $$21851 + .4byte $$21857 + .4byte $$21858 + .4byte $$21854 + .4byte $$21855 .global $$21868 $$21868: .4byte 0xFFFFFF94 .4byte 0 - .byte4 __NANDMaxBlocksErrorMessageDefault + .4byte __NANDMaxBlocksErrorMessageDefault .4byte 0xFFFFFF95 .4byte 0 - .byte4 __NANDMaxFilesErrorMessageDefault + .4byte __NANDMaxFilesErrorMessageDefault .4byte 0xFFFFFF99 .4byte 0 - .byte4 __NANDCorruptErrorMessageDefault + .4byte __NANDCorruptErrorMessageDefault .4byte 0xFFFFFF8A .4byte 0 - .byte4 __NANDBusyErrorMessageDefault + .4byte __NANDBusyErrorMessageDefault .4byte 0xFFFFFFEA .4byte 0 - .byte4 __NANDBusyErrorMessageDefault + .4byte __NANDBusyErrorMessageDefault .4byte 0xFFFFFF8B .4byte 0 - .byte4 __NANDUnknownErrorMessageDefault + .4byte __NANDUnknownErrorMessageDefault .4byte 0xFFFFFFF7 .4byte 0 - .byte4 __NANDUnknownErrorMessageDefault + .4byte __NANDUnknownErrorMessageDefault .4byte 0xFFFFFF94 .4byte 0x00000001 - .byte4 __NANDMaxBlocksErrorMessageEurope + .4byte __NANDMaxBlocksErrorMessageEurope .4byte 0xFFFFFF95 .4byte 0x00000001 - .byte4 __NANDMaxFilesErrorMessageEurope + .4byte __NANDMaxFilesErrorMessageEurope .4byte 0xFFFFFF99 .4byte 0x00000001 - .byte4 __NANDCorruptErrorMessageEurope + .4byte __NANDCorruptErrorMessageEurope .4byte 0xFFFFFF8A .4byte 0x00000001 - .byte4 __NANDBusyErrorMessageEurope + .4byte __NANDBusyErrorMessageEurope .4byte 0xFFFFFFEA .4byte 0x00000001 - .byte4 __NANDBusyErrorMessageEurope + .4byte __NANDBusyErrorMessageEurope .4byte 0xFFFFFF8B .4byte 0x00000001 - .byte4 __NANDUnknownErrorMessageEurope + .4byte __NANDUnknownErrorMessageEurope .4byte 0xFFFFFFF7 .4byte 0x00000001 - .byte4 __NANDUnknownErrorMessageEurope + .4byte __NANDUnknownErrorMessageEurope .4byte 0xFFFFFF94 .4byte 0x00000002 - .byte4 __NANDMaxBlocksErrorMessageChinaKorea + .4byte __NANDMaxBlocksErrorMessageChinaKorea .4byte 0xFFFFFF95 .4byte 0x00000002 - .byte4 __NANDMaxFilesErrorMessageChinaKorea + .4byte __NANDMaxFilesErrorMessageChinaKorea .4byte 0xFFFFFF99 .4byte 0x00000002 - .byte4 __NANDCorruptErrorMessageChinaKorea + .4byte __NANDCorruptErrorMessageChinaKorea .4byte 0xFFFFFF8A .4byte 0x00000002 - .byte4 __NANDBusyErrorMessageChinaKorea + .4byte __NANDBusyErrorMessageChinaKorea .4byte 0xFFFFFFEA .4byte 0x00000002 - .byte4 __NANDBusyErrorMessageChinaKorea + .4byte __NANDBusyErrorMessageChinaKorea .4byte 0xFFFFFF8B .4byte 0x00000002 - .byte4 __NANDUnknownErrorMessageChinaKorea + .4byte __NANDUnknownErrorMessageChinaKorea .4byte 0xFFFFFFF7 .4byte 0x00000002 - .byte4 __NANDUnknownErrorMessageChinaKorea + .4byte __NANDUnknownErrorMessageChinaKorea .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1497,24 +1497,24 @@ $$21860: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global __NANDMaxBlocksErrorMessageChinaKorea __NANDMaxBlocksErrorMessageChinaKorea: - .byte4 $$21815 - .byte4 $$21816 + .4byte $$21815 + .4byte $$21816 .global __NANDMaxFilesErrorMessageChinaKorea __NANDMaxFilesErrorMessageChinaKorea: - .byte4 $$21822 - .byte4 $$21823 + .4byte $$21822 + .4byte $$21823 .global __NANDCorruptErrorMessageChinaKorea __NANDCorruptErrorMessageChinaKorea: - .byte4 $$21835 - .byte4 $$21836 + .4byte $$21835 + .4byte $$21836 .global __NANDBusyErrorMessageChinaKorea __NANDBusyErrorMessageChinaKorea: - .byte4 $$21847 - .byte4 $$21848 + .4byte $$21847 + .4byte $$21848 .global __NANDUnknownErrorMessageChinaKorea __NANDUnknownErrorMessageChinaKorea: - .byte4 $$21859 - .byte4 $$21860 + .4byte $$21859 + .4byte $$21860 .global $$21888 $$21888: .4byte 0xFFFFFF00 diff --git a/asm/nrel/ExpHeapMapUser.s b/asm/nrel/ExpHeapMapUser.s index 981ed151..c2751fe0 100644 --- a/asm/nrel/ExpHeapMapUser.s +++ b/asm/nrel/ExpHeapMapUser.s @@ -242,31 +242,31 @@ lbl_8014BC50: .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nrel6devkit7heapmap14ExpHeapMapUser __vt__Q44nrel6devkit7heapmap14ExpHeapMapUser: - .byte4 __RTTI__Q44nrel6devkit7heapmap14ExpHeapMapUser + .4byte __RTTI__Q44nrel6devkit7heapmap14ExpHeapMapUser .4byte 0 - .byte4 __dt__Q44nrel6devkit7heapmap14ExpHeapMapUserFv - .byte4 heapName__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 fragmentBlockCount__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 usedBlockCount__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 totalHeapSize__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 usedHeapSize__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 startAddress__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 endAddress__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 drawUsedBlocks__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer - .byte4 drawFragmentBlocks__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer + .4byte __dt__Q44nrel6devkit7heapmap14ExpHeapMapUserFv + .4byte heapName__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte fragmentBlockCount__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte usedBlockCount__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte totalHeapSize__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte usedHeapSize__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte startAddress__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte endAddress__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte drawUsedBlocks__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer + .4byte drawFragmentBlocks__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer .global $$22500 $$22500: .asciz "nrel::devkit::heapmap::ExpHeapMapUser" .balign 4 .global $$22501 $$22501: - .byte4 __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser + .4byte __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser .4byte 0 .4byte 0 .4byte 0 .global __vt__Q44nrel6devkit7heapmap12IHeapMapUser __vt__Q44nrel6devkit7heapmap12IHeapMapUser: - .byte4 __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser + .4byte __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser .4byte 0 .4byte 0 .4byte 0 @@ -294,9 +294,9 @@ $$2STRING$$2next__Q34nrel3mem20ExpHeapBlockIteratorCFv: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__Q44nrel6devkit7heapmap14ExpHeapMapUser __RTTI__Q44nrel6devkit7heapmap14ExpHeapMapUser: - .byte4 $$22500 - .byte4 $$22501 + .4byte $$22500 + .4byte $$22501 .global __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser: - .byte4 $$22502 + .4byte $$22502 .4byte 0 diff --git a/asm/os/OS.s b/asm/os/OS.s index 5a205ea1..adcddf85 100644 --- a/asm/os/OS.s +++ b/asm/os/OS.s @@ -1649,7 +1649,7 @@ __OSExceptionLocations: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __OSVersion __OSVersion: - .byte4 $$21 + .4byte $$21 .global $$21784 $$21784: .asciz "RVA 1\n" @@ -1671,7 +1671,7 @@ $$21187: .balign 4 .global AppGameNameForSysMenu AppGameNameForSysMenu: - .byte4 $$21187 + .4byte $$21187 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/os/OSAlarm.s b/asm/os/OSAlarm.s index 683f9be5..2c0f4908 100644 --- a/asm/os/OSAlarm.s +++ b/asm/os/OSAlarm.s @@ -635,7 +635,7 @@ lbl_8001C01C: .section .data, "wa" # 0x80421040 - 0x80496700 .global ShutdownFunctionInfo ShutdownFunctionInfo: - .byte4 OnReset + .4byte OnReset .4byte 0xFFFFFFFF .4byte 0 .4byte 0 diff --git a/asm/os/OSMemory.s b/asm/os/OSMemory.s index 08c96683..d9fa5cfd 100644 --- a/asm/os/OSMemory.s +++ b/asm/os/OSMemory.s @@ -606,7 +606,7 @@ lbl_80022B44: .section .data, "wa" # 0x80421040 - 0x80496700 .global ShutdownFunctionInfo ShutdownFunctionInfo: - .byte4 OnShutdown + .4byte OnShutdown .4byte 0x0000007F .4byte 0 .4byte 0 diff --git a/asm/os/OSThread.s b/asm/os/OSThread.s index a62d7ff2..a424c761 100644 --- a/asm/os/OSThread.s +++ b/asm/os/OSThread.s @@ -1695,7 +1695,7 @@ lbl_80025B18: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global SwitchThreadCallback SwitchThreadCallback: - .byte4 DefaultSwitchThreadCallback + .4byte DefaultSwitchThreadCallback .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/os/OSUtf.s b/asm/os/OSUtf.s index 3b01596d..da17258f 100644 --- a/asm/os/OSUtf.s +++ b/asm/os/OSUtf.s @@ -12299,11 +12299,11 @@ UcsFF: .4byte 0 .global UcsSjisTable UcsSjisTable: - .byte4 Ucs00 + .4byte Ucs00 .4byte 0 .4byte 0 - .byte4 Ucs03 - .byte4 Ucs04 + .4byte Ucs03 + .4byte Ucs04 .4byte 0 .4byte 0 .4byte 0 @@ -12331,13 +12331,13 @@ UcsSjisTable: .4byte 0 .4byte 0 .4byte 0 - .byte4 Ucs20 - .byte4 Ucs21 - .byte4 Ucs22 - .byte4 Ucs23 + .4byte Ucs20 + .4byte Ucs21 + .4byte Ucs22 + .4byte Ucs23 .4byte 0 - .byte4 Ucs25 - .byte4 Ucs26 + .4byte Ucs25 + .4byte Ucs26 .4byte 0 .4byte 0 .4byte 0 @@ -12347,7 +12347,7 @@ UcsSjisTable: .4byte 0 .4byte 0 .4byte 0 - .byte4 Ucs30 + .4byte Ucs30 .4byte 0 .4byte 0 .4byte 0 @@ -12377,88 +12377,88 @@ UcsSjisTable: .4byte 0 .4byte 0 .4byte 0 - .byte4 Ucs4E - .byte4 Ucs4F - .byte4 Ucs50 - .byte4 Ucs51 - .byte4 Ucs52 - .byte4 Ucs53 - .byte4 Ucs54 - .byte4 Ucs55 - .byte4 Ucs56 - .byte4 Ucs57 - .byte4 Ucs58 - .byte4 Ucs59 - .byte4 Ucs5A - .byte4 Ucs5B - .byte4 Ucs5C - .byte4 Ucs5D - .byte4 Ucs5E - .byte4 Ucs5F - .byte4 Ucs60 - .byte4 Ucs61 - .byte4 Ucs62 - .byte4 Ucs63 - .byte4 Ucs64 - .byte4 Ucs65 - .byte4 Ucs66 - .byte4 Ucs67 - .byte4 Ucs68 - .byte4 Ucs69 - .byte4 Ucs6A - .byte4 Ucs6B - .byte4 Ucs6C - .byte4 Ucs6D - .byte4 Ucs6E - .byte4 Ucs6F - .byte4 Ucs70 - .byte4 Ucs71 - .byte4 Ucs72 - .byte4 Ucs73 - .byte4 Ucs74 - .byte4 Ucs75 - .byte4 Ucs76 - .byte4 Ucs77 - .byte4 Ucs78 - .byte4 Ucs79 - .byte4 Ucs7A - .byte4 Ucs7B - .byte4 Ucs7C - .byte4 Ucs7D - .byte4 Ucs7E - .byte4 Ucs7F - .byte4 Ucs80 - .byte4 Ucs81 - .byte4 Ucs82 - .byte4 Ucs83 - .byte4 Ucs84 - .byte4 Ucs85 - .byte4 Ucs86 - .byte4 Ucs87 - .byte4 Ucs88 - .byte4 Ucs89 - .byte4 Ucs8A - .byte4 Ucs8B - .byte4 Ucs8C - .byte4 Ucs8D - .byte4 Ucs8E - .byte4 Ucs8F - .byte4 Ucs90 - .byte4 Ucs91 - .byte4 Ucs92 - .byte4 Ucs93 - .byte4 Ucs94 - .byte4 Ucs95 - .byte4 Ucs96 - .byte4 Ucs97 - .byte4 Ucs98 - .byte4 Ucs99 - .byte4 Ucs9A - .byte4 Ucs9B - .byte4 Ucs9C - .byte4 Ucs9D - .byte4 Ucs9E - .byte4 Ucs9F + .4byte Ucs4E + .4byte Ucs4F + .4byte Ucs50 + .4byte Ucs51 + .4byte Ucs52 + .4byte Ucs53 + .4byte Ucs54 + .4byte Ucs55 + .4byte Ucs56 + .4byte Ucs57 + .4byte Ucs58 + .4byte Ucs59 + .4byte Ucs5A + .4byte Ucs5B + .4byte Ucs5C + .4byte Ucs5D + .4byte Ucs5E + .4byte Ucs5F + .4byte Ucs60 + .4byte Ucs61 + .4byte Ucs62 + .4byte Ucs63 + .4byte Ucs64 + .4byte Ucs65 + .4byte Ucs66 + .4byte Ucs67 + .4byte Ucs68 + .4byte Ucs69 + .4byte Ucs6A + .4byte Ucs6B + .4byte Ucs6C + .4byte Ucs6D + .4byte Ucs6E + .4byte Ucs6F + .4byte Ucs70 + .4byte Ucs71 + .4byte Ucs72 + .4byte Ucs73 + .4byte Ucs74 + .4byte Ucs75 + .4byte Ucs76 + .4byte Ucs77 + .4byte Ucs78 + .4byte Ucs79 + .4byte Ucs7A + .4byte Ucs7B + .4byte Ucs7C + .4byte Ucs7D + .4byte Ucs7E + .4byte Ucs7F + .4byte Ucs80 + .4byte Ucs81 + .4byte Ucs82 + .4byte Ucs83 + .4byte Ucs84 + .4byte Ucs85 + .4byte Ucs86 + .4byte Ucs87 + .4byte Ucs88 + .4byte Ucs89 + .4byte Ucs8A + .4byte Ucs8B + .4byte Ucs8C + .4byte Ucs8D + .4byte Ucs8E + .4byte Ucs8F + .4byte Ucs90 + .4byte Ucs91 + .4byte Ucs92 + .4byte Ucs93 + .4byte Ucs94 + .4byte Ucs95 + .4byte Ucs96 + .4byte Ucs97 + .4byte Ucs98 + .4byte Ucs99 + .4byte Ucs9A + .4byte Ucs9B + .4byte Ucs9C + .4byte Ucs9D + .4byte Ucs9E + .4byte Ucs9F .4byte 0 .4byte 0 .4byte 0 @@ -12554,4 +12554,4 @@ UcsSjisTable: .4byte 0 .4byte 0 .4byte 0 - .byte4 UcsFF + .4byte UcsFF diff --git a/asm/pad/Pad.s b/asm/pad/Pad.s index 26052b70..8d8d75e9 100644 --- a/asm/pad/Pad.s +++ b/asm/pad/Pad.s @@ -1758,7 +1758,7 @@ $$21: .balign 4 .global ShutdownFunctionInfo ShutdownFunctionInfo: - .byte4 OnShutdown + .4byte OnShutdown .4byte 0x0000007F .4byte 0 .4byte 0 @@ -1766,7 +1766,7 @@ ShutdownFunctionInfo: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __PADVersion __PADVersion: - .byte4 $$21 + .4byte $$21 .global ResettingChan ResettingChan: .4byte 0x00000020 @@ -1781,7 +1781,7 @@ Spec: .4byte 0x00000005 .global MakeStatus MakeStatus: - .byte4 SPEC2_MakeStatus + .4byte SPEC2_MakeStatus .global CmdReadOrigin CmdReadOrigin: .4byte 0x41000000 diff --git a/asm/sc/scsystem.s b/asm/sc/scsystem.s index 35ae33e8..9027c882 100644 --- a/asm/sc/scsystem.s +++ b/asm/sc/scsystem.s @@ -1820,81 +1820,81 @@ $$2871: .4byte 0 .global NameAndIDTbl NameAndIDTbl: - .byte4 $$2835 + .4byte $$2835 .4byte 0 - .byte4 $$2836 + .4byte $$2836 .4byte 0x00000001 - .byte4 $$2837 + .4byte $$2837 .4byte 0x00000002 - .byte4 $$2838 + .4byte $$2838 .4byte 0x00000003 - .byte4 $$2839 + .4byte $$2839 .4byte 0x00000004 - .byte4 $$2840 + .4byte $$2840 .4byte 0x00000005 - .byte4 $$2841 + .4byte $$2841 .4byte 0x00000006 - .byte4 $$2842 + .4byte $$2842 .4byte 0x00000007 - .byte4 $$2843 + .4byte $$2843 .4byte 0x00000008 - .byte4 $$2844 + .4byte $$2844 .4byte 0x00000009 - .byte4 $$2845 + .4byte $$2845 .4byte 0x0000000A - .byte4 $$2846 + .4byte $$2846 .4byte 0x0000000B - .byte4 $$2847 + .4byte $$2847 .4byte 0x0000000C - .byte4 $$2848 + .4byte $$2848 .4byte 0x0000000D - .byte4 $$2849 + .4byte $$2849 .4byte 0x0000000E - .byte4 $$2850 + .4byte $$2850 .4byte 0x0000000F - .byte4 $$2851 + .4byte $$2851 .4byte 0x00000010 - .byte4 $$2852 + .4byte $$2852 .4byte 0x00000011 - .byte4 $$2853 + .4byte $$2853 .4byte 0x00000012 - .byte4 $$2854 + .4byte $$2854 .4byte 0x00000013 - .byte4 $$2855 + .4byte $$2855 .4byte 0x00000014 - .byte4 $$2856 + .4byte $$2856 .4byte 0x00000015 - .byte4 $$2857 + .4byte $$2857 .4byte 0x00000016 - .byte4 $$2858 + .4byte $$2858 .4byte 0x00000017 - .byte4 $$2859 + .4byte $$2859 .4byte 0x00000018 - .byte4 $$2860 + .4byte $$2860 .4byte 0x00000019 - .byte4 $$2861 + .4byte $$2861 .4byte 0x0000001A - .byte4 $$2862 + .4byte $$2862 .4byte 0x0000001B - .byte4 $$2863 + .4byte $$2863 .4byte 0x0000001C - .byte4 $$2864 + .4byte $$2864 .4byte 0x0000001D - .byte4 $$2865 + .4byte $$2865 .4byte 0x0000001E - .byte4 $$2866 + .4byte $$2866 .4byte 0x0000001F - .byte4 $$2867 + .4byte $$2867 .4byte 0x00000020 - .byte4 $$2868 + .4byte $$2868 .4byte 0x00000021 - .byte4 $$2869 + .4byte $$2869 .4byte 0x00000022 - .byte4 $$2870 + .4byte $$2870 .4byte 0x00000023 - .byte4 $$2871 + .4byte $$2871 .4byte 0x00000024 - .byte4 $$2872 + .4byte $$2872 .4byte 0x00000025 .global $$22788 $$22788: @@ -1912,7 +1912,7 @@ $$22788: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __SCVersion __SCVersion: - .byte4 $$21 + .4byte $$21 .global $$2835 $$2835: .asciz "IPL.CB" diff --git a/asm/si/SIBios.s b/asm/si/SIBios.s index ece57c60..b8dabc68 100644 --- a/asm/si/SIBios.s +++ b/asm/si/SIBios.s @@ -1579,7 +1579,7 @@ Type: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __SIVersion __SIVersion: - .byte4 $$21 + .4byte $$21 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/AbilityBase.s b/asm/src/AbilityBase.s index e489c179..b9e6f901 100644 --- a/asm/src/AbilityBase.s +++ b/asm/src/AbilityBase.s @@ -99,25 +99,25 @@ isDepleted__Q43scn4step4hero11AbilityBaseCFv: __vt__Q43scn4step4hero11AbilityBase: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4hero11AbilityBaseFv - .byte4 setup__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeStateOnCarry__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeStateOnInterval__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeStateOnDamage__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeState__Q43scn4step4hero11AbilityBaseFv - .byte4 onStateEndCleanUp__Q43scn4step4hero11AbilityBaseFv - .byte4 onGetEventItem__Q43scn4step4hero11AbilityBaseFv - .byte4 onGimmickReactChangeState__Q43scn4step4hero11AbilityBaseFv - .byte4 onStartClearDanceExternal__Q43scn4step4hero11AbilityBaseFv - .byte4 onEnterWarpLowper__Q43scn4step4hero11AbilityBaseFv - .byte4 onShowHero__Q43scn4step4hero11AbilityBaseFv - .byte4 onHideHero__Q43scn4step4hero11AbilityBaseFv - .byte4 onDead__Q43scn4step4hero11AbilityBaseFv - .byte4 onCaptured__Q43scn4step4hero11AbilityBaseFv - .byte4 onVacuumed__Q43scn4step4hero11AbilityBaseFv - .byte4 onStartDemo__Q43scn4step4hero11AbilityBaseFv - .byte4 procAnim__Q43scn4step4hero11AbilityBaseFv - .byte4 procMove__Q43scn4step4hero11AbilityBaseFv - .byte4 procObjCollReact__Q43scn4step4hero11AbilityBaseFv - .byte4 isDepleted__Q43scn4step4hero11AbilityBaseCFv + .4byte __dt__Q43scn4step4hero11AbilityBaseFv + .4byte setup__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeStateOnCarry__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeStateOnInterval__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeStateOnDamage__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeState__Q43scn4step4hero11AbilityBaseFv + .4byte onStateEndCleanUp__Q43scn4step4hero11AbilityBaseFv + .4byte onGetEventItem__Q43scn4step4hero11AbilityBaseFv + .4byte onGimmickReactChangeState__Q43scn4step4hero11AbilityBaseFv + .4byte onStartClearDanceExternal__Q43scn4step4hero11AbilityBaseFv + .4byte onEnterWarpLowper__Q43scn4step4hero11AbilityBaseFv + .4byte onShowHero__Q43scn4step4hero11AbilityBaseFv + .4byte onHideHero__Q43scn4step4hero11AbilityBaseFv + .4byte onDead__Q43scn4step4hero11AbilityBaseFv + .4byte onCaptured__Q43scn4step4hero11AbilityBaseFv + .4byte onVacuumed__Q43scn4step4hero11AbilityBaseFv + .4byte onStartDemo__Q43scn4step4hero11AbilityBaseFv + .4byte procAnim__Q43scn4step4hero11AbilityBaseFv + .4byte procMove__Q43scn4step4hero11AbilityBaseFv + .4byte procObjCollReact__Q43scn4step4hero11AbilityBaseFv + .4byte isDepleted__Q43scn4step4hero11AbilityBaseCFv .4byte 0 diff --git a/asm/src/AbilityCustomBase.s b/asm/src/AbilityCustomBase.s index 6afe9e32..bc530fdb 100644 --- a/asm/src/AbilityCustomBase.s +++ b/asm/src/AbilityCustomBase.s @@ -22,5 +22,5 @@ GetRuntimeTypeInfo__Q43scn4step4hero17AbilityCustomBaseCFv: __vt__Q43scn4step4hero17AbilityCustomBase: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step4hero17AbilityCustomBaseCFv - .byte4 __dt__Q43scn4step4hero17AbilityCustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step4hero17AbilityCustomBaseCFv + .4byte __dt__Q43scn4step4hero17AbilityCustomBaseFv diff --git a/asm/src/AbilityKindUtil.s b/asm/src/AbilityKindUtil.s index bb836e55..18213599 100644 --- a/asm/src/AbilityKindUtil.s +++ b/asm/src/AbilityKindUtil.s @@ -493,42 +493,42 @@ $$248739: .4byte 0 .global T_FDN_NAME_TABLE__Q43scn4step4hero29$$2unnamed$$2AbilityKindUtil_cpp$$2 T_FDN_NAME_TABLE__Q43scn4step4hero29$$2unnamed$$2AbilityKindUtil_cpp$$2: - .byte4 $$248725 - .byte4 $$248726 - .byte4 $$248727 - .byte4 $$248725 - .byte4 $$248728 - .byte4 $$248729 - .byte4 $$248725 - .byte4 $$248725 - .byte4 $$248730 - .byte4 $$248731 - .byte4 $$248725 - .byte4 $$248732 - .byte4 $$248725 - .byte4 $$248725 - .byte4 $$248725 - .byte4 $$248725 - .byte4 $$248725 - .byte4 $$248733 - .byte4 $$248725 - .byte4 $$248734 - .byte4 $$248725 - .byte4 $$248735 - .byte4 $$248725 - .byte4 $$248725 - .byte4 $$248736 - .byte4 $$248725 - .byte4 $$248725 - .byte4 $$248725 - .byte4 $$248725 - .byte4 $$248725 - .byte4 $$248725 - .byte4 $$248725 - .byte4 $$248725 - .byte4 $$248737 - .byte4 $$248738 - .byte4 $$248739 + .4byte $$248725 + .4byte $$248726 + .4byte $$248727 + .4byte $$248725 + .4byte $$248728 + .4byte $$248729 + .4byte $$248725 + .4byte $$248725 + .4byte $$248730 + .4byte $$248731 + .4byte $$248725 + .4byte $$248732 + .4byte $$248725 + .4byte $$248725 + .4byte $$248725 + .4byte $$248725 + .4byte $$248725 + .4byte $$248733 + .4byte $$248725 + .4byte $$248734 + .4byte $$248725 + .4byte $$248735 + .4byte $$248725 + .4byte $$248725 + .4byte $$248736 + .4byte $$248725 + .4byte $$248725 + .4byte $$248725 + .4byte $$248725 + .4byte $$248725 + .4byte $$248725 + .4byte $$248725 + .4byte $$248725 + .4byte $$248737 + .4byte $$248738 + .4byte $$248739 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249304 diff --git a/asm/src/AbilityPanel.s b/asm/src/AbilityPanel.s index 1dfe4e87..615df406 100644 --- a/asm/src/AbilityPanel.s +++ b/asm/src/AbilityPanel.s @@ -473,20 +473,20 @@ $$251791: .4byte 0x00000024 .global $$251826 $$251826: - .byte4 $$251812 - .byte4 $$251813 - .byte4 $$251814 - .byte4 $$251815 - .byte4 $$251816 - .byte4 $$251817 - .byte4 $$251818 - .byte4 $$251819 - .byte4 $$251820 - .byte4 $$251821 - .byte4 $$251822 - .byte4 $$251823 - .byte4 $$251824 - .byte4 $$251825 + .4byte $$251812 + .4byte $$251813 + .4byte $$251814 + .4byte $$251815 + .4byte $$251816 + .4byte $$251817 + .4byte $$251818 + .4byte $$251819 + .4byte $$251820 + .4byte $$251821 + .4byte $$251822 + .4byte $$251823 + .4byte $$251824 + .4byte $$251825 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251574 @@ -516,13 +516,13 @@ $$251580: .balign 4 .global abilityName__Q43scn17challengetutorial4info26$$2unnamed$$2AbilityPanel_cpp$$2 abilityName__Q43scn17challengetutorial4info26$$2unnamed$$2AbilityPanel_cpp$$2: - .byte4 $$251574 - .byte4 $$251575 - .byte4 $$251576 - .byte4 $$251577 - .byte4 $$251578 - .byte4 $$251579 - .byte4 $$251580 + .4byte $$251574 + .4byte $$251575 + .4byte $$251576 + .4byte $$251577 + .4byte $$251578 + .4byte $$251579 + .4byte $$251580 .global $$252687 $$252687: .asciz "challengeability/Main" diff --git a/asm/src/AbilitySelect.s b/asm/src/AbilitySelect.s index e74925fb..4fe714bd 100644 --- a/asm/src/AbilitySelect.s +++ b/asm/src/AbilitySelect.s @@ -1757,13 +1757,13 @@ panelOffsTbl__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2: .section .data, "wa" # 0x80421040 - 0x80496700 .global panelPosName__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 panelPosName__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2: - .byte4 $$251749 - .byte4 $$251750 - .byte4 $$251751 - .byte4 $$251752 - .byte4 $$251753 - .byte4 $$251754 - .byte4 $$251755 + .4byte $$251749 + .4byte $$251750 + .4byte $$251751 + .4byte $$251752 + .4byte $$251753 + .4byte $$251754 + .4byte $$251755 .global $$251757 $$251757: .asciz "CursorBase1N" @@ -1778,14 +1778,14 @@ $$251759: .balign 4 .global cursorPosName__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 cursorPosName__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2: - .byte4 $$251757 - .byte4 $$251758 - .byte4 $$251759 + .4byte $$251757 + .4byte $$251758 + .4byte $$251759 .global areaPanelTbl__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 areaPanelTbl__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2: - .byte4 area1Panel__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 - .byte4 area2Panel__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 - .byte4 area3Panel__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 + .4byte area1Panel__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 + .4byte area2Panel__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 + .4byte area3Panel__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 .global $$253883 $$253883: .asciz "challengeability/Main" diff --git a/asm/src/ActionAttack.s b/asm/src/ActionAttack.s index f662232a..f9e9f3d7 100644 --- a/asm/src/ActionAttack.s +++ b/asm/src/ActionAttack.s @@ -287,21 +287,21 @@ $$252816: __vt__Q53scn4step7gimmick10guideboard12ActionAttack: .4byte 0 .4byte 0 - .byte4 topLName__Q53scn4step7gimmick10guideboard12ActionAttackCFv - .byte4 isInitState__Q53scn4step7gimmick10guideboard12ActionAttackCFv - .byte4 reset__Q53scn4step7gimmick10guideboard12ActionAttackFb - .byte4 updateFrame__Q53scn4step7gimmick10guideboard12ActionAttackFv - .byte4 onFrameEnd__Q53scn4step7gimmick10guideboard12ActionAttackFv - .byte4 onEat__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onVomit__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onDrink__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onRun__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onHover__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAbilityGet__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAbilityClear__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onVacuumSuper__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onThroughLand__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAttack__Q53scn4step7gimmick10guideboard12ActionAttackFRCQ33hel4math7Vector3 + .4byte topLName__Q53scn4step7gimmick10guideboard12ActionAttackCFv + .4byte isInitState__Q53scn4step7gimmick10guideboard12ActionAttackCFv + .4byte reset__Q53scn4step7gimmick10guideboard12ActionAttackFb + .4byte updateFrame__Q53scn4step7gimmick10guideboard12ActionAttackFv + .4byte onFrameEnd__Q53scn4step7gimmick10guideboard12ActionAttackFv + .4byte onEat__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onVomit__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onDrink__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onRun__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onHover__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAbilityGet__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAbilityClear__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onVacuumSuper__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onThroughLand__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAttack__Q53scn4step7gimmick10guideboard12ActionAttackFRCQ33hel4math7Vector3 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252801 diff --git a/asm/src/ActionDrink.s b/asm/src/ActionDrink.s index 362d7e00..dac3f029 100644 --- a/asm/src/ActionDrink.s +++ b/asm/src/ActionDrink.s @@ -336,21 +336,21 @@ $$252932: __vt__Q53scn4step7gimmick10guideboard11ActionDrink: .4byte 0 .4byte 0 - .byte4 topLName__Q53scn4step7gimmick10guideboard11ActionDrinkCFv - .byte4 isInitState__Q53scn4step7gimmick10guideboard11ActionDrinkCFv - .byte4 reset__Q53scn4step7gimmick10guideboard11ActionDrinkFb - .byte4 updateFrame__Q53scn4step7gimmick10guideboard11ActionDrinkFv - .byte4 onFrameEnd__Q53scn4step7gimmick10guideboard11ActionDrinkFv - .byte4 onEat__Q53scn4step7gimmick10guideboard11ActionDrinkFRCQ33hel4math7Vector3 - .byte4 onVomit__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onDrink__Q53scn4step7gimmick10guideboard11ActionDrinkFRCQ33hel4math7Vector3 - .byte4 onRun__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onHover__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAbilityGet__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAbilityClear__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onVacuumSuper__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onThroughLand__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAttack__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte topLName__Q53scn4step7gimmick10guideboard11ActionDrinkCFv + .4byte isInitState__Q53scn4step7gimmick10guideboard11ActionDrinkCFv + .4byte reset__Q53scn4step7gimmick10guideboard11ActionDrinkFb + .4byte updateFrame__Q53scn4step7gimmick10guideboard11ActionDrinkFv + .4byte onFrameEnd__Q53scn4step7gimmick10guideboard11ActionDrinkFv + .4byte onEat__Q53scn4step7gimmick10guideboard11ActionDrinkFRCQ33hel4math7Vector3 + .4byte onVomit__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onDrink__Q53scn4step7gimmick10guideboard11ActionDrinkFRCQ33hel4math7Vector3 + .4byte onRun__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onHover__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAbilityGet__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAbilityClear__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onVacuumSuper__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onThroughLand__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAttack__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/ActionHover.s b/asm/src/ActionHover.s index 110244b7..9f328162 100644 --- a/asm/src/ActionHover.s +++ b/asm/src/ActionHover.s @@ -207,21 +207,21 @@ $$252816: __vt__Q53scn4step7gimmick10guideboard11ActionHover: .4byte 0 .4byte 0 - .byte4 topLName__Q53scn4step7gimmick10guideboard11ActionHoverCFv - .byte4 isInitState__Q53scn4step7gimmick10guideboard11ActionHoverCFv - .byte4 reset__Q53scn4step7gimmick10guideboard11ActionHoverFb - .byte4 updateFrame__Q53scn4step7gimmick10guideboard11ActionHoverFv - .byte4 onFrameEnd__Q53scn4step7gimmick10guideboard11ActionHoverFv - .byte4 onEat__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onVomit__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onDrink__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onRun__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onHover__Q53scn4step7gimmick10guideboard11ActionHoverFRCQ33hel4math7Vector3 - .byte4 onAbilityGet__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAbilityClear__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onVacuumSuper__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onThroughLand__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAttack__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte topLName__Q53scn4step7gimmick10guideboard11ActionHoverCFv + .4byte isInitState__Q53scn4step7gimmick10guideboard11ActionHoverCFv + .4byte reset__Q53scn4step7gimmick10guideboard11ActionHoverFb + .4byte updateFrame__Q53scn4step7gimmick10guideboard11ActionHoverFv + .4byte onFrameEnd__Q53scn4step7gimmick10guideboard11ActionHoverFv + .4byte onEat__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onVomit__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onDrink__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onRun__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onHover__Q53scn4step7gimmick10guideboard11ActionHoverFRCQ33hel4math7Vector3 + .4byte onAbilityGet__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAbilityClear__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onVacuumSuper__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onThroughLand__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAttack__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252801 diff --git a/asm/src/ActionRun.s b/asm/src/ActionRun.s index b24dbb7a..96e7b762 100644 --- a/asm/src/ActionRun.s +++ b/asm/src/ActionRun.s @@ -308,21 +308,21 @@ $$253279: __vt__Q53scn4step7gimmick10guideboard9ActionRun: .4byte 0 .4byte 0 - .byte4 topLName__Q53scn4step7gimmick10guideboard9ActionRunCFv - .byte4 isInitState__Q53scn4step7gimmick10guideboard9ActionRunCFv - .byte4 reset__Q53scn4step7gimmick10guideboard9ActionRunFb - .byte4 updateFrame__Q53scn4step7gimmick10guideboard9ActionRunFv - .byte4 onFrameEnd__Q53scn4step7gimmick10guideboard9ActionRunFv - .byte4 onEat__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onVomit__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onDrink__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onRun__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onHover__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAbilityGet__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAbilityClear__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onVacuumSuper__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onThroughLand__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAttack__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte topLName__Q53scn4step7gimmick10guideboard9ActionRunCFv + .4byte isInitState__Q53scn4step7gimmick10guideboard9ActionRunCFv + .4byte reset__Q53scn4step7gimmick10guideboard9ActionRunFb + .4byte updateFrame__Q53scn4step7gimmick10guideboard9ActionRunFv + .4byte onFrameEnd__Q53scn4step7gimmick10guideboard9ActionRunFv + .4byte onEat__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onVomit__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onDrink__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onRun__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onHover__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAbilityGet__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAbilityClear__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onVacuumSuper__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onThroughLand__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAttack__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253250 diff --git a/asm/src/ActionThroughLand.s b/asm/src/ActionThroughLand.s index 948f7bef..c50a942b 100644 --- a/asm/src/ActionThroughLand.s +++ b/asm/src/ActionThroughLand.s @@ -313,21 +313,21 @@ $$253269: __vt__Q53scn4step7gimmick10guideboard17ActionThroughLand: .4byte 0 .4byte 0 - .byte4 topLName__Q53scn4step7gimmick10guideboard17ActionThroughLandCFv - .byte4 isInitState__Q53scn4step7gimmick10guideboard17ActionThroughLandCFv - .byte4 reset__Q53scn4step7gimmick10guideboard17ActionThroughLandFb - .byte4 updateFrame__Q53scn4step7gimmick10guideboard17ActionThroughLandFv - .byte4 onFrameEnd__Q53scn4step7gimmick10guideboard17ActionThroughLandFv - .byte4 onEat__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onVomit__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onDrink__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onRun__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onHover__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAbilityGet__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAbilityClear__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onVacuumSuper__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onThroughLand__Q53scn4step7gimmick10guideboard17ActionThroughLandFRCQ33hel4math7Vector3 - .byte4 onAttack__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte topLName__Q53scn4step7gimmick10guideboard17ActionThroughLandCFv + .4byte isInitState__Q53scn4step7gimmick10guideboard17ActionThroughLandCFv + .4byte reset__Q53scn4step7gimmick10guideboard17ActionThroughLandFb + .4byte updateFrame__Q53scn4step7gimmick10guideboard17ActionThroughLandFv + .4byte onFrameEnd__Q53scn4step7gimmick10guideboard17ActionThroughLandFv + .4byte onEat__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onVomit__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onDrink__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onRun__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onHover__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAbilityGet__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAbilityClear__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onVacuumSuper__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onThroughLand__Q53scn4step7gimmick10guideboard17ActionThroughLandFRCQ33hel4math7Vector3 + .4byte onAttack__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253223 diff --git a/asm/src/ActionVacuumSuper.s b/asm/src/ActionVacuumSuper.s index a707a2d8..8f27200e 100644 --- a/asm/src/ActionVacuumSuper.s +++ b/asm/src/ActionVacuumSuper.s @@ -311,21 +311,21 @@ $$252901: __vt__Q53scn4step7gimmick10guideboard17ActionVacuumSuper: .4byte 0 .4byte 0 - .byte4 topLName__Q53scn4step7gimmick10guideboard17ActionVacuumSuperCFv - .byte4 isInitState__Q53scn4step7gimmick10guideboard6ActionCFv - .byte4 reset__Q53scn4step7gimmick10guideboard17ActionVacuumSuperFb - .byte4 updateFrame__Q53scn4step7gimmick10guideboard17ActionVacuumSuperFv - .byte4 onFrameEnd__Q53scn4step7gimmick10guideboard17ActionVacuumSuperFv - .byte4 onEat__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onVomit__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onDrink__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onRun__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onHover__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAbilityGet__Q53scn4step7gimmick10guideboard17ActionVacuumSuperFRCQ33hel4math7Vector3 - .byte4 onAbilityClear__Q53scn4step7gimmick10guideboard17ActionVacuumSuperFRCQ33hel4math7Vector3 - .byte4 onVacuumSuper__Q53scn4step7gimmick10guideboard17ActionVacuumSuperFRCQ33hel4math7Vector3 - .byte4 onThroughLand__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAttack__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte topLName__Q53scn4step7gimmick10guideboard17ActionVacuumSuperCFv + .4byte isInitState__Q53scn4step7gimmick10guideboard6ActionCFv + .4byte reset__Q53scn4step7gimmick10guideboard17ActionVacuumSuperFb + .4byte updateFrame__Q53scn4step7gimmick10guideboard17ActionVacuumSuperFv + .4byte onFrameEnd__Q53scn4step7gimmick10guideboard17ActionVacuumSuperFv + .4byte onEat__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onVomit__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onDrink__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onRun__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onHover__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAbilityGet__Q53scn4step7gimmick10guideboard17ActionVacuumSuperFRCQ33hel4math7Vector3 + .4byte onAbilityClear__Q53scn4step7gimmick10guideboard17ActionVacuumSuperFRCQ33hel4math7Vector3 + .4byte onVacuumSuper__Q53scn4step7gimmick10guideboard17ActionVacuumSuperFRCQ33hel4math7Vector3 + .4byte onThroughLand__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAttack__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/ActionVomit.s b/asm/src/ActionVomit.s index 20ee6280..ca7a8497 100644 --- a/asm/src/ActionVomit.s +++ b/asm/src/ActionVomit.s @@ -336,21 +336,21 @@ $$252932: __vt__Q53scn4step7gimmick10guideboard11ActionVomit: .4byte 0 .4byte 0 - .byte4 topLName__Q53scn4step7gimmick10guideboard11ActionVomitCFv - .byte4 isInitState__Q53scn4step7gimmick10guideboard11ActionVomitCFv - .byte4 reset__Q53scn4step7gimmick10guideboard11ActionVomitFb - .byte4 updateFrame__Q53scn4step7gimmick10guideboard11ActionVomitFv - .byte4 onFrameEnd__Q53scn4step7gimmick10guideboard11ActionVomitFv - .byte4 onEat__Q53scn4step7gimmick10guideboard11ActionVomitFRCQ33hel4math7Vector3 - .byte4 onVomit__Q53scn4step7gimmick10guideboard11ActionVomitFRCQ33hel4math7Vector3 - .byte4 onDrink__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onRun__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onHover__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAbilityGet__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAbilityClear__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onVacuumSuper__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onThroughLand__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 - .byte4 onAttack__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte topLName__Q53scn4step7gimmick10guideboard11ActionVomitCFv + .4byte isInitState__Q53scn4step7gimmick10guideboard11ActionVomitCFv + .4byte reset__Q53scn4step7gimmick10guideboard11ActionVomitFb + .4byte updateFrame__Q53scn4step7gimmick10guideboard11ActionVomitFv + .4byte onFrameEnd__Q53scn4step7gimmick10guideboard11ActionVomitFv + .4byte onEat__Q53scn4step7gimmick10guideboard11ActionVomitFRCQ33hel4math7Vector3 + .4byte onVomit__Q53scn4step7gimmick10guideboard11ActionVomitFRCQ33hel4math7Vector3 + .4byte onDrink__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onRun__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onHover__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAbilityGet__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAbilityClear__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onVacuumSuper__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onThroughLand__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 + .4byte onAttack__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3 .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/ActorDiamond.s b/asm/src/ActorDiamond.s index 9da0990e..381f00ab 100644 --- a/asm/src/ActorDiamond.s +++ b/asm/src/ActorDiamond.s @@ -4250,11 +4250,11 @@ T_BELTCONVEYOR_SPEED__Q35mcoll6detail26$$2unnamed$$2ActorDiamond_cpp$$2: __vt__Q35mcoll6detail12ActorDiamond: .4byte 0 .4byte 0 - .byte4 __dt__Q35mcoll6detail12ActorDiamondFv - .byte4 actorCurrentPos__Q35mcoll6detail12ActorDiamondCFv - .byte4 actorSetCurrentPos__Q35mcoll6detail12ActorDiamondFRCQ33hel4math7Vector2 - .byte4 actorDetect__Q35mcoll6detail12ActorDiamondFRCQ35mcoll6detail7LandSetRQ35mcoll6detail10IResponderRCQ33hel4math7Vector2RCQ35mcoll6detail17ActorDetectOption - .byte4 actorDrawDebug__Q35mcoll6detail12ActorDiamondCFv + .4byte __dt__Q35mcoll6detail12ActorDiamondFv + .4byte actorCurrentPos__Q35mcoll6detail12ActorDiamondCFv + .4byte actorSetCurrentPos__Q35mcoll6detail12ActorDiamondFRCQ33hel4math7Vector2 + .4byte actorDetect__Q35mcoll6detail12ActorDiamondFRCQ35mcoll6detail7LandSetRQ35mcoll6detail10IResponderRCQ33hel4math7Vector2RCQ35mcoll6detail17ActorDetectOption + .4byte actorDrawDebug__Q35mcoll6detail12ActorDiamondCFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/AddOnMathDirection3.s b/asm/src/AddOnMathDirection3.s index d9c7fc4b..a4fb9584 100644 --- a/asm/src/AddOnMathDirection3.s +++ b/asm/src/AddOnMathDirection3.s @@ -1069,32 +1069,32 @@ $$254687: $$254769: .4byte 0 .4byte 0xFFFFFFFF - .byte4 restructLeftUp__Q33hel4math10Direction3Fv + .4byte restructLeftUp__Q33hel4math10Direction3Fv .global $$254815 $$254815: .4byte 0 .4byte 0xFFFFFFFF - .byte4 restructLeftFront__Q33hel4math10Direction3Fv + .4byte restructLeftFront__Q33hel4math10Direction3Fv .global $$254827 $$254827: .4byte 0 .4byte 0xFFFFFFFF - .byte4 restructUpLeft__Q33hel4math10Direction3Fv + .4byte restructUpLeft__Q33hel4math10Direction3Fv .global $$254840 $$254840: .4byte 0 .4byte 0xFFFFFFFF - .byte4 restructUpFront__Q33hel4math10Direction3Fv + .4byte restructUpFront__Q33hel4math10Direction3Fv .global $$254854 $$254854: .4byte 0 .4byte 0xFFFFFFFF - .byte4 restructFrontLeft__Q33hel4math10Direction3Fv + .4byte restructFrontLeft__Q33hel4math10Direction3Fv .global $$254863 $$254863: .4byte 0 .4byte 0xFFFFFFFF - .byte4 restructFrontUp__Q33hel4math10Direction3Fv + .4byte restructFrontUp__Q33hel4math10Direction3Fv .asciz "Assertion failed.\n" .balign 4 .asciz "MintFuncProxy.hpp" diff --git a/asm/src/AddOnMint.s b/asm/src/AddOnMint.s index f26a6404..2d8f91e7 100644 --- a/asm/src/AddOnMint.s +++ b/asm/src/AddOnMint.s @@ -31648,57 +31648,57 @@ $$255070: $$255246: .4byte 0 .4byte 0xFFFFFFFF - .byte4 currentG3DAnimIndex__Q24gobj12MintGearAnimCFv + .4byte currentG3DAnimIndex__Q24gobj12MintGearAnimCFv .global $$255273 $$255273: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setFrameRate__Q24gobj12MintGearAnimCFf + .4byte setFrameRate__Q24gobj12MintGearAnimCFf .global $$255285 $$255285: .4byte 0 .4byte 0xFFFFFFFF - .byte4 frameRate__Q24gobj12MintGearAnimCFv + .4byte frameRate__Q24gobj12MintGearAnimCFv .global $$255299 $$255299: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isLooped__Q24gobj12MintGearAnimCFv + .4byte isLooped__Q24gobj12MintGearAnimCFv .global $$255318 $$255318: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isAnimEnd__Q24gobj12MintGearAnimCFv + .4byte isAnimEnd__Q24gobj12MintGearAnimCFv .global $$255327 $$255327: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setFrame__Q24gobj12MintGearAnimFf + .4byte setFrame__Q24gobj12MintGearAnimFf .global $$255336 $$255336: .4byte 0 .4byte 0xFFFFFFFF - .byte4 totalFrame__Q24gobj12MintGearAnimCFv + .4byte totalFrame__Q24gobj12MintGearAnimCFv .global $$255350 $$255350: .4byte 0 .4byte 0xFFFFFFFF - .byte4 frame__Q24gobj12MintGearAnimCFv + .4byte frame__Q24gobj12MintGearAnimCFv .global $$255359 $$255359: .4byte 0 .4byte 0xFFFFFFFF - .byte4 start__Q24gobj12MintGearAnimCFUlbUl + .4byte start__Q24gobj12MintGearAnimCFUlbUl .global $$255366 $$255366: .4byte 0 .4byte 0xFFFFFFFF - .byte4 start__Q24gobj12MintGearAnimCFUlb + .4byte start__Q24gobj12MintGearAnimCFUlb .global $$255373 $$255373: .4byte 0 .4byte 0xFFFFFFFF - .byte4 start__Q24gobj12MintGearAnimCFUl + .4byte start__Q24gobj12MintGearAnimCFUl .asciz "Assertion failed.\n" .balign 4 .asciz "MintFuncProxy.hpp" @@ -31977,56 +31977,56 @@ $$255596: __vt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers18StateRainBombStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers18StateRainBombStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1Fv - .byte4 create__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers18StateRainBombStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1Fv + .4byte __dt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers18StateRainBombStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1Fv + .4byte create__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers18StateRainBombStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1Fv .global __vt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers9StateBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers9StateBomb6Config$$1 __vt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers9StateBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers9StateBomb6Config$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers9StateBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers9StateBomb6Config$$1Fv - .byte4 create__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers9StateBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers9StateBomb6Config$$1Fv + .4byte __dt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers9StateBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers9StateBomb6Config$$1Fv + .4byte create__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers9StateBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers9StateBomb6Config$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers14StateBombStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers14StateBombStart$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers14StateBombStart$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers14StateBombStart$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers14StateBombStart$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers14StateBombStart$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateSwingPursuit$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateSwingPursuit$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateSwingPursuit$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateSwingPursuit$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateSwingPursuit$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateSwingPursuit$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers10StateSwing$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers10StateSwing$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers10StateSwing$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers10StateSwing$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers10StateSwing$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers10StateSwing$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateJumpBigStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateJumpBigStart$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateJumpBigStart$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateJumpBigStart$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateJumpBigStart$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateJumpBigStart$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util165StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1 __vt__Q24util165StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util165StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1Fv - .byte4 create__Q24util165StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1Fv + .4byte __dt__Q24util165StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1Fv + .4byte create__Q24util165StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1Fv .global __vt__Q24util173StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1 __vt__Q24util173StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util173StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1Fv - .byte4 create__Q24util173StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1Fv + .4byte __dt__Q24util173StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1Fv + .4byte create__Q24util173StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1Fv .global __vt__Q24util170StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1 __vt__Q24util170StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util170StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1Fv - .byte4 create__Q24util170StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1Fv + .4byte __dt__Q24util170StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1Fv + .4byte create__Q24util170StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -32074,8 +32074,8 @@ $$254529: __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSummon$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSummon$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSummon$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSummon$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSummon$$4PQ43scn4step4boss4Boss$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -32131,50 +32131,50 @@ $$255081: __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateShot$$4PQ43scn4step4boss4Boss$$4f$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateShot$$4PQ43scn4step4boss4Boss$$4f$$1Fv - .byte4 create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateShot$$4PQ43scn4step4boss4Boss$$4f$$1Fv + .4byte __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateShot$$4PQ43scn4step4boss4Boss$$4f$$1Fv + .4byte create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateShot$$4PQ43scn4step4boss4Boss$$4f$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior21StateMoveThunderStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior21StateMoveThunderStart$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior21StateMoveThunderStart$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior21StateMoveThunderStart$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior21StateMoveThunderStart$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior21StateMoveThunderStart$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateThunderStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateThunderStart$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateThunderStart$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateThunderStart$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateThunderStart$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateThunderStart$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior10StateGlide$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior10StateGlide$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior10StateGlide$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior10StateGlide$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior10StateGlide$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior10StateGlide$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateDash$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateDash$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateDash$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateDash$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateDash$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateDash$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateHeightAdjust$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateHeightAdjust$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateHeightAdjust$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateHeightAdjust$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateHeightAdjust$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateHeightAdjust$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior20StateMoveToOtherSide$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior20StateMoveToOtherSide$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior20StateMoveToOtherSide$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior20StateMoveToOtherSide$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior20StateMoveToOtherSide$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior20StateMoveToOtherSide$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateCall$$4PQ43scn4step4boss4Boss$$4Ul$$1 __vt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateCall$$4PQ43scn4step4boss4Boss$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateCall$$4PQ43scn4step4boss4Boss$$4Ul$$1Fv - .byte4 create__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateCall$$4PQ43scn4step4boss4Boss$$4Ul$$1Fv + .4byte __dt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateCall$$4PQ43scn4step4boss4Boss$$4Ul$$1Fv + .4byte create__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateCall$$4PQ43scn4step4boss4Boss$$4Ul$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -32225,44 +32225,44 @@ $$254633: __vt__Q24util228StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util228StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv - .byte4 create__Q24util228StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv + .4byte __dt__Q24util228StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv + .4byte create__Q24util228StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv .global __vt__Q24util140StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10gigantedge9StateShot$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss10gigantedge9StateShot6Config$$1 __vt__Q24util140StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10gigantedge9StateShot$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss10gigantedge9StateShot6Config$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util140StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10gigantedge9StateShot$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss10gigantedge9StateShot6Config$$1Fv - .byte4 create__Q24util140StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10gigantedge9StateShot$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss10gigantedge9StateShot6Config$$1Fv + .4byte __dt__Q24util140StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10gigantedge9StateShot$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss10gigantedge9StateShot6Config$$1Fv + .4byte create__Q24util140StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10gigantedge9StateShot$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss10gigantedge9StateShot6Config$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10gigantedge10StateGuard$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10gigantedge10StateGuard$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10gigantedge10StateGuard$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10gigantedge10StateGuard$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10gigantedge10StateGuard$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10gigantedge10StateGuard$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util251StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1 __vt__Q24util251StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util251StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv - .byte4 create__Q24util251StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv + .4byte __dt__Q24util251StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv + .4byte create__Q24util251StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv .global __vt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common13StateMoveBack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1 __vt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common13StateMoveBack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common13StateMoveBack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv - .byte4 create__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common13StateMoveBack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv + .4byte __dt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common13StateMoveBack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv + .4byte create__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common13StateMoveBack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv .global __vt__Q24util177StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1 __vt__Q24util177StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util177StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv - .byte4 create__Q24util177StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv + .4byte __dt__Q24util177StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv + .4byte create__Q24util177StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv .global __vt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1 __vt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv - .byte4 create__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv + .4byte __dt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv + .4byte create__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -32322,56 +32322,56 @@ $$255284: __vt__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo17StateChargeAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss8kingsdoo17StateChargeAttack6Config$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo17StateChargeAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss8kingsdoo17StateChargeAttack6Config$$1Fv - .byte4 create__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo17StateChargeAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss8kingsdoo17StateChargeAttack6Config$$1Fv + .4byte __dt__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo17StateChargeAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss8kingsdoo17StateChargeAttack6Config$$1Fv + .4byte create__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo17StateChargeAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss8kingsdoo17StateChargeAttack6Config$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo22StateChargeAttackStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo22StateChargeAttackStart$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo22StateChargeAttackStart$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo22StateChargeAttackStart$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo22StateChargeAttackStart$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo22StateChargeAttackStart$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo21StateJumpCenterAttack$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo21StateJumpCenterAttack$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo21StateJumpCenterAttack$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo21StateJumpCenterAttack$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo21StateJumpCenterAttack$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo21StateJumpCenterAttack$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1 __vt__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv - .byte4 create__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv + .4byte __dt__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv + .4byte create__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv .global __vt__Q24util210StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1 __vt__Q24util210StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util210StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv - .byte4 create__Q24util210StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv + .4byte __dt__Q24util210StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv + .4byte create__Q24util210StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv .global __vt__Q24util242StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1 __vt__Q24util242StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util242StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv - .byte4 create__Q24util242StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv + .4byte __dt__Q24util242StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv + .4byte create__Q24util242StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv .global __vt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1 __vt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv - .byte4 create__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv + .4byte __dt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv + .4byte create__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv .global __vt__Q24util171StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1 __vt__Q24util171StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util171StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv - .byte4 create__Q24util171StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv + .4byte __dt__Q24util171StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv + .4byte create__Q24util171StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -32445,62 +32445,62 @@ $$254420: __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateTornadoRise$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateTornadoRise$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateTornadoRise$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateTornadoRise$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateTornadoRise$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateRollingStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateRollingStart$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateRollingStart$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateRollingStart$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateRollingStart$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateRollingStart$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$1 __vt__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv - .byte4 create__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv + .4byte __dt__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv + .4byte create__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv .global __vt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath10ScriptKind$$1 __vt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv - .byte4 create__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv + .4byte __dt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv + .4byte create__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv .global __vt__Q24util146StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath13StateRollJump$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9moundeath13StateRollJump6Config$$1 __vt__Q24util146StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath13StateRollJump$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9moundeath13StateRollJump6Config$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util146StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath13StateRollJump$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9moundeath13StateRollJump6Config$$1Fv - .byte4 create__Q24util146StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath13StateRollJump$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9moundeath13StateRollJump6Config$$1Fv + .4byte __dt__Q24util146StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath13StateRollJump$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9moundeath13StateRollJump6Config$$1Fv + .4byte create__Q24util146StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath13StateRollJump$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9moundeath13StateRollJump6Config$$1Fv .global __vt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1 __vt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv - .byte4 create__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv + .4byte __dt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv + .4byte create__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv .global __vt__Q24util167StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1 __vt__Q24util167StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util167StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv - .byte4 create__Q24util167StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv + .4byte __dt__Q24util167StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv + .4byte create__Q24util167StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath9StateJump$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath9StateJump$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath9StateJump$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath9StateJump$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath9StateJump$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath9StateJump$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateMoveForward$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateMoveForward$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateMoveForward$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateMoveForward$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateMoveForward$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateMoveForward$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1 __vt__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv - .byte4 create__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv + .4byte __dt__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv + .4byte create__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -32563,38 +32563,38 @@ $$254874: __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros18StateCaptureAttack$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros18StateCaptureAttack$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros18StateCaptureAttack$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros18StateCaptureAttack$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros18StateCaptureAttack$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util260StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1 __vt__Q24util260StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util260StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv - .byte4 create__Q24util260StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv + .4byte __dt__Q24util260StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv + .4byte create__Q24util260StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv .global __vt__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateQuivery$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss13watergalboros12StateQuivery6Config$$1 __vt__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateQuivery$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss13watergalboros12StateQuivery6Config$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateQuivery$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss13watergalboros12StateQuivery6Config$$1Fv - .byte4 create__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateQuivery$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss13watergalboros12StateQuivery6Config$$1Fv + .4byte __dt__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateQuivery$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss13watergalboros12StateQuivery6Config$$1Fv + .4byte create__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateQuivery$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss13watergalboros12StateQuivery6Config$$1Fv .global __vt__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1 __vt__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv - .byte4 create__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv + .4byte __dt__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv + .4byte create__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv .global __vt__Q24util149StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros16StateAttackJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1 __vt__Q24util149StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros16StateAttackJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util149StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros16StateAttackJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv - .byte4 create__Q24util149StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros16StateAttackJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv + .4byte __dt__Q24util149StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros16StateAttackJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv + .4byte create__Q24util149StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros16StateAttackJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv .global __vt__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1 __vt__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv - .byte4 create__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv + .4byte __dt__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv + .4byte create__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -32665,38 +32665,38 @@ $$254712: __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy15StateRootAttack$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy15StateRootAttack$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy15StateRootAttack$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy15StateRootAttack$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy15StateRootAttack$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateVacuumStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateVacuumStart$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateVacuumStart$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateVacuumStart$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateVacuumStart$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateVacuumStart$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util134StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateFallEnemy$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6whispy10ScriptKind$$4Ul$$1 __vt__Q24util134StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateFallEnemy$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6whispy10ScriptKind$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util134StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateFallEnemy$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6whispy10ScriptKind$$4Ul$$1Fv - .byte4 create__Q24util134StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateFallEnemy$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6whispy10ScriptKind$$4Ul$$1Fv + .4byte __dt__Q24util134StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateFallEnemy$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6whispy10ScriptKind$$4Ul$$1Fv + .4byte create__Q24util134StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateFallEnemy$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6whispy10ScriptKind$$4Ul$$1Fv .global __vt__Q24util113StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy23StateShotAirBallTornado$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1 __vt__Q24util113StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy23StateShotAirBallTornado$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util113StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy23StateShotAirBallTornado$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1Fv - .byte4 create__Q24util113StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy23StateShotAirBallTornado$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1Fv + .4byte __dt__Q24util113StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy23StateShotAirBallTornado$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1Fv + .4byte create__Q24util113StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy23StateShotAirBallTornado$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1Fv .global __vt__Q24util109StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy19StateShotAirBallBig$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1 __vt__Q24util109StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy19StateShotAirBallBig$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util109StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy19StateShotAirBallBig$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1Fv - .byte4 create__Q24util109StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy19StateShotAirBallBig$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1Fv + .4byte __dt__Q24util109StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy19StateShotAirBallBig$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1Fv + .4byte create__Q24util109StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy19StateShotAirBallBig$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1Fv .global __vt__Q24util106StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateShotAirBall$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1 __vt__Q24util106StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateShotAirBall$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateShotAirBall$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1Fv - .byte4 create__Q24util106StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateShotAirBall$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1Fv + .4byte __dt__Q24util106StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateShotAirBall$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1Fv + .4byte create__Q24util106StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateShotAirBall$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -32755,38 +32755,38 @@ $$256484: __vt__Q24util212StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util212StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv - .byte4 create__Q24util212StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv + .4byte __dt__Q24util212StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv + .4byte create__Q24util212StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv .global __vt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1 __vt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1Fv - .byte4 create__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1Fv + .4byte __dt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1Fv + .4byte create__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1Fv .global __vt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble11StateAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble11StateAttack6Config$$1 __vt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble11StateAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble11StateAttack6Config$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble11StateAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble11StateAttack6Config$$1Fv - .byte4 create__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble11StateAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble11StateAttack6Config$$1Fv + .4byte __dt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble11StateAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble11StateAttack6Config$$1Fv + .4byte create__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble11StateAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble11StateAttack6Config$$1Fv .global __vt__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1 __vt__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv - .byte4 create__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv + .4byte __dt__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv + .4byte create__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv .global __vt__Q24util175StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1 __vt__Q24util175StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util175StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv - .byte4 create__Q24util175StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv + .4byte __dt__Q24util175StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv + .4byte create__Q24util175StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv .global __vt__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1 __vt__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv - .byte4 create__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv + .4byte __dt__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv + .4byte create__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -33236,72 +33236,72 @@ $$258935: $$259186: .4byte 0 .4byte 0xFFFFFFFF - .byte4 releaseAndVanish__Q43scn4step5chara10MintEffectCFv + .4byte releaseAndVanish__Q43scn4step5chara10MintEffectCFv .global $$259211 $$259211: .4byte 0 .4byte 0xFFFFFFFF - .byte4 release__Q43scn4step5chara10MintEffectCFv + .4byte release__Q43scn4step5chara10MintEffectCFv .global $$259220 $$259220: .4byte 0 .4byte 0xFFFFFFFF - .byte4 requestND__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math10Direction3RCQ33hel4math7Vector3f + .4byte requestND__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math10Direction3RCQ33hel4math7Vector3f .global $$259229 $$259229: .4byte 0 .4byte 0xFFFFFFFF - .byte4 requestND__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math10Direction3RCQ33hel4math7Vector3 + .4byte requestND__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math10Direction3RCQ33hel4math7Vector3 .global $$259238 $$259238: .4byte 0 .4byte 0xFFFFFFFF - .byte4 requestND__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math10Direction3f + .4byte requestND__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math10Direction3f .global $$259246 $$259246: .4byte 0 .4byte 0xFFFFFFFF - .byte4 requestND__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math10Direction3 + .4byte requestND__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math10Direction3 .global $$259254 $$259254: .4byte 0 .4byte 0xFFFFFFFF - .byte4 requestN__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math7Vector3f + .4byte requestN__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math7Vector3f .global $$259262 $$259262: .4byte 0 .4byte 0xFFFFFFFF - .byte4 requestN__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math7Vector3 + .4byte requestN__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math7Vector3 .global $$259270 $$259270: .4byte 0 .4byte 0xFFFFFFFF - .byte4 requestN__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlf + .4byte requestN__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlf .global $$259277 $$259277: .4byte 0 .4byte 0xFFFFFFFF - .byte4 requestN__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUl + .4byte requestN__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUl .global $$259284 $$259284: .4byte 0 .4byte 0xFFFFFFFF - .byte4 requestPD__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindRCQ33hel4math7Vector3RCQ33hel4math10Direction3f + .4byte requestPD__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindRCQ33hel4math7Vector3RCQ33hel4math10Direction3f .global $$259293 $$259293: .4byte 0 .4byte 0xFFFFFFFF - .byte4 requestPD__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindRCQ33hel4math7Vector3RCQ33hel4math10Direction3 + .4byte requestPD__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindRCQ33hel4math7Vector3RCQ33hel4math10Direction3 .global $$259302 $$259302: .4byte 0 .4byte 0xFFFFFFFF - .byte4 requestP__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindRCQ33hel4math7Vector3f + .4byte requestP__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindRCQ33hel4math7Vector3f .global $$259310 $$259310: .4byte 0 .4byte 0xFFFFFFFF - .byte4 requestP__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindRCQ33hel4math7Vector3 + .4byte requestP__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindRCQ33hel4math7Vector3 .asciz "Assertion failed.\n" .balign 4 .asciz "MintFuncProxy.hpp" @@ -33509,8 +33509,8 @@ $$256086: __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common8StateFly$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -33519,20 +33519,20 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common8Stat __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -33584,32 +33584,32 @@ $$255904: __vt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight13StateStepBack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight13StateStepBack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight13StateStepBack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight13StateStepBack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight13StateStepBack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight13StateStepBack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight9StateWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight17StateDoubleAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight17StateDoubleAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight17StateDoubleAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight17StateDoubleAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight17StateDoubleAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight17StateDoubleAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -33653,50 +33653,50 @@ $$256086: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper10StateChase$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateDive$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateDive$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateDive$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateDive$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateDive$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateDive$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper14StateFlyingOut$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper14StateFlyingOut$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper14StateFlyingOut$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper14StateFlyingOut$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper14StateFlyingOut$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper14StateFlyingOut$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateMove$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -33737,20 +33737,20 @@ $$255839: __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -33789,8 +33789,8 @@ $$255844: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5bowby11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5bowby11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5bowby11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5bowby11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5bowby11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -33853,20 +33853,20 @@ $$255723: __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -33907,8 +33907,8 @@ $$255984: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -33958,26 +33958,26 @@ $$255887: __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly9StateMove$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateLookAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateLookAround$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateLookAround$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateLookAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateLookAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateLookAround$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateCreditMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateCreditMove$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateCreditMove$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateCreditMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateCreditMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateCreditMove$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34001,8 +34001,8 @@ $$255522: __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateDive$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateDive$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateDive$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateDive$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateDive$$4PQ43scn4step5enemy5Enemy$$1Fv .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255869 @@ -34025,8 +34025,8 @@ $$255872: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout10StateChase$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34067,20 +34067,20 @@ $$255906: __vt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateBack$$4PQ43scn4step5enemy5Enemy$$4f$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateBack$$4PQ43scn4step5enemy5Enemy$$4f$$1Fv - .byte4 create__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateBack$$4PQ43scn4step5enemy5Enemy$$4f$$1Fv + .4byte __dt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateBack$$4PQ43scn4step5enemy5Enemy$$4f$$1Fv + .4byte create__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateBack$$4PQ43scn4step5enemy5Enemy$$4f$$1Fv .global __vt__Q24util98StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateMove$$4PQ43scn4step5enemy5Enemy$$4f$$4f$$1 __vt__Q24util98StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateMove$$4PQ43scn4step5enemy5Enemy$$4f$$4f$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateMove$$4PQ43scn4step5enemy5Enemy$$4f$$4f$$1Fv - .byte4 create__Q24util98StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateMove$$4PQ43scn4step5enemy5Enemy$$4f$$4f$$1Fv + .4byte __dt__Q24util98StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateMove$$4PQ43scn4step5enemy5Enemy$$4f$$4f$$1Fv + .4byte create__Q24util98StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateMove$$4PQ43scn4step5enemy5Enemy$$4f$$4f$$1Fv .global __vt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr8StateFly$$4PQ43scn4step5enemy5Enemy$$4f$$1 __vt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr8StateFly$$4PQ43scn4step5enemy5Enemy$$4f$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr8StateFly$$4PQ43scn4step5enemy5Enemy$$4f$$1Fv - .byte4 create__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr8StateFly$$4PQ43scn4step5enemy5Enemy$$4f$$1Fv + .4byte __dt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr8StateFly$$4PQ43scn4step5enemy5Enemy$$4f$$1Fv + .4byte create__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr8StateFly$$4PQ43scn4step5enemy5Enemy$$4f$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34182,20 +34182,20 @@ $$256644: __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34204,14 +34204,14 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer11Sta __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateChase$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateAgony$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateAgony$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateAgony$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateAgony$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateAgony$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateAgony$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34220,24 +34220,24 @@ __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10Sta __vt__Q53scn4step5enemy6flamer12StateMoveCCW: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6flamer12StateMoveCCWFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy6flamer9StateMoveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6flamer9StateMoveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv - .byte4 isInitCWR__Q53scn4step5enemy6flamer12StateMoveCCWCFv + .4byte __dt__Q53scn4step5enemy6flamer12StateMoveCCWFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy6flamer9StateMoveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6flamer9StateMoveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte isInitCWR__Q53scn4step5enemy6flamer12StateMoveCCWCFv .global __vt__Q53scn4step5enemy6flamer12StateMoveCWR __vt__Q53scn4step5enemy6flamer12StateMoveCWR: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6flamer12StateMoveCWRFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy6flamer9StateMoveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6flamer9StateMoveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv - .byte4 isInitCWR__Q53scn4step5enemy6flamer12StateMoveCWRCFv + .4byte __dt__Q53scn4step5enemy6flamer12StateMoveCWRFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy6flamer9StateMoveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6flamer9StateMoveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte isInitCWR__Q53scn4step5enemy6flamer12StateMoveCWRCFv .asciz "Assertion failed.\n" .balign 4 .asciz "MintFuncProxy.hpp" @@ -34266,14 +34266,14 @@ $$255576: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra8StateFly$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra8StateFly$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34316,14 +34316,14 @@ $$255995: __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34370,14 +34370,14 @@ $$255982: __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead15StateAttackShot$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead15StateAttackShot$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead15StateAttackShot$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead15StateAttackShot$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead15StateAttackShot$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead17StateAttackBreath$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead17StateAttackBreath$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead17StateAttackBreath$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead17StateAttackBreath$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead17StateAttackBreath$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead17StateAttackBreath$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34419,14 +34419,14 @@ $$255959: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateFollow$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateFollow$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateFollow$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateFollow$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateFollow$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34473,26 +34473,26 @@ $$256142: __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu15StateMoveAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu15StateMoveAround$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu15StateMoveAround$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu15StateMoveAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu15StateMoveAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu15StateMoveAround$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateMove$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34538,20 +34538,20 @@ $$256087: __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe17StateWalkStepBack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe17StateWalkStepBack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe17StateWalkStepBack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe17StateWalkStepBack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe17StateWalkStepBack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe17StateWalkStepBack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34594,26 +34594,26 @@ $$255834: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34637,14 +34637,14 @@ $$255607: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34665,8 +34665,8 @@ $$255632: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies10StateChase$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255490 @@ -34680,8 +34680,8 @@ $$255491: __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5noddy9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5noddy9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5noddy9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5noddy9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5noddy9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255673 @@ -34711,20 +34711,20 @@ $$255678: __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStay$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStay$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStay$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStay$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStay$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStay$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34761,26 +34761,26 @@ $$255893: __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateFlyWaitFix$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateFlyWaitFix$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateFlyWaitFix$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateFlyWaitFix$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateFlyWaitFix$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack1Way$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack1Way$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack1Way$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack1Way$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack1Way$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack1Way$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack3Way$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack3Way$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack3Way$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack3Way$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack3Way$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack3Way$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34820,14 +34820,14 @@ $$255985: __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr9StateMove$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr10StateThrow$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr10StateThrow$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr10StateThrow$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr10StateThrow$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr10StateThrow$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr10StateThrow$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34868,14 +34868,14 @@ $$255664: __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateStay$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateStay$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateStay$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateStay$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateStay$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateWalkStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateWalkStart$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateWalkStart$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateWalkStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateWalkStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateWalkStart$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34905,8 +34905,8 @@ $$255893: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy11StateEscape$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy11StateEscape$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy11StateEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy11StateEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy11StateEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -34947,26 +34947,26 @@ $$255752: __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld11StateEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld11StateEscape$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld11StateEscape$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld11StateEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld11StateEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld11StateEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld10StateChase$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld10StateChase$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateDash$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateDash$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateDash$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateDash$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateDash$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateDash$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -35001,14 +35001,14 @@ $$255901: __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateShot$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -35056,14 +35056,14 @@ $$255931: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -35104,14 +35104,14 @@ $$255959: __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -35165,32 +35165,32 @@ $$256137: __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory17StateGroundAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory17StateGroundAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory17StateGroundAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory17StateGroundAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory17StateGroundAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory8StateFly$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory8StateFly$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -35214,14 +35214,14 @@ $$255576: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -35279,44 +35279,44 @@ $$256394: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWarp$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWarp$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWarp$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWarp$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWarp$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWarp$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateWallAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateWallAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateWallAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateWallAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateWallAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateWallAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -35352,8 +35352,8 @@ $$255576: __vt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -35378,14 +35378,14 @@ $$255576: __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -35406,8 +35406,8 @@ $$255491: __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10watergalbo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10watergalbo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10watergalbo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10watergalbo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10watergalbo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255490 @@ -35423,8 +35423,8 @@ $$255491: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6whippy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6whippy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6whippy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6whippy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6whippy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255444 @@ -36553,32 +36553,32 @@ $$259434: $$259597: .4byte 0 .4byte 0xFFFFFFFF - .byte4 effectWarp__Q43scn4step4hero8MintGearCFv + .4byte effectWarp__Q43scn4step4hero8MintGearCFv .global $$259638 $$259638: .4byte 0 .4byte 0xFFFFFFFF - .byte4 effect__Q43scn4step4hero8MintGearCFv + .4byte effect__Q43scn4step4hero8MintGearCFv .global $$259647 $$259647: .4byte 0 .4byte 0xFFFFFFFF - .byte4 anim__Q43scn4step4hero8MintGearCFv + .4byte anim__Q43scn4step4hero8MintGearCFv .global $$259669 $$259669: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isAnimExist__Q43scn4step4hero8MintGearCFv + .4byte isAnimExist__Q43scn4step4hero8MintGearCFv .global $$259683 $$259683: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setNodeVisibility__Q43scn4step4hero8MintGearCFUlb + .4byte setNodeVisibility__Q43scn4step4hero8MintGearCFUlb .global $$259690 $$259690: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setVisibility__Q43scn4step4hero8MintGearCFb + .4byte setVisibility__Q43scn4step4hero8MintGearCFb .asciz "Assertion failed.\n" .balign 4 .asciz "MintFuncProxy.hpp" diff --git a/asm/src/AddWiiRemote.s b/asm/src/AddWiiRemote.s index c5403a05..857921d4 100644 --- a/asm/src/AddWiiRemote.s +++ b/asm/src/AddWiiRemote.s @@ -1016,7 +1016,7 @@ $$253756: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_RES_PATH__Q34info6common26$$2unnamed$$2AddWiiRemote_cpp$$2 T_RES_PATH__Q34info6common26$$2unnamed$$2AddWiiRemote_cpp$$2: - .byte4 $$252041 + .4byte $$252041 .global $$253617 $$253617: .asciz "Base" diff --git a/asm/src/AdditionalMove.s b/asm/src/AdditionalMove.s index e80dc56a..0ecac471 100644 --- a/asm/src/AdditionalMove.s +++ b/asm/src/AdditionalMove.s @@ -1386,8 +1386,8 @@ __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9State __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$1Fv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260222 diff --git a/asm/src/Alarm.s b/asm/src/Alarm.s index fb150357..597f1878 100644 --- a/asm/src/Alarm.s +++ b/asm/src/Alarm.s @@ -128,14 +128,14 @@ __sinit_$$3Alarm_cpp: /* 804056BC 004014FC 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3Alarm_cpp + .4byte __sinit_$$3Alarm_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util5Alarm __vt__Q24util5Alarm: .4byte 0 .4byte 0 - .byte4 __dt__Q24util5AlarmFv + .4byte __dt__Q24util5AlarmFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/AnimScript.s b/asm/src/AnimScript.s index aa13daa2..cd5413b9 100644 --- a/asm/src/AnimScript.s +++ b/asm/src/AnimScript.s @@ -14,7 +14,7 @@ $$248724: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global PLAY_LOOP__Q24gobj10AnimScript PLAY_LOOP__Q24gobj10AnimScript: - .byte4 $$248723 + .4byte $$248723 .global PLAY_ONE_SHOT__Q24gobj10AnimScript PLAY_ONE_SHOT__Q24gobj10AnimScript: - .byte4 $$248724 + .4byte $$248724 diff --git a/asm/src/AppImpl.s b/asm/src/AppImpl.s index 7a84d7a2..85ddbcea 100644 --- a/asm/src/AppImpl.s +++ b/asm/src/AppImpl.s @@ -1560,11 +1560,11 @@ $$24$$2__dt__Q23app7AppImplFv: __vt__Q23app7AppImpl: .4byte 0 .4byte 0 - .byte4 __dt__Q23app7AppImplFv - .byte4 drawerExecDraw__Q23app7AppImplFv + .4byte __dt__Q23app7AppImplFv + .4byte drawerExecDraw__Q23app7AppImplFv .4byte 0 .4byte 0 - .byte4 $$24$$2__dt__Q23app7AppImplFv + .4byte $$24$$2__dt__Q23app7AppImplFv .global $$2STRING$$2NoName__Q33hel6common15RuntimeTypeInfoFv $$2STRING$$2NoName__Q33hel6common15RuntimeTypeInfoFv: .asciz "no name class" diff --git a/asm/src/ArrowBoard.s b/asm/src/ArrowBoard.s index 70721310..f2ea65d0 100644 --- a/asm/src/ArrowBoard.s +++ b/asm/src/ArrowBoard.s @@ -523,10 +523,10 @@ lbl_802FEAF4: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$253055 $$253055: - .byte4 $$253051 - .byte4 $$253052 - .byte4 $$253053 - .byte4 $$253054 + .4byte $$253051 + .4byte $$253052 + .4byte $$253053 + .4byte $$253054 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254295 diff --git a/asm/src/BCOpCode.s b/asm/src/BCOpCode.s index 8ad6fce7..5d1ddc35 100644 --- a/asm/src/BCOpCode.s +++ b/asm/src/BCOpCode.s @@ -462,72 +462,72 @@ $$249693: .4byte 0x801C5AC4 ;# ptr .global $$2LOCAL$$2getOpTypeName__Q26mintvm8BCOpCodeCFQ36mintvm8BCOpCode6OpType$$2table $$2LOCAL$$2getOpTypeName__Q26mintvm8BCOpCodeCFQ36mintvm8BCOpCode6OpType$$2table: - .byte4 $$249200 - .byte4 $$249201 - .byte4 $$249202 - .byte4 $$249203 - .byte4 $$249204 - .byte4 $$249205 - .byte4 $$249206 - .byte4 $$249207 - .byte4 $$249208 - .byte4 $$249209 - .byte4 $$249210 - .byte4 $$249211 - .byte4 $$249212 - .byte4 $$249213 - .byte4 $$249214 - .byte4 $$249215 - .byte4 $$249216 - .byte4 $$249217 - .byte4 $$249218 - .byte4 $$249219 - .byte4 $$249220 - .byte4 $$249221 - .byte4 $$249222 - .byte4 $$249223 - .byte4 $$249224 - .byte4 $$249225 - .byte4 $$249226 - .byte4 $$249227 - .byte4 $$249228 - .byte4 $$249229 - .byte4 $$249230 - .byte4 $$249231 - .byte4 $$249232 - .byte4 $$249233 - .byte4 $$249234 - .byte4 $$249235 - .byte4 $$249236 - .byte4 $$249237 - .byte4 $$249238 - .byte4 $$249239 - .byte4 $$249240 - .byte4 $$249241 - .byte4 $$249242 - .byte4 $$249243 - .byte4 $$249244 - .byte4 $$249245 - .byte4 $$249246 - .byte4 $$249247 - .byte4 $$249248 - .byte4 $$249249 - .byte4 $$249250 - .byte4 $$249251 - .byte4 $$249252 - .byte4 $$249253 - .byte4 $$249254 - .byte4 $$249255 - .byte4 $$249256 - .byte4 $$249257 - .byte4 $$249258 - .byte4 $$249259 - .byte4 $$249260 - .byte4 $$249261 - .byte4 $$249262 - .byte4 $$249263 - .byte4 $$249264 - .byte4 $$249265 + .4byte $$249200 + .4byte $$249201 + .4byte $$249202 + .4byte $$249203 + .4byte $$249204 + .4byte $$249205 + .4byte $$249206 + .4byte $$249207 + .4byte $$249208 + .4byte $$249209 + .4byte $$249210 + .4byte $$249211 + .4byte $$249212 + .4byte $$249213 + .4byte $$249214 + .4byte $$249215 + .4byte $$249216 + .4byte $$249217 + .4byte $$249218 + .4byte $$249219 + .4byte $$249220 + .4byte $$249221 + .4byte $$249222 + .4byte $$249223 + .4byte $$249224 + .4byte $$249225 + .4byte $$249226 + .4byte $$249227 + .4byte $$249228 + .4byte $$249229 + .4byte $$249230 + .4byte $$249231 + .4byte $$249232 + .4byte $$249233 + .4byte $$249234 + .4byte $$249235 + .4byte $$249236 + .4byte $$249237 + .4byte $$249238 + .4byte $$249239 + .4byte $$249240 + .4byte $$249241 + .4byte $$249242 + .4byte $$249243 + .4byte $$249244 + .4byte $$249245 + .4byte $$249246 + .4byte $$249247 + .4byte $$249248 + .4byte $$249249 + .4byte $$249250 + .4byte $$249251 + .4byte $$249252 + .4byte $$249253 + .4byte $$249254 + .4byte $$249255 + .4byte $$249256 + .4byte $$249257 + .4byte $$249258 + .4byte $$249259 + .4byte $$249260 + .4byte $$249261 + .4byte $$249262 + .4byte $$249263 + .4byte $$249264 + .4byte $$249265 .global $$2STRING$$2getCU1__Q26mintvm8BCOpCodeCFv$$20 $$2STRING$$2getCU1__Q26mintvm8BCOpCodeCFv$$20: .asciz "Assertion failed.\n" diff --git a/asm/src/BG.s b/asm/src/BG.s index 45109a50..e48198ef 100644 --- a/asm/src/BG.s +++ b/asm/src/BG.s @@ -313,7 +313,7 @@ startAnim__Q43scn9grandmenu4menu2BGFv: /* 803F4B20 003F0960 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3BG_cpp + .4byte __sinit_$$3BG_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253189 diff --git a/asm/src/BGLayout.s b/asm/src/BGLayout.s index 3f036784..d25ed85e 100644 --- a/asm/src/BGLayout.s +++ b/asm/src/BGLayout.s @@ -152,5 +152,5 @@ $$251999: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_LYT_RES_PATH__Q33scn10grandtitle22$$2unnamed$$2BGLayout_cpp$$2 T_LYT_RES_PATH__Q33scn10grandtitle22$$2unnamed$$2BGLayout_cpp$$2: - .byte4 $$251541 + .4byte $$251541 .4byte 0 diff --git a/asm/src/BGModel.s b/asm/src/BGModel.s index bcd734d0..d3e0f113 100644 --- a/asm/src/BGModel.s +++ b/asm/src/BGModel.s @@ -150,7 +150,7 @@ $$251679: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn14challengetitle21$$2unnamed$$2BGModel_cpp$$2 G3D_RES_FILE_PATH__Q33scn14challengetitle21$$2unnamed$$2BGModel_cpp$$2: - .byte4 $$251709 + .4byte $$251709 .global $$251840 $$251840: .4byte 0x4D617000 @@ -158,7 +158,7 @@ $$251840: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn10grandtitle21$$2unnamed$$2BGModel_cpp$$2 G3D_RES_FILE_PATH__Q33scn10grandtitle21$$2unnamed$$2BGModel_cpp$$2: - .byte4 $$251679 + .4byte $$251679 .global $$251825 $$251825: .4byte 0x4D617000 diff --git a/asm/src/BackupFileData2.s b/asm/src/BackupFileData2.s index 0e51a9fb..c9501fe0 100644 --- a/asm/src/BackupFileData2.s +++ b/asm/src/BackupFileData2.s @@ -418,16 +418,16 @@ UseMaster3AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2: challengeMasterDataTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2: .4byte 0x00000003 .4byte 0x00000003 - .byte4 UseMaster1AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2 + .4byte UseMaster1AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2 .4byte 0x00000007 .4byte 0x00000003 - .byte4 UseMaster2AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2 + .4byte UseMaster2AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2 .4byte 0x0000000A .4byte 0x00000007 - .byte4 UseMaster3AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2 + .4byte UseMaster3AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2 .4byte 0x0000000B .4byte 0x00000007 - .byte4 UseMaster3AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2 + .4byte UseMaster3AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2 .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/BinCarryItemKindUtil.s b/asm/src/BinCarryItemKindUtil.s index 6fff3606..4903a449 100644 --- a/asm/src/BinCarryItemKindUtil.s +++ b/asm/src/BinCarryItemKindUtil.s @@ -50,14 +50,14 @@ $$248732: .balign 4 .global T_FDN_NAME_TABLE__Q43scn4step3map34$$2unnamed$$2BinCarryItemKindUtil_cpp$$2 T_FDN_NAME_TABLE__Q43scn4step3map34$$2unnamed$$2BinCarryItemKindUtil_cpp$$2: - .byte4 $$248723 - .byte4 $$248724 - .byte4 $$248725 - .byte4 $$248726 - .byte4 $$248727 - .byte4 $$248728 - .byte4 $$248729 - .byte4 $$248730 - .byte4 $$248731 - .byte4 $$248725 - .byte4 $$248732 + .4byte $$248723 + .4byte $$248724 + .4byte $$248725 + .4byte $$248726 + .4byte $$248727 + .4byte $$248728 + .4byte $$248729 + .4byte $$248730 + .4byte $$248731 + .4byte $$248725 + .4byte $$248732 diff --git a/asm/src/BinDecorationKindUtil.s b/asm/src/BinDecorationKindUtil.s index 632153e9..b2d356cc 100644 --- a/asm/src/BinDecorationKindUtil.s +++ b/asm/src/BinDecorationKindUtil.s @@ -124,97 +124,97 @@ IsMonotoneIncludeFore__Q43scn4step3map21BinDecorationKindUtilFQ43scn4step3map17B .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_INFOS__Q43scn4step3map35$$2unnamed$$2BinDecorationKindUtil_cpp$$2 T_INFOS__Q43scn4step3map35$$2unnamed$$2BinDecorationKindUtil_cpp$$2: - .byte4 $$248877 + .4byte $$248877 .4byte 0x3F800000 .4byte 0 - .byte4 $$248878 + .4byte $$248878 .4byte 0x3F800000 .4byte 0 - .byte4 $$248879 + .4byte $$248879 .4byte 0x3F800000 .4byte 0 - .byte4 $$248880 + .4byte $$248880 .4byte 0x3F800000 .4byte 0 - .byte4 $$248881 + .4byte $$248881 .4byte 0x3F800000 .4byte 0 - .byte4 $$248882 + .4byte $$248882 .4byte 0x3F800000 .4byte 0 - .byte4 $$248883 + .4byte $$248883 .4byte 0x3F800000 .4byte 0 - .byte4 $$248884 + .4byte $$248884 .4byte 0x3DCCCCCD .4byte 0 - .byte4 $$248885 + .4byte $$248885 .4byte 0x3F800000 .4byte 0 - .byte4 $$248886 + .4byte $$248886 .4byte 0x3F800000 .4byte 0 - .byte4 $$248887 + .4byte $$248887 .4byte 0x3F800000 .4byte 0 - .byte4 $$248888 + .4byte $$248888 .4byte 0x3F800000 .4byte 0 - .byte4 $$248889 + .4byte $$248889 .4byte 0x3F800000 .4byte 0 - .byte4 $$248890 + .4byte $$248890 .4byte 0x3F800000 .4byte 0 - .byte4 $$248891 + .4byte $$248891 .4byte 0x3F800000 .4byte 0 - .byte4 $$248892 + .4byte $$248892 .4byte 0x3F800000 .4byte 0 - .byte4 $$248893 + .4byte $$248893 .4byte 0x3F800000 .4byte 0 - .byte4 $$248894 + .4byte $$248894 .4byte 0x3F800000 .4byte 0 - .byte4 $$248895 + .4byte $$248895 .4byte 0x3F800000 .4byte 0 - .byte4 $$248896 + .4byte $$248896 .4byte 0x3F800000 .4byte 0 - .byte4 $$248897 + .4byte $$248897 .4byte 0x3F800000 .4byte 0 - .byte4 $$248897 + .4byte $$248897 .4byte 0x3F800000 .4byte 0 - .byte4 $$248897 + .4byte $$248897 .4byte 0x3F800000 .4byte 0 - .byte4 $$248897 + .4byte $$248897 .4byte 0x3F800000 .4byte 0 - .byte4 $$248898 + .4byte $$248898 .4byte 0x3F800000 .4byte 0 - .byte4 $$248899 + .4byte $$248899 .4byte 0x3DCCCCCD .4byte 0 - .byte4 $$248900 + .4byte $$248900 .4byte 0x3DCCCCCD .4byte 0 - .byte4 $$248901 + .4byte $$248901 .4byte 0x3F800000 .4byte 0 - .byte4 $$248902 + .4byte $$248902 .4byte 0x3F800000 .4byte 0 - .byte4 $$248903 + .4byte $$248903 .4byte 0x3F800000 .4byte 0 - .byte4 $$248904 + .4byte $$248904 .4byte 0x3F800000 .4byte 0 .4byte 0 diff --git a/asm/src/Block.s b/asm/src/Block.s index 5fe19fa7..02f44ff5 100644 --- a/asm/src/Block.s +++ b/asm/src/Block.s @@ -1736,44 +1736,44 @@ $$251750: .balign 4 .global T_PARENT_NODE_NAME__Q33scn10grandtitle19$$2unnamed$$2Block_cpp$$2 T_PARENT_NODE_NAME__Q33scn10grandtitle19$$2unnamed$$2Block_cpp$$2: - .byte4 $$251713 - .byte4 $$251714 - .byte4 $$251715 - .byte4 $$251716 - .byte4 $$251717 - .byte4 $$251718 - .byte4 $$251719 - .byte4 $$251720 - .byte4 $$251721 - .byte4 $$251722 - .byte4 $$251723 - .byte4 $$251724 - .byte4 $$251725 - .byte4 $$251726 - .byte4 $$251727 - .byte4 $$251728 - .byte4 $$251729 - .byte4 $$251730 - .byte4 $$251731 - .byte4 $$251732 - .byte4 $$251733 - .byte4 $$251734 - .byte4 $$251735 - .byte4 $$251736 - .byte4 $$251737 - .byte4 $$251738 - .byte4 $$251739 - .byte4 $$251740 - .byte4 $$251741 - .byte4 $$251742 - .byte4 $$251743 - .byte4 $$251744 - .byte4 $$251745 - .byte4 $$251746 - .byte4 $$251747 - .byte4 $$251748 - .byte4 $$251749 - .byte4 $$251750 + .4byte $$251713 + .4byte $$251714 + .4byte $$251715 + .4byte $$251716 + .4byte $$251717 + .4byte $$251718 + .4byte $$251719 + .4byte $$251720 + .4byte $$251721 + .4byte $$251722 + .4byte $$251723 + .4byte $$251724 + .4byte $$251725 + .4byte $$251726 + .4byte $$251727 + .4byte $$251728 + .4byte $$251729 + .4byte $$251730 + .4byte $$251731 + .4byte $$251732 + .4byte $$251733 + .4byte $$251734 + .4byte $$251735 + .4byte $$251736 + .4byte $$251737 + .4byte $$251738 + .4byte $$251739 + .4byte $$251740 + .4byte $$251741 + .4byte $$251742 + .4byte $$251743 + .4byte $$251744 + .4byte $$251745 + .4byte $$251746 + .4byte $$251747 + .4byte $$251748 + .4byte $$251749 + .4byte $$251750 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256431 @@ -2134,7 +2134,7 @@ $$256822: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn10grandtitle19$$2unnamed$$2Block_cpp$$2 G3D_RES_FILE_PATH__Q33scn10grandtitle19$$2unnamed$$2Block_cpp$$2: - .byte4 $$251712 + .4byte $$251712 .4byte 0 .global $$251713 $$251713: diff --git a/asm/src/BlockResFiles.s b/asm/src/BlockResFiles.s index b1ab18c0..b755b649 100644 --- a/asm/src/BlockResFiles.s +++ b/asm/src/BlockResFiles.s @@ -164,7 +164,7 @@ __sinit_$$3BlockResFiles_cpp: /* 80302E60 002FECA0 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3BlockResFiles_cpp + .4byte __sinit_$$3BlockResFiles_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248773 @@ -222,126 +222,126 @@ $$248793: .balign 4 .global T_CONTEXT_TABLE__Q53scn4step7gimmick5block27$$2unnamed$$2BlockResFiles_cpp$$2 T_CONTEXT_TABLE__Q53scn4step7gimmick5block27$$2unnamed$$2BlockResFiles_cpp$$2: - .byte4 $$248773 + .4byte $$248773 .4byte 0 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248775 - .byte4 $$248776 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248775 - .byte4 $$248777 - .byte4 $$248775 - .byte4 $$248778 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248779 + .4byte $$248774 + .4byte $$248774 + .4byte $$248775 + .4byte $$248776 + .4byte $$248774 + .4byte $$248774 + .4byte $$248775 + .4byte $$248777 + .4byte $$248775 + .4byte $$248778 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248779 .4byte 0 - .byte4 $$248780 + .4byte $$248780 .4byte 0 - .byte4 $$248780 + .4byte $$248780 .4byte 0 - .byte4 $$248781 + .4byte $$248781 .4byte 0 - .byte4 $$248775 - .byte4 $$248782 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248775 - .byte4 $$248783 - .byte4 $$248775 - .byte4 $$248784 - .byte4 $$248775 - .byte4 $$248785 - .byte4 $$248775 - .byte4 $$248786 - .byte4 $$248775 - .byte4 $$248787 - .byte4 $$248775 - .byte4 $$248788 - .byte4 $$248789 + .4byte $$248775 + .4byte $$248782 + .4byte $$248774 + .4byte $$248774 + .4byte $$248775 + .4byte $$248783 + .4byte $$248775 + .4byte $$248784 + .4byte $$248775 + .4byte $$248785 + .4byte $$248775 + .4byte $$248786 + .4byte $$248775 + .4byte $$248787 + .4byte $$248775 + .4byte $$248788 + .4byte $$248789 .4byte 0 - .byte4 $$248775 - .byte4 $$248790 - .byte4 $$248791 + .4byte $$248775 + .4byte $$248790 + .4byte $$248791 .4byte 0 - .byte4 $$248792 + .4byte $$248792 .4byte 0 - .byte4 $$248793 + .4byte $$248793 .4byte 0 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 + .4byte $$248774 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248772 @@ -374,5 +374,5 @@ $$248787: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_DEFAULT_ENTRY_NAME__Q53scn4step7gimmick5block27$$2unnamed$$2BlockResFiles_cpp$$2 T_DEFAULT_ENTRY_NAME__Q53scn4step7gimmick5block27$$2unnamed$$2BlockResFiles_cpp$$2: - .byte4 $$248772 + .4byte $$248772 .4byte 0 diff --git a/asm/src/Boss.s b/asm/src/Boss.s index af776dc4..c75d989b 100644 --- a/asm/src/Boss.s +++ b/asm/src/Boss.s @@ -4191,7 +4191,7 @@ stateChanger__Q43scn4step4boss4BossFv: __vt__Q24util41StateChanger$$0Q43scn4step4boss6IState$$4256$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util41StateChanger$$0Q43scn4step4boss6IState$$4256$$1Fv + .4byte __dt__Q24util41StateChanger$$0Q43scn4step4boss6IState$$4256$$1Fv .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: .asciz "NW4R:Pointer must not be NULL (p)" diff --git a/asm/src/BossPanel.s b/asm/src/BossPanel.s index 9f33fdb7..a166cd5d 100644 --- a/asm/src/BossPanel.s +++ b/asm/src/BossPanel.s @@ -1433,7 +1433,7 @@ $$257130: $$257147: .4byte 0 .4byte 0xFFFFFFFF - .byte4 start__Q23snd11SERequestorFUl + .4byte start__Q23snd11SERequestorFUl .global $$257172 $$257172: .asciz "step/game/Main" @@ -1465,7 +1465,7 @@ $$257296: $$257322: .4byte 0 .4byte 0xFFFFFFFF - .byte4 appearParts__Q43scn4step4info9BossPanelFv + .4byte appearParts__Q43scn4step4info9BossPanelFv .global $$257433 $$257433: .asciz "PartsExN" @@ -1494,7 +1494,7 @@ $$257439: $$257458: .4byte 0 .4byte 0xFFFFFFFF - .byte4 disappearParts__Q43scn4step4info9BossPanelFUl + .4byte disappearParts__Q43scn4step4info9BossPanelFUl .global $$257542 $$257542: .asciz "CharaWhispy" @@ -1662,18 +1662,18 @@ $$257578: __vt__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$$1: .4byte 0 .4byte 0 - .byte4 __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 - .byte4 clone__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$$1CFv - .byte4 clone__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$$1CFPv - .byte4 __cl__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 + .4byte __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 + .4byte clone__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$$1CFv + .4byte clone__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$$1CFPv + .4byte __cl__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 .global __vt__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail38mem_fn_0$$0b$$4Q43scn4step4info9BossPanel$$1$$4Q33std3tr1169tuple$$0PQ43scn4step4info9BossPanel$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail38mem_fn_0$$0b$$4Q43scn4step4info9BossPanel$$1$$4Q33std3tr1169tuple$$0PQ43scn4step4info9BossPanel$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail38mem_fn_0$$0b$$4Q43scn4step4info9BossPanel$$1$$4Q33std3tr1169tuple$$0PQ43scn4step4info9BossPanel$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv - .byte4 clone__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail38mem_fn_0$$0b$$4Q43scn4step4info9BossPanel$$1$$4Q33std3tr1169tuple$$0PQ43scn4step4info9BossPanel$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv - .byte4 clone__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail38mem_fn_0$$0b$$4Q43scn4step4info9BossPanel$$1$$4Q33std3tr1169tuple$$0PQ43scn4step4info9BossPanel$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv - .byte4 __cl__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail38mem_fn_0$$0b$$4Q43scn4step4info9BossPanel$$1$$4Q33std3tr1169tuple$$0PQ43scn4step4info9BossPanel$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte __dt__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail38mem_fn_0$$0b$$4Q43scn4step4info9BossPanel$$1$$4Q33std3tr1169tuple$$0PQ43scn4step4info9BossPanel$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte clone__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail38mem_fn_0$$0b$$4Q43scn4step4info9BossPanel$$1$$4Q33std3tr1169tuple$$0PQ43scn4step4info9BossPanel$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv + .4byte clone__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail38mem_fn_0$$0b$$4Q43scn4step4info9BossPanel$$1$$4Q33std3tr1169tuple$$0PQ43scn4step4info9BossPanel$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv + .4byte __cl__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail38mem_fn_0$$0b$$4Q43scn4step4info9BossPanel$$1$$4Q33std3tr1169tuple$$0PQ43scn4step4info9BossPanel$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -1684,10 +1684,10 @@ __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: .4byte 0 .4byte 0 - .byte4 __dt__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$$1Fv - .byte4 clone__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$$1CFv - .byte4 clone__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$$1CFPv - .byte4 __cl__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$$1Fv + .4byte __dt__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$$1Fv + .4byte clone__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$$1CFv + .4byte clone__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$$1CFPv + .4byte __cl__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$$1Fv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/BrainAttack.s b/asm/src/BrainAttack.s index ca4b563a..454a5dc9 100644 --- a/asm/src/BrainAttack.s +++ b/asm/src/BrainAttack.s @@ -828,17 +828,17 @@ __dt__Q53scn4step5enemy6whippy11BrainAttackFv: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateLostHat$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateLostHat$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateLostHat$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateLostHat$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateLostHat$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5cappy11BrainAttack __vt__Q53scn4step5enemy5cappy11BrainAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5cappy11BrainAttackFv - .byte4 onStart__Q53scn4step5enemy5cappy11BrainAttackFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy5cappy11BrainAttackFv - .byte4 update__Q53scn4step5enemy5cappy11BrainAttackFv + .4byte __dt__Q53scn4step5enemy5cappy11BrainAttackFv + .4byte onStart__Q53scn4step5enemy5cappy11BrainAttackFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy5cappy11BrainAttackFv + .4byte update__Q53scn4step5enemy5cappy11BrainAttackFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -846,17 +846,17 @@ __vt__Q53scn4step5enemy5cappy11BrainAttack: __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec10StateChase$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4elec11BrainAttack __vt__Q53scn4step5enemy4elec11BrainAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4elec11BrainAttackFv - .byte4 onStart__Q53scn4step5enemy4elec11BrainAttackFv - .byte4 onRecover__Q53scn4step5enemy4elec11BrainAttackFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy4elec11BrainAttackFv + .4byte onStart__Q53scn4step5enemy4elec11BrainAttackFv + .4byte onRecover__Q53scn4step5enemy4elec11BrainAttackFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -864,11 +864,11 @@ __vt__Q53scn4step5enemy4elec11BrainAttack: __vt__Q53scn4step5enemy6flamer11BrainAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6flamer11BrainAttackFv - .byte4 onStart__Q53scn4step5enemy6flamer11BrainAttackFv - .byte4 onRecover__Q53scn4step5enemy6flamer11BrainAttackFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6flamer11BrainAttackFv + .4byte onStart__Q53scn4step5enemy6flamer11BrainAttackFv + .4byte onRecover__Q53scn4step5enemy6flamer11BrainAttackFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -876,17 +876,17 @@ __vt__Q53scn4step5enemy6flamer11BrainAttack: __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy7gigatzo11BrainAttack __vt__Q53scn4step5enemy7gigatzo11BrainAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7gigatzo11BrainAttackFv - .byte4 onStart__Q53scn4step5enemy7gigatzo11BrainAttackFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy7gigatzo11BrainAttackFv + .4byte onStart__Q53scn4step5enemy7gigatzo11BrainAttackFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -894,11 +894,11 @@ __vt__Q53scn4step5enemy7gigatzo11BrainAttack: __vt__Q53scn4step5enemy7hothead11BrainAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7hothead11BrainAttackFv - .byte4 onStart__Q53scn4step5enemy7hothead11BrainAttackFv - .byte4 onRecover__Q53scn4step5enemy7hothead11BrainAttackFv - .byte4 onLanding__Q53scn4step5enemy7hothead11BrainAttackFv - .byte4 update__Q53scn4step5enemy7hothead11BrainAttackFv + .4byte __dt__Q53scn4step5enemy7hothead11BrainAttackFv + .4byte onStart__Q53scn4step5enemy7hothead11BrainAttackFv + .4byte onRecover__Q53scn4step5enemy7hothead11BrainAttackFv + .4byte onLanding__Q53scn4step5enemy7hothead11BrainAttackFv + .4byte update__Q53scn4step5enemy7hothead11BrainAttackFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -906,17 +906,17 @@ __vt__Q53scn4step5enemy7hothead11BrainAttack: __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6leafan11BrainAttack __vt__Q53scn4step5enemy6leafan11BrainAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6leafan11BrainAttackFv - .byte4 onStart__Q53scn4step5enemy6leafan11BrainAttackFv - .byte4 onRecover__Q53scn4step5enemy6leafan11BrainAttackFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6leafan11BrainAttackFv + .4byte onStart__Q53scn4step5enemy6leafan11BrainAttackFv + .4byte onRecover__Q53scn4step5enemy6leafan11BrainAttackFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -924,11 +924,11 @@ __vt__Q53scn4step5enemy6leafan11BrainAttack: __vt__Q53scn4step5enemy10watergalbo11BrainAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10watergalbo11BrainAttackFv - .byte4 onStart__Q43scn4step5enemy9BrainBaseFv - .byte4 onRecover__Q53scn4step5enemy10watergalbo11BrainAttackFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy10watergalbo11BrainAttackFv + .4byte onStart__Q43scn4step5enemy9BrainBaseFv + .4byte onRecover__Q53scn4step5enemy10watergalbo11BrainAttackFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -936,9 +936,9 @@ __vt__Q53scn4step5enemy10watergalbo11BrainAttack: __vt__Q53scn4step5enemy6whippy11BrainAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6whippy11BrainAttackFv - .byte4 onStart__Q53scn4step5enemy6whippy11BrainAttackFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6whippy11BrainAttackFv + .4byte onStart__Q53scn4step5enemy6whippy11BrainAttackFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainAttackStraight.s b/asm/src/BrainAttackStraight.s index 5be0a6e0..9e01e4f0 100644 --- a/asm/src/BrainAttackStraight.s +++ b/asm/src/BrainAttackStraight.s @@ -226,17 +226,17 @@ __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous17 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8needlous19BrainAttackStraight __vt__Q53scn4step5enemy8needlous19BrainAttackStraight: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8needlous19BrainAttackStraightFv - .byte4 onStart__Q43scn4step5enemy9BrainBaseFv - .byte4 onRecover__Q53scn4step5enemy8needlous19BrainAttackStraightFv - .byte4 onLanding__Q53scn4step5enemy8needlous19BrainAttackStraightFv - .byte4 update__Q53scn4step5enemy8needlous19BrainAttackStraightFv + .4byte __dt__Q53scn4step5enemy8needlous19BrainAttackStraightFv + .4byte onStart__Q43scn4step5enemy9BrainBaseFv + .4byte onRecover__Q53scn4step5enemy8needlous19BrainAttackStraightFv + .4byte onLanding__Q53scn4step5enemy8needlous19BrainAttackStraightFv + .4byte update__Q53scn4step5enemy8needlous19BrainAttackStraightFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/BrainBase.s b/asm/src/BrainBase.s index 03f5bb7e..5b55c0a8 100644 --- a/asm/src/BrainBase.s +++ b/asm/src/BrainBase.s @@ -57,9 +57,9 @@ lbl_8027EE78: __vt__Q43scn4step5enemy9BrainBase: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step5enemy9BrainBaseFv - .byte4 onStart__Q43scn4step5enemy9BrainBaseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q43scn4step5enemy9BrainBaseFv + .4byte onStart__Q43scn4step5enemy9BrainBaseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainBound.s b/asm/src/BrainBound.s index 0d4c3751..1af579b9 100644 --- a/asm/src/BrainBound.s +++ b/asm/src/BrainBound.s @@ -79,15 +79,15 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect10StateBound$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect10StateBound$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect10StateBound$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect10StateBound$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect10StateBound$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10stareffect10BrainBound __vt__Q53scn4step5enemy10stareffect10BrainBound: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10stareffect10BrainBoundFv - .byte4 onStart__Q53scn4step5enemy10stareffect10BrainBoundFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy10stareffect10BrainBoundFv + .4byte onStart__Q53scn4step5enemy10stareffect10BrainBoundFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainChase.s b/asm/src/BrainChase.s index eed6ce6a..2eced8a2 100644 --- a/asm/src/BrainChase.s +++ b/asm/src/BrainChase.s @@ -621,11 +621,11 @@ __dt__Q53scn4step5enemy5sheld10BrainChaseFv: __vt__Q53scn4step5enemy7blipper10BrainChase: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7blipper10BrainChaseFv - .byte4 onStart__Q53scn4step5enemy7blipper10BrainChaseFv - .byte4 onRecover__Q53scn4step5enemy7blipper10BrainChaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy7blipper10BrainChaseFv + .4byte onStart__Q53scn4step5enemy7blipper10BrainChaseFv + .4byte onRecover__Q53scn4step5enemy7blipper10BrainChaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -633,11 +633,11 @@ __vt__Q53scn4step5enemy7blipper10BrainChase: __vt__Q53scn4step5enemy6degout10BrainChase: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6degout10BrainChaseFv - .byte4 onStart__Q53scn4step5enemy6degout10BrainChaseFv - .byte4 onRecover__Q53scn4step5enemy6degout10BrainChaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6degout10BrainChaseFv + .4byte onStart__Q53scn4step5enemy6degout10BrainChaseFv + .4byte onRecover__Q53scn4step5enemy6degout10BrainChaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -645,11 +645,11 @@ __vt__Q53scn4step5enemy6degout10BrainChase: __vt__Q53scn4step5enemy7mumbies10BrainChase: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7mumbies10BrainChaseFv - .byte4 onStart__Q53scn4step5enemy7mumbies10BrainChaseFv - .byte4 onRecover__Q53scn4step5enemy7mumbies10BrainChaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy7mumbies10BrainChaseFv + .4byte onStart__Q53scn4step5enemy7mumbies10BrainChaseFv + .4byte onRecover__Q53scn4step5enemy7mumbies10BrainChaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -657,29 +657,29 @@ __vt__Q53scn4step5enemy7mumbies10BrainChase: __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateAngerChase$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateAngerChase$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateAngerChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateAngerChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateAngerChase$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateFaceChange$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateFaceChange$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateFaceChange$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateFaceChange$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateFaceChange$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateFaceChange$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy10StateChase$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy10StateChase$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6scarfy10BrainChase __vt__Q53scn4step5enemy6scarfy10BrainChase: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6scarfy10BrainChaseFv - .byte4 onStart__Q53scn4step5enemy6scarfy10BrainChaseFv - .byte4 onRecover__Q53scn4step5enemy6scarfy10BrainChaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6scarfy10BrainChaseFv + .4byte onStart__Q53scn4step5enemy6scarfy10BrainChaseFv + .4byte onRecover__Q53scn4step5enemy6scarfy10BrainChaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -687,9 +687,9 @@ __vt__Q53scn4step5enemy6scarfy10BrainChase: __vt__Q53scn4step5enemy5sheld10BrainChase: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5sheld10BrainChaseFv - .byte4 onStart__Q43scn4step5enemy9BrainBaseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy5sheld10BrainChaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy5sheld10BrainChaseFv + .4byte onStart__Q43scn4step5enemy9BrainBaseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy5sheld10BrainChaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainCreditFallToGoodbye.s b/asm/src/BrainCreditFallToGoodbye.s index 1cacbb1a..3e583d92 100644 --- a/asm/src/BrainCreditFallToGoodbye.s +++ b/asm/src/BrainCreditFallToGoodbye.s @@ -114,15 +114,15 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9State __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5rocky24BrainCreditFallToGoodbye __vt__Q53scn4step5enemy5rocky24BrainCreditFallToGoodbye: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5rocky24BrainCreditFallToGoodbyeFv - .byte4 onStart__Q53scn4step5enemy5rocky24BrainCreditFallToGoodbyeFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy5rocky24BrainCreditFallToGoodbyeFv + .4byte onStart__Q53scn4step5enemy5rocky24BrainCreditFallToGoodbyeFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainCreditPraise.s b/asm/src/BrainCreditPraise.s index ef5110e8..fcea51ec 100644 --- a/asm/src/BrainCreditPraise.s +++ b/asm/src/BrainCreditPraise.s @@ -226,17 +226,17 @@ __dt__Q53scn4step5enemy6sparky17BrainCreditPraiseFv: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common11StatePraise$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common11StatePraise$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common11StatePraise$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common11StatePraise$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common11StatePraise$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6common17BrainCreditPraise __vt__Q53scn4step5enemy6common17BrainCreditPraise: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv - .byte4 onStart__Q53scn4step5enemy6common17BrainCreditPraiseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv + .4byte onStart__Q53scn4step5enemy6common17BrainCreditPraiseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -244,11 +244,11 @@ __vt__Q53scn4step5enemy6common17BrainCreditPraise: __vt__Q53scn4step5enemy6bouncy17BrainCreditPraise: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6bouncy17BrainCreditPraiseFv - .byte4 onStart__Q53scn4step5enemy6bouncy17BrainCreditPraiseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6bouncy17BrainCreditPraiseFv + .4byte onStart__Q53scn4step5enemy6bouncy17BrainCreditPraiseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -256,9 +256,9 @@ __vt__Q53scn4step5enemy6bouncy17BrainCreditPraise: __vt__Q53scn4step5enemy6sparky17BrainCreditPraise: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6sparky17BrainCreditPraiseFv - .byte4 onStart__Q53scn4step5enemy6sparky17BrainCreditPraiseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6sparky17BrainCreditPraiseFv + .4byte onStart__Q53scn4step5enemy6sparky17BrainCreditPraiseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainCreditWalkToPraise.s b/asm/src/BrainCreditWalkToPraise.s index 182dc3cd..be56ba63 100644 --- a/asm/src/BrainCreditWalkToPraise.s +++ b/asm/src/BrainCreditWalkToPraise.s @@ -199,11 +199,11 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15Sta __vt__Q53scn4step5enemy11broomhatter23BrainCreditWalkToPraise: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11broomhatter23BrainCreditWalkToPraiseFv - .byte4 onStart__Q53scn4step5enemy11broomhatter23BrainCreditWalkToPraiseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy11broomhatter23BrainCreditWalkToPraiseFv + .4byte onStart__Q53scn4step5enemy11broomhatter23BrainCreditWalkToPraiseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -211,11 +211,11 @@ __vt__Q53scn4step5enemy11broomhatter23BrainCreditWalkToPraise: __vt__Q53scn4step5enemy6chilly23BrainCreditWalkToPraise: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6chilly23BrainCreditWalkToPraiseFv - .byte4 onStart__Q53scn4step5enemy6chilly23BrainCreditWalkToPraiseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6chilly23BrainCreditWalkToPraiseFv + .4byte onStart__Q53scn4step5enemy6chilly23BrainCreditWalkToPraiseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -223,15 +223,15 @@ __vt__Q53scn4step5enemy6chilly23BrainCreditWalkToPraise: __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee23BrainCreditWalkToPraise __vt__Q53scn4step5enemy9waddledee23BrainCreditWalkToPraise: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledee23BrainCreditWalkToPraiseFv - .byte4 onStart__Q53scn4step5enemy9waddledee23BrainCreditWalkToPraiseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy9waddledee23BrainCreditWalkToPraiseFv + .4byte onStart__Q53scn4step5enemy9waddledee23BrainCreditWalkToPraiseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainDash.s b/asm/src/BrainDash.s index 5ed72ec8..49a00035 100644 --- a/asm/src/BrainDash.s +++ b/asm/src/BrainDash.s @@ -126,9 +126,9 @@ __dt__Q53scn4step5enemy5sheld9BrainDashFv: __vt__Q53scn4step5enemy5sheld9BrainDash: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5sheld9BrainDashFv - .byte4 onStart__Q43scn4step5enemy9BrainBaseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy5sheld9BrainDashFv - .byte4 update__Q53scn4step5enemy5sheld9BrainDashFv + .4byte __dt__Q53scn4step5enemy5sheld9BrainDashFv + .4byte onStart__Q43scn4step5enemy9BrainBaseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy5sheld9BrainDashFv + .4byte update__Q53scn4step5enemy5sheld9BrainDashFv .4byte 0 diff --git a/asm/src/BrainDive.s b/asm/src/BrainDive.s index 6fb7afaf..2d2472fe 100644 --- a/asm/src/BrainDive.s +++ b/asm/src/BrainDive.s @@ -208,23 +208,23 @@ __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateB __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateBack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateBack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateBack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateBack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateBack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como12StateCutFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como12StateCutFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como12StateCutFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como12StateCutFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como12StateCutFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como12StateCutFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4como9BrainDive __vt__Q53scn4step5enemy4como9BrainDive: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4como9BrainDiveFv - .byte4 onStart__Q53scn4step5enemy4como9BrainDiveFv - .byte4 onRecover__Q53scn4step5enemy4como9BrainDiveFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy4como9BrainDiveFv + .4byte onStart__Q53scn4step5enemy4como9BrainDiveFv + .4byte onRecover__Q53scn4step5enemy4como9BrainDiveFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/BrainEscape.s b/asm/src/BrainEscape.s index 03e8e62e..4fc0fcdd 100644 --- a/asm/src/BrainEscape.s +++ b/asm/src/BrainEscape.s @@ -65,9 +65,9 @@ __dt__Q53scn4step5enemy5sheld11BrainEscapeFv: __vt__Q53scn4step5enemy5sheld11BrainEscape: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5sheld11BrainEscapeFv - .byte4 onStart__Q43scn4step5enemy9BrainBaseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy5sheld11BrainEscapeFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy5sheld11BrainEscapeFv + .4byte onStart__Q43scn4step5enemy9BrainBaseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy5sheld11BrainEscapeFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFactory.s b/asm/src/BrainFactory.s index 8d2914c4..b8c8c81d 100644 --- a/asm/src/BrainFactory.s +++ b/asm/src/BrainFactory.s @@ -2203,431 +2203,431 @@ ScriptPath__Q43scn4step5enemy12BrainFactoryFRQ43scn4step5enemy5Enemy: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_SCRIPT_PATHS__Q43scn4step5enemy26$$2unnamed$$2BrainFactory_cpp$$2 T_SCRIPT_PATHS__Q43scn4step5enemy26$$2unnamed$$2BrainFactory_cpp$$2: - .byte4 $$253027 - .byte4 $$253028 - .byte4 $$253029 - .byte4 $$253029 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253031 - .byte4 $$253032 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253033 - .byte4 $$253030 - .byte4 $$253034 - .byte4 $$253035 - .byte4 $$253036 - .byte4 $$253037 - .byte4 $$253038 - .byte4 $$253039 - .byte4 $$253040 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253041 - .byte4 $$253042 - .byte4 $$253043 - .byte4 $$253044 - .byte4 $$253045 - .byte4 $$253046 - .byte4 $$253047 - .byte4 $$253030 - .byte4 $$253048 - .byte4 $$253030 - .byte4 $$253049 - .byte4 $$253030 - .byte4 $$253050 - .byte4 $$253051 - .byte4 $$253052 - .byte4 $$253053 - .byte4 $$253054 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253055 - .byte4 $$253056 - .byte4 $$253057 - .byte4 $$253058 - .byte4 $$253059 - .byte4 $$253059 - .byte4 $$253059 - .byte4 $$253060 - .byte4 $$253061 - .byte4 $$253062 - .byte4 $$253061 - .byte4 $$253063 - .byte4 $$253064 - .byte4 $$253065 - .byte4 $$253066 - .byte4 $$253067 - .byte4 $$253068 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253069 - .byte4 $$253070 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253071 - .byte4 $$253072 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253073 - .byte4 $$253074 - .byte4 $$253075 - .byte4 $$253076 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253077 - .byte4 $$253078 - .byte4 $$253079 - .byte4 $$253030 - .byte4 $$253080 - .byte4 $$253080 - .byte4 $$253030 - .byte4 $$253081 - .byte4 $$253082 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253083 - .byte4 $$253084 - .byte4 $$253085 - .byte4 $$253086 - .byte4 $$253087 - .byte4 $$253088 - .byte4 $$253089 - .byte4 $$253090 - .byte4 $$253091 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253092 - .byte4 $$253093 - .byte4 $$253094 - .byte4 $$253095 - .byte4 $$253096 - .byte4 $$253097 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253098 - .byte4 $$253098 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253099 - .byte4 $$253100 - .byte4 $$253101 - .byte4 $$253102 - .byte4 $$253103 - .byte4 $$253104 - .byte4 $$253105 - .byte4 $$253106 - .byte4 $$253107 - .byte4 $$253108 - .byte4 $$253109 - .byte4 $$253065 - .byte4 $$253073 - .byte4 $$253071 - .byte4 $$253072 - .byte4 $$253074 - .byte4 $$253110 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253111 - .byte4 $$253112 - .byte4 $$253113 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253039 - .byte4 $$253114 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253065 - .byte4 $$253073 - .byte4 $$253071 - .byte4 $$253072 - .byte4 $$253074 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253072 - .byte4 $$253074 - .byte4 $$253072 - .byte4 $$253074 - .byte4 $$253072 - .byte4 $$253074 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253072 - .byte4 $$253074 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253092 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253115 - .byte4 $$253030 - .byte4 $$253116 - .byte4 $$253117 - .byte4 $$253118 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253039 - .byte4 $$253030 - .byte4 $$253029 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253029 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253027 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253119 - .byte4 $$253119 - .byte4 $$253119 - .byte4 $$253120 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253029 - .byte4 $$253029 - .byte4 $$253121 - .byte4 $$253030 - .byte4 $$253122 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253123 - .byte4 $$253124 - .byte4 $$253125 - .byte4 $$253126 - .byte4 $$253127 - .byte4 $$253128 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253129 - .byte4 $$253130 - .byte4 $$253131 - .byte4 $$253132 - .byte4 $$253133 - .byte4 $$253134 - .byte4 $$253135 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253136 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253137 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253138 - .byte4 $$253139 - .byte4 $$253140 - .byte4 $$253141 - .byte4 $$253142 - .byte4 $$253143 - .byte4 $$253144 - .byte4 $$253145 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253146 - .byte4 $$253147 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253030 - .byte4 $$253148 - .byte4 $$253149 - .byte4 $$253150 - .byte4 $$253151 - .byte4 $$253030 + .4byte $$253027 + .4byte $$253028 + .4byte $$253029 + .4byte $$253029 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253031 + .4byte $$253032 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253033 + .4byte $$253030 + .4byte $$253034 + .4byte $$253035 + .4byte $$253036 + .4byte $$253037 + .4byte $$253038 + .4byte $$253039 + .4byte $$253040 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253041 + .4byte $$253042 + .4byte $$253043 + .4byte $$253044 + .4byte $$253045 + .4byte $$253046 + .4byte $$253047 + .4byte $$253030 + .4byte $$253048 + .4byte $$253030 + .4byte $$253049 + .4byte $$253030 + .4byte $$253050 + .4byte $$253051 + .4byte $$253052 + .4byte $$253053 + .4byte $$253054 + .4byte $$253030 + .4byte $$253030 + .4byte $$253055 + .4byte $$253056 + .4byte $$253057 + .4byte $$253058 + .4byte $$253059 + .4byte $$253059 + .4byte $$253059 + .4byte $$253060 + .4byte $$253061 + .4byte $$253062 + .4byte $$253061 + .4byte $$253063 + .4byte $$253064 + .4byte $$253065 + .4byte $$253066 + .4byte $$253067 + .4byte $$253068 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253069 + .4byte $$253070 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253071 + .4byte $$253072 + .4byte $$253030 + .4byte $$253030 + .4byte $$253073 + .4byte $$253074 + .4byte $$253075 + .4byte $$253076 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253077 + .4byte $$253078 + .4byte $$253079 + .4byte $$253030 + .4byte $$253080 + .4byte $$253080 + .4byte $$253030 + .4byte $$253081 + .4byte $$253082 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253083 + .4byte $$253084 + .4byte $$253085 + .4byte $$253086 + .4byte $$253087 + .4byte $$253088 + .4byte $$253089 + .4byte $$253090 + .4byte $$253091 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253092 + .4byte $$253093 + .4byte $$253094 + .4byte $$253095 + .4byte $$253096 + .4byte $$253097 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253098 + .4byte $$253098 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253099 + .4byte $$253100 + .4byte $$253101 + .4byte $$253102 + .4byte $$253103 + .4byte $$253104 + .4byte $$253105 + .4byte $$253106 + .4byte $$253107 + .4byte $$253108 + .4byte $$253109 + .4byte $$253065 + .4byte $$253073 + .4byte $$253071 + .4byte $$253072 + .4byte $$253074 + .4byte $$253110 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253111 + .4byte $$253112 + .4byte $$253113 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253039 + .4byte $$253114 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253065 + .4byte $$253073 + .4byte $$253071 + .4byte $$253072 + .4byte $$253074 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253072 + .4byte $$253074 + .4byte $$253072 + .4byte $$253074 + .4byte $$253072 + .4byte $$253074 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253072 + .4byte $$253074 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253092 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253115 + .4byte $$253030 + .4byte $$253116 + .4byte $$253117 + .4byte $$253118 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253039 + .4byte $$253030 + .4byte $$253029 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253029 + .4byte $$253030 + .4byte $$253030 + .4byte $$253027 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253119 + .4byte $$253119 + .4byte $$253119 + .4byte $$253120 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253029 + .4byte $$253029 + .4byte $$253121 + .4byte $$253030 + .4byte $$253122 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253123 + .4byte $$253124 + .4byte $$253125 + .4byte $$253126 + .4byte $$253127 + .4byte $$253128 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253129 + .4byte $$253130 + .4byte $$253131 + .4byte $$253132 + .4byte $$253133 + .4byte $$253134 + .4byte $$253135 + .4byte $$253030 + .4byte $$253030 + .4byte $$253136 + .4byte $$253030 + .4byte $$253030 + .4byte $$253137 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253138 + .4byte $$253139 + .4byte $$253140 + .4byte $$253141 + .4byte $$253142 + .4byte $$253143 + .4byte $$253144 + .4byte $$253145 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253146 + .4byte $$253147 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253030 + .4byte $$253148 + .4byte $$253149 + .4byte $$253150 + .4byte $$253151 + .4byte $$253030 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/src/BrainFattyBuffer.s b/asm/src/BrainFattyBuffer.s index da81528a..2e06d45f 100644 --- a/asm/src/BrainFattyBuffer.s +++ b/asm/src/BrainFattyBuffer.s @@ -83,15 +83,15 @@ __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26S __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferAppearFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferAppearFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferAppearFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferAppearFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferAppearFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy7blipper16BrainFattyBuffer __vt__Q53scn4step5enemy7blipper16BrainFattyBuffer: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7blipper16BrainFattyBufferFv - .byte4 onStart__Q53scn4step5enemy7blipper16BrainFattyBufferFv - .byte4 onRecover__Q53scn4step5enemy7blipper16BrainFattyBufferFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy7blipper16BrainFattyBufferFv + .4byte onStart__Q53scn4step5enemy7blipper16BrainFattyBufferFv + .4byte onRecover__Q53scn4step5enemy7blipper16BrainFattyBufferFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFix.s b/asm/src/BrainFix.s index de457509..f5511a52 100644 --- a/asm/src/BrainFix.s +++ b/asm/src/BrainFix.s @@ -116,15 +116,15 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9Stat __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6shotzo8BrainFix __vt__Q53scn4step5enemy6shotzo8BrainFix: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6shotzo8BrainFixFv - .byte4 onStart__Q53scn4step5enemy6shotzo8BrainFixFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6shotzo8BrainFixFv + .4byte onStart__Q53scn4step5enemy6shotzo8BrainFixFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFixCeil.s b/asm/src/BrainFixCeil.s index 478cedf6..b291b8e4 100644 --- a/asm/src/BrainFixCeil.s +++ b/asm/src/BrainFixCeil.s @@ -141,11 +141,11 @@ __dt__Q53scn4step5enemy6shotzo12BrainFixCeilFv: __vt__Q53scn4step5enemy6shotzo12BrainFixCeil: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6shotzo12BrainFixCeilFv - .byte4 onStart__Q53scn4step5enemy6shotzo12BrainFixCeilFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6shotzo12BrainFixCeilFv + .4byte onStart__Q53scn4step5enemy6shotzo12BrainFixCeilFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/BrainFlushPursuit.s b/asm/src/BrainFlushPursuit.s index 97c91fbf..005998b6 100644 --- a/asm/src/BrainFlushPursuit.s +++ b/asm/src/BrainFlushPursuit.s @@ -126,21 +126,21 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12Sta __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlushWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlushWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlushWait$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlushWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlushWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlushWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6common17BrainFlushPursuit __vt__Q53scn4step5enemy6common17BrainFlushPursuit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common17BrainFlushPursuitFv - .byte4 onStart__Q53scn4step5enemy6common17BrainFlushPursuitFv - .byte4 onRecover__Q53scn4step5enemy6common17BrainFlushPursuitFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6common17BrainFlushPursuitFv + .4byte onStart__Q53scn4step5enemy6common17BrainFlushPursuitFv + .4byte onRecover__Q53scn4step5enemy6common17BrainFlushPursuitFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFly.s b/asm/src/BrainFly.s index 4cf0b115..c4e8e0be 100644 --- a/asm/src/BrainFly.s +++ b/asm/src/BrainFly.s @@ -903,11 +903,11 @@ __dt__Q53scn4step5enemy6sodory8BrainFlyFv: __vt__Q53scn4step5enemy6common8BrainFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common8BrainFlyFv - .byte4 onStart__Q53scn4step5enemy6common8BrainFlyFv - .byte4 onRecover__Q53scn4step5enemy6common8BrainFlyFv - .byte4 onLanding__Q53scn4step5enemy6common8BrainFlyFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6common8BrainFlyFv + .4byte onStart__Q53scn4step5enemy6common8BrainFlyFv + .4byte onRecover__Q53scn4step5enemy6common8BrainFlyFv + .4byte onLanding__Q53scn4step5enemy6common8BrainFlyFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -915,11 +915,11 @@ __vt__Q53scn4step5enemy6common8BrainFly: __vt__Q53scn4step5enemy5bowby8BrainFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5bowby8BrainFlyFv - .byte4 onStart__Q53scn4step5enemy5bowby8BrainFlyFv - .byte4 onRecover__Q53scn4step5enemy5bowby8BrainFlyFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy5bowby8BrainFlyFv + .4byte onStart__Q53scn4step5enemy5bowby8BrainFlyFv + .4byte onRecover__Q53scn4step5enemy5bowby8BrainFlyFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -927,17 +927,17 @@ __vt__Q53scn4step5enemy5bowby8BrainFly: __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt8StateFly$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10brontoburt8BrainFly __vt__Q53scn4step5enemy10brontoburt8BrainFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10brontoburt8BrainFlyFv - .byte4 onStart__Q53scn4step5enemy10brontoburt8BrainFlyFv - .byte4 onRecover__Q53scn4step5enemy10brontoburt8BrainFlyFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy10brontoburt8BrainFlyFv + .4byte onStart__Q53scn4step5enemy10brontoburt8BrainFlyFv + .4byte onRecover__Q53scn4step5enemy10brontoburt8BrainFlyFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -945,17 +945,17 @@ __vt__Q53scn4step5enemy10brontoburt8BrainFly: __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8cerulean8StateFly$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8cerulean8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8cerulean8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8cerulean8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8cerulean8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8cerulean8BrainFly __vt__Q53scn4step5enemy8cerulean8BrainFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8cerulean8BrainFlyFv - .byte4 onStart__Q53scn4step5enemy8cerulean8BrainFlyFv - .byte4 onRecover__Q53scn4step5enemy8cerulean8BrainFlyFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy8cerulean8BrainFlyFv + .4byte onStart__Q53scn4step5enemy8cerulean8BrainFlyFv + .4byte onRecover__Q53scn4step5enemy8cerulean8BrainFlyFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -963,11 +963,11 @@ __vt__Q53scn4step5enemy8cerulean8BrainFly: __vt__Q53scn4step5enemy6juckle8BrainFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6juckle8BrainFlyFv - .byte4 onStart__Q53scn4step5enemy6juckle8BrainFlyFv - .byte4 onRecover__Q53scn4step5enemy6juckle8BrainFlyFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6juckle8BrainFlyFv + .4byte onStart__Q53scn4step5enemy6juckle8BrainFlyFv + .4byte onRecover__Q53scn4step5enemy6juckle8BrainFlyFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -975,35 +975,35 @@ __vt__Q53scn4step5enemy6juckle8BrainFly: __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce12StateFlyWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce12StateFlyWait$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce12StateFlyWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce12StateFlyWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce12StateFlyWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce15StateFlyPursuit$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce15StateFlyPursuit$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce15StateFlyPursuit$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce15StateFlyPursuit$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce15StateFlyPursuit$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce15StateFlyPursuit$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6pierce8BrainFly __vt__Q53scn4step5enemy6pierce8BrainFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6pierce8BrainFlyFv - .byte4 onStart__Q53scn4step5enemy6pierce8BrainFlyFv - .byte4 onRecover__Q53scn4step5enemy6pierce8BrainFlyFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6pierce8BrainFlyFv + .4byte onStart__Q53scn4step5enemy6pierce8BrainFlyFv + .4byte onRecover__Q53scn4step5enemy6pierce8BrainFlyFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1011,11 +1011,11 @@ __vt__Q53scn4step5enemy6pierce8BrainFly: __vt__Q53scn4step5enemy6scarfy8BrainFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6scarfy8BrainFlyFv - .byte4 onStart__Q53scn4step5enemy6scarfy8BrainFlyFv - .byte4 onRecover__Q53scn4step5enemy6scarfy8BrainFlyFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6scarfy8BrainFlyFv + .4byte onStart__Q53scn4step5enemy6scarfy8BrainFlyFv + .4byte onRecover__Q53scn4step5enemy6scarfy8BrainFlyFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1023,23 +1023,23 @@ __vt__Q53scn4step5enemy6scarfy8BrainFly: __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches8StateFly$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches9StateMove$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8searches8BrainFly __vt__Q53scn4step5enemy8searches8BrainFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8searches8BrainFlyFv - .byte4 onStart__Q53scn4step5enemy8searches8BrainFlyFv - .byte4 onRecover__Q53scn4step5enemy8searches8BrainFlyFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy8searches8BrainFlyFv + .4byte onStart__Q53scn4step5enemy8searches8BrainFlyFv + .4byte onRecover__Q53scn4step5enemy8searches8BrainFlyFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1047,23 +1047,23 @@ __vt__Q53scn4step5enemy8searches8BrainFly: __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5snowl8BrainFly __vt__Q53scn4step5enemy5snowl8BrainFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5snowl8BrainFlyFv - .byte4 onStart__Q53scn4step5enemy5snowl8BrainFlyFv - .byte4 onRecover__Q53scn4step5enemy5snowl8BrainFlyFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy5snowl8BrainFlyFv + .4byte onStart__Q53scn4step5enemy5snowl8BrainFlyFv + .4byte onRecover__Q53scn4step5enemy5snowl8BrainFlyFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1071,9 +1071,9 @@ __vt__Q53scn4step5enemy5snowl8BrainFly: __vt__Q53scn4step5enemy6sodory8BrainFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6sodory8BrainFlyFv - .byte4 onStart__Q53scn4step5enemy6sodory8BrainFlyFv - .byte4 onRecover__Q53scn4step5enemy6sodory8BrainFlyFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6sodory8BrainFlyFv + .4byte onStart__Q53scn4step5enemy6sodory8BrainFlyFv + .4byte onRecover__Q53scn4step5enemy6sodory8BrainFlyFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFlyAround.s b/asm/src/BrainFlyAround.s index db1eddf1..15b422bd 100644 --- a/asm/src/BrainFlyAround.s +++ b/asm/src/BrainFlyAround.s @@ -155,9 +155,9 @@ __dt__Q53scn4step5enemy6owgulf14BrainFlyAroundFv: __vt__Q53scn4step5enemy6owgulf14BrainFlyAround: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6owgulf14BrainFlyAroundFv - .byte4 onStart__Q53scn4step5enemy6owgulf14BrainFlyAroundFv - .byte4 onRecover__Q53scn4step5enemy6owgulf14BrainFlyAroundFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q53scn4step5enemy6owgulf14BrainFlyAroundFv + .4byte __dt__Q53scn4step5enemy6owgulf14BrainFlyAroundFv + .4byte onStart__Q53scn4step5enemy6owgulf14BrainFlyAroundFv + .4byte onRecover__Q53scn4step5enemy6owgulf14BrainFlyAroundFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q53scn4step5enemy6owgulf14BrainFlyAroundFv .4byte 0 diff --git a/asm/src/BrainFlyFarSinCurve.s b/asm/src/BrainFlyFarSinCurve.s index 74497405..79e208db 100644 --- a/asm/src/BrainFlyFarSinCurve.s +++ b/asm/src/BrainFlyFarSinCurve.s @@ -84,17 +84,17 @@ __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontobur __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10brontoburt19BrainFlyFarSinCurve __vt__Q53scn4step5enemy10brontoburt19BrainFlyFarSinCurve: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10brontoburt19BrainFlyFarSinCurveFv - .byte4 onStart__Q53scn4step5enemy10brontoburt19BrainFlyFarSinCurveFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy10brontoburt19BrainFlyFarSinCurveFv + .4byte onStart__Q53scn4step5enemy10brontoburt19BrainFlyFarSinCurveFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/BrainFlySinCurve.s b/asm/src/BrainFlySinCurve.s index 00897680..efec2f6e 100644 --- a/asm/src/BrainFlySinCurve.s +++ b/asm/src/BrainFlySinCurve.s @@ -101,15 +101,15 @@ __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16St __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6common16BrainFlySinCurve __vt__Q53scn4step5enemy6common16BrainFlySinCurve: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common16BrainFlySinCurveFv - .byte4 onStart__Q53scn4step5enemy6common16BrainFlySinCurveFv - .byte4 onRecover__Q53scn4step5enemy6common16BrainFlySinCurveFv - .byte4 onLanding__Q53scn4step5enemy6common16BrainFlySinCurveFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6common16BrainFlySinCurveFv + .4byte onStart__Q53scn4step5enemy6common16BrainFlySinCurveFv + .4byte onRecover__Q53scn4step5enemy6common16BrainFlySinCurveFv + .4byte onLanding__Q53scn4step5enemy6common16BrainFlySinCurveFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFlyStraight.s b/asm/src/BrainFlyStraight.s index be3b6fbf..386a25b8 100644 --- a/asm/src/BrainFlyStraight.s +++ b/asm/src/BrainFlyStraight.s @@ -36,9 +36,9 @@ __dt__Q53scn4step5enemy6owgulf16BrainFlyStraightFv: __vt__Q53scn4step5enemy6owgulf16BrainFlyStraight: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6owgulf16BrainFlyStraightFv - .byte4 onStart__Q53scn4step5enemy6owgulf16BrainFlyStraightFv - .byte4 onRecover__Q53scn4step5enemy6owgulf16BrainFlyStraightFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6owgulf16BrainFlyStraightFv + .4byte onStart__Q53scn4step5enemy6owgulf16BrainFlyStraightFv + .4byte onRecover__Q53scn4step5enemy6owgulf16BrainFlyStraightFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFlyUpDown.s b/asm/src/BrainFlyUpDown.s index 741124fe..4da689cc 100644 --- a/asm/src/BrainFlyUpDown.s +++ b/asm/src/BrainFlyUpDown.s @@ -177,17 +177,17 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy14Sta __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6common14BrainFlyUpDown __vt__Q53scn4step5enemy6common14BrainFlyUpDown: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common14BrainFlyUpDownFv - .byte4 onStart__Q53scn4step5enemy6common14BrainFlyUpDownFv - .byte4 onRecover__Q53scn4step5enemy6common14BrainFlyUpDownFv - .byte4 onLanding__Q53scn4step5enemy6common14BrainFlyUpDownFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6common14BrainFlyUpDownFv + .4byte onStart__Q53scn4step5enemy6common14BrainFlyUpDownFv + .4byte onRecover__Q53scn4step5enemy6common14BrainFlyUpDownFv + .4byte onLanding__Q53scn4step5enemy6common14BrainFlyUpDownFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -195,15 +195,15 @@ __vt__Q53scn4step5enemy6common14BrainFlyUpDown: __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6scarfy14BrainFlyUpDown __vt__Q53scn4step5enemy6scarfy14BrainFlyUpDown: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6scarfy14BrainFlyUpDownFv - .byte4 onStart__Q53scn4step5enemy6scarfy14BrainFlyUpDownFv - .byte4 onRecover__Q53scn4step5enemy6scarfy14BrainFlyUpDownFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6scarfy14BrainFlyUpDownFv + .4byte onStart__Q53scn4step5enemy6scarfy14BrainFlyUpDownFv + .4byte onRecover__Q53scn4step5enemy6scarfy14BrainFlyUpDownFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFlyWait.s b/asm/src/BrainFlyWait.s index b06a3a12..305f7440 100644 --- a/asm/src/BrainFlyWait.s +++ b/asm/src/BrainFlyWait.s @@ -36,9 +36,9 @@ __dt__Q53scn4step5enemy6owgulf12BrainFlyWaitFv: __vt__Q53scn4step5enemy6owgulf12BrainFlyWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6owgulf12BrainFlyWaitFv - .byte4 onStart__Q53scn4step5enemy6owgulf12BrainFlyWaitFv - .byte4 onRecover__Q53scn4step5enemy6owgulf12BrainFlyWaitFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6owgulf12BrainFlyWaitFv + .4byte onStart__Q53scn4step5enemy6owgulf12BrainFlyWaitFv + .4byte onRecover__Q53scn4step5enemy6owgulf12BrainFlyWaitFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFollow.s b/asm/src/BrainFollow.s index c3bbcb86..74085281 100644 --- a/asm/src/BrainFollow.s +++ b/asm/src/BrainFollow.s @@ -89,9 +89,9 @@ __dt__Q53scn4step5enemy6juckle11BrainFollowFv: __vt__Q53scn4step5enemy6juckle11BrainFollow: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6juckle11BrainFollowFv - .byte4 onStart__Q53scn4step5enemy6juckle11BrainFollowFv - .byte4 onRecover__Q53scn4step5enemy6juckle11BrainFollowFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6juckle11BrainFollowFv + .4byte onStart__Q53scn4step5enemy6juckle11BrainFollowFv + .4byte onRecover__Q53scn4step5enemy6juckle11BrainFollowFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainGrandLowper.s b/asm/src/BrainGrandLowper.s index b1cc53bc..4889d5dc 100644 --- a/asm/src/BrainGrandLowper.s +++ b/asm/src/BrainGrandLowper.s @@ -986,17 +986,17 @@ __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee2 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8armordee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8armordee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8armordee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8armordee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8armordee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8armordee16BrainGrandLowper __vt__Q53scn4step5enemy8armordee16BrainGrandLowper: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8armordee16BrainGrandLowperFv - .byte4 onStart__Q53scn4step5enemy8armordee16BrainGrandLowperFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy8armordee16BrainGrandLowperFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy8armordee16BrainGrandLowperFv + .4byte onStart__Q53scn4step5enemy8armordee16BrainGrandLowperFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy8armordee16BrainGrandLowperFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1004,17 +1004,17 @@ __vt__Q53scn4step5enemy8armordee16BrainGrandLowper: __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11bladeknight16BrainGrandLowper __vt__Q53scn4step5enemy11bladeknight16BrainGrandLowper: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11bladeknight16BrainGrandLowperFv - .byte4 onStart__Q53scn4step5enemy11bladeknight16BrainGrandLowperFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy11bladeknight16BrainGrandLowperFv + .4byte onStart__Q53scn4step5enemy11bladeknight16BrainGrandLowperFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1022,17 +1022,17 @@ __vt__Q53scn4step5enemy11bladeknight16BrainGrandLowper: __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6bouncy16BrainGrandLowper __vt__Q53scn4step5enemy6bouncy16BrainGrandLowper: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6bouncy16BrainGrandLowperFv - .byte4 onStart__Q53scn4step5enemy6bouncy16BrainGrandLowperFv - .byte4 onRecover__Q53scn4step5enemy6bouncy16BrainGrandLowperFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6bouncy16BrainGrandLowperFv + .4byte onStart__Q53scn4step5enemy6bouncy16BrainGrandLowperFv + .4byte onRecover__Q53scn4step5enemy6bouncy16BrainGrandLowperFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1040,17 +1040,17 @@ __vt__Q53scn4step5enemy6bouncy16BrainGrandLowper: __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11broomhatter16BrainGrandLowper __vt__Q53scn4step5enemy11broomhatter16BrainGrandLowper: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11broomhatter16BrainGrandLowperFv - .byte4 onStart__Q53scn4step5enemy11broomhatter16BrainGrandLowperFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy11broomhatter16BrainGrandLowperFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy11broomhatter16BrainGrandLowperFv + .4byte onStart__Q53scn4step5enemy11broomhatter16BrainGrandLowperFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy11broomhatter16BrainGrandLowperFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1058,17 +1058,17 @@ __vt__Q53scn4step5enemy11broomhatter16BrainGrandLowper: __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4kabu16BrainGrandLowper __vt__Q53scn4step5enemy4kabu16BrainGrandLowper: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4kabu16BrainGrandLowperFv - .byte4 onStart__Q53scn4step5enemy4kabu16BrainGrandLowperFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q53scn4step5enemy4kabu16BrainGrandLowperFv + .4byte __dt__Q53scn4step5enemy4kabu16BrainGrandLowperFv + .4byte onStart__Q53scn4step5enemy4kabu16BrainGrandLowperFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q53scn4step5enemy4kabu16BrainGrandLowperFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1076,23 +1076,23 @@ __vt__Q53scn4step5enemy4kabu16BrainGrandLowper: __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5nruff16BrainGrandLowper __vt__Q53scn4step5enemy5nruff16BrainGrandLowper: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5nruff16BrainGrandLowperFv - .byte4 onStart__Q53scn4step5enemy5nruff16BrainGrandLowperFv - .byte4 onRecover__Q53scn4step5enemy5nruff16BrainGrandLowperFv - .byte4 onLanding__Q53scn4step5enemy5nruff16BrainGrandLowperFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy5nruff16BrainGrandLowperFv + .4byte onStart__Q53scn4step5enemy5nruff16BrainGrandLowperFv + .4byte onRecover__Q53scn4step5enemy5nruff16BrainGrandLowperFv + .4byte onLanding__Q53scn4step5enemy5nruff16BrainGrandLowperFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1100,17 +1100,17 @@ __vt__Q53scn4step5enemy5nruff16BrainGrandLowper: __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6scarfy16BrainGrandLowper __vt__Q53scn4step5enemy6scarfy16BrainGrandLowper: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6scarfy16BrainGrandLowperFv - .byte4 onStart__Q53scn4step5enemy6scarfy16BrainGrandLowperFv - .byte4 onRecover__Q53scn4step5enemy6scarfy16BrainGrandLowperFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6scarfy16BrainGrandLowperFv + .4byte onStart__Q53scn4step5enemy6scarfy16BrainGrandLowperFv + .4byte onRecover__Q53scn4step5enemy6scarfy16BrainGrandLowperFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1118,17 +1118,17 @@ __vt__Q53scn4step5enemy6scarfy16BrainGrandLowper: __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5sheld16BrainGrandLowper __vt__Q53scn4step5enemy5sheld16BrainGrandLowper: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5sheld16BrainGrandLowperFv - .byte4 onStart__Q53scn4step5enemy5sheld16BrainGrandLowperFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy5sheld16BrainGrandLowperFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy5sheld16BrainGrandLowperFv + .4byte onStart__Q53scn4step5enemy5sheld16BrainGrandLowperFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy5sheld16BrainGrandLowperFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1136,17 +1136,17 @@ __vt__Q53scn4step5enemy5sheld16BrainGrandLowper: __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee16BrainGrandLowper __vt__Q53scn4step5enemy9waddledee16BrainGrandLowper: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledee16BrainGrandLowperFv - .byte4 onStart__Q53scn4step5enemy9waddledee16BrainGrandLowperFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy9waddledee16BrainGrandLowperFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy9waddledee16BrainGrandLowperFv + .4byte onStart__Q53scn4step5enemy9waddledee16BrainGrandLowperFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy9waddledee16BrainGrandLowperFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/BrainGround.s b/asm/src/BrainGround.s index a6b5ddaa..93520fcc 100644 --- a/asm/src/BrainGround.s +++ b/asm/src/BrainGround.s @@ -65,9 +65,9 @@ __dt__Q53scn4step5enemy9tsukikage11BrainGroundFv: __vt__Q53scn4step5enemy9tsukikage11BrainGround: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9tsukikage11BrainGroundFv - .byte4 onStart__Q53scn4step5enemy9tsukikage11BrainGroundFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy9tsukikage11BrainGroundFv + .4byte onStart__Q53scn4step5enemy9tsukikage11BrainGroundFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainHang.s b/asm/src/BrainHang.s index c2ae5cba..cedbeac3 100644 --- a/asm/src/BrainHang.s +++ b/asm/src/BrainHang.s @@ -137,17 +137,17 @@ __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateH __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateHang$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateHang$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateHang$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateHang$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateHang$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4como9BrainHang __vt__Q53scn4step5enemy4como9BrainHang: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4como9BrainHangFv - .byte4 onStart__Q53scn4step5enemy4como9BrainHangFv - .byte4 onRecover__Q53scn4step5enemy4como9BrainHangFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy4como9BrainHangFv + .4byte onStart__Q53scn4step5enemy4como9BrainHangFv + .4byte onRecover__Q53scn4step5enemy4como9BrainHangFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/BrainJump.s b/asm/src/BrainJump.s index 53f60a65..70fab25b 100644 --- a/asm/src/BrainJump.s +++ b/asm/src/BrainJump.s @@ -123,11 +123,11 @@ __dt__Q53scn4step5enemy4kabu9BrainJumpFv: __vt__Q53scn4step5enemy7blipper9BrainJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7blipper9BrainJumpFv - .byte4 onStart__Q53scn4step5enemy7blipper9BrainJumpFv - .byte4 onRecover__Q53scn4step5enemy7blipper9BrainJumpFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy7blipper9BrainJumpFv + .4byte onStart__Q53scn4step5enemy7blipper9BrainJumpFv + .4byte onRecover__Q53scn4step5enemy7blipper9BrainJumpFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -135,9 +135,9 @@ __vt__Q53scn4step5enemy7blipper9BrainJump: __vt__Q53scn4step5enemy4kabu9BrainJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4kabu9BrainJumpFv - .byte4 onStart__Q53scn4step5enemy4kabu9BrainJumpFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy4kabu9BrainJumpFv + .4byte onStart__Q53scn4step5enemy4kabu9BrainJumpFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainJumpAttack.s b/asm/src/BrainJumpAttack.s index ca01b7d5..57f3c266 100644 --- a/asm/src/BrainJumpAttack.s +++ b/asm/src/BrainJumpAttack.s @@ -79,15 +79,15 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9S __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9sirkibble15BrainJumpAttack __vt__Q53scn4step5enemy9sirkibble15BrainJumpAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9sirkibble15BrainJumpAttackFv - .byte4 onStart__Q43scn4step5enemy9BrainBaseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy9sirkibble15BrainJumpAttackFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy9sirkibble15BrainJumpAttackFv + .4byte onStart__Q43scn4step5enemy9BrainBaseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy9sirkibble15BrainJumpAttackFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainJumpOrAttack.s b/asm/src/BrainJumpOrAttack.s index e38a1bf8..d32cde19 100644 --- a/asm/src/BrainJumpOrAttack.s +++ b/asm/src/BrainJumpOrAttack.s @@ -50,9 +50,9 @@ __dt__Q53scn4step5enemy9waddledoo17BrainJumpOrAttackFv: __vt__Q53scn4step5enemy9waddledoo17BrainJumpOrAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledoo17BrainJumpOrAttackFv - .byte4 onStart__Q43scn4step5enemy9BrainBaseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy9waddledoo17BrainJumpOrAttackFv - .byte4 update__Q53scn4step5enemy9waddledoo17BrainJumpOrAttackFv + .4byte __dt__Q53scn4step5enemy9waddledoo17BrainJumpOrAttackFv + .4byte onStart__Q43scn4step5enemy9BrainBaseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy9waddledoo17BrainJumpOrAttackFv + .4byte update__Q53scn4step5enemy9waddledoo17BrainJumpOrAttackFv .4byte 0 diff --git a/asm/src/BrainMain.s b/asm/src/BrainMain.s index 09b93c22..b3bc3066 100644 --- a/asm/src/BrainMain.s +++ b/asm/src/BrainMain.s @@ -71,11 +71,11 @@ __dt__Q53scn4step5enemy8dubiorjr9BrainMainFv: __vt__Q53scn4step5enemy8dubiorjr9BrainMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8dubiorjr9BrainMainFv - .byte4 onStart__Q53scn4step5enemy8dubiorjr9BrainMainFv - .byte4 onRecover__Q53scn4step5enemy8dubiorjr9BrainMainFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy8dubiorjr9BrainMainFv + .4byte onStart__Q53scn4step5enemy8dubiorjr9BrainMainFv + .4byte onRecover__Q53scn4step5enemy8dubiorjr9BrainMainFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/BrainMove.s b/asm/src/BrainMove.s index 930a664e..ec141cc5 100644 --- a/asm/src/BrainMove.s +++ b/asm/src/BrainMove.s @@ -1209,11 +1209,11 @@ __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy3sun9StateMo __vt__Q53scn4step5enemy7blipper9BrainMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7blipper9BrainMoveFv - .byte4 onStart__Q53scn4step5enemy7blipper9BrainMoveFv - .byte4 onRecover__Q53scn4step5enemy7blipper9BrainMoveFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy7blipper9BrainMoveFv + .4byte onStart__Q53scn4step5enemy7blipper9BrainMoveFv + .4byte onRecover__Q53scn4step5enemy7blipper9BrainMoveFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1221,11 +1221,11 @@ __vt__Q53scn4step5enemy7blipper9BrainMove: __vt__Q53scn4step5enemy6bouncy9BrainMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6bouncy9BrainMoveFv - .byte4 onStart__Q53scn4step5enemy6bouncy9BrainMoveFv - .byte4 onRecover__Q53scn4step5enemy6bouncy9BrainMoveFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6bouncy9BrainMoveFv + .4byte onStart__Q53scn4step5enemy6bouncy9BrainMoveFv + .4byte onRecover__Q53scn4step5enemy6bouncy9BrainMoveFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1233,11 +1233,11 @@ __vt__Q53scn4step5enemy6bouncy9BrainMove: __vt__Q53scn4step5enemy6chilly9BrainMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6chilly9BrainMoveFv - .byte4 onStart__Q53scn4step5enemy6chilly9BrainMoveFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6chilly9BrainMoveFv + .4byte onStart__Q53scn4step5enemy6chilly9BrainMoveFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1245,45 +1245,45 @@ __vt__Q53scn4step5enemy6chilly9BrainMove: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4elec12StateMoveCCW __vt__Q53scn4step5enemy4elec12StateMoveCCW: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4elec12StateMoveCCWFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy4elec9StateMoveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4elec9StateMoveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv - .byte4 isInitCWR__Q53scn4step5enemy4elec12StateMoveCCWCFv + .4byte __dt__Q53scn4step5enemy4elec12StateMoveCCWFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy4elec9StateMoveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4elec9StateMoveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte isInitCWR__Q53scn4step5enemy4elec12StateMoveCCWCFv .global __vt__Q53scn4step5enemy4elec12StateMoveCWR __vt__Q53scn4step5enemy4elec12StateMoveCWR: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4elec12StateMoveCWRFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy4elec9StateMoveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4elec9StateMoveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv - .byte4 isInitCWR__Q53scn4step5enemy4elec12StateMoveCWRCFv + .4byte __dt__Q53scn4step5enemy4elec12StateMoveCWRFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy4elec9StateMoveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4elec9StateMoveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte isInitCWR__Q53scn4step5enemy4elec12StateMoveCWRCFv .global __vt__Q53scn4step5enemy4elec9BrainMove __vt__Q53scn4step5enemy4elec9BrainMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4elec9BrainMoveFv - .byte4 onStart__Q53scn4step5enemy4elec9BrainMoveFv - .byte4 onRecover__Q53scn4step5enemy4elec9BrainMoveFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy4elec9BrainMoveFv + .4byte onStart__Q53scn4step5enemy4elec9BrainMoveFv + .4byte onRecover__Q53scn4step5enemy4elec9BrainMoveFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1291,11 +1291,11 @@ __vt__Q53scn4step5enemy4elec9BrainMove: __vt__Q53scn4step5enemy6flamer9BrainMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6flamer9BrainMoveFv - .byte4 onStart__Q53scn4step5enemy6flamer9BrainMoveFv - .byte4 onRecover__Q53scn4step5enemy6flamer9BrainMoveFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6flamer9BrainMoveFv + .4byte onStart__Q53scn4step5enemy6flamer9BrainMoveFv + .4byte onRecover__Q53scn4step5enemy6flamer9BrainMoveFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1303,17 +1303,17 @@ __vt__Q53scn4step5enemy6flamer9BrainMove: __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateMove$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5foley9BrainMove __vt__Q53scn4step5enemy5foley9BrainMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5foley9BrainMoveFv - .byte4 onStart__Q53scn4step5enemy5foley9BrainMoveFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy5foley9BrainMoveFv + .4byte onStart__Q53scn4step5enemy5foley9BrainMoveFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1321,29 +1321,29 @@ __vt__Q53scn4step5enemy5foley9BrainMove: __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo15StateMoveCircle$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo15StateMoveCircle$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo15StateMoveCircle$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo15StateMoveCircle$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo15StateMoveCircle$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveSinCurve$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveSinCurve$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveSinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveSinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveSinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveSinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveStraight$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveStraight$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveStraight$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5gordo9BrainMove __vt__Q53scn4step5enemy5gordo9BrainMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5gordo9BrainMoveFv - .byte4 onStart__Q53scn4step5enemy5gordo9BrainMoveFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy5gordo9BrainMoveFv + .4byte onStart__Q53scn4step5enemy5gordo9BrainMoveFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1351,11 +1351,11 @@ __vt__Q53scn4step5enemy5gordo9BrainMove: __vt__Q53scn4step5enemy5rocky9BrainMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5rocky9BrainMoveFv - .byte4 onStart__Q53scn4step5enemy5rocky9BrainMoveFv - .byte4 onRecover__Q53scn4step5enemy5rocky9BrainMoveFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy5rocky9BrainMoveFv + .4byte onStart__Q53scn4step5enemy5rocky9BrainMoveFv + .4byte onRecover__Q53scn4step5enemy5rocky9BrainMoveFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1363,17 +1363,17 @@ __vt__Q53scn4step5enemy5rocky9BrainMove: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball9StateMove$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8rollball9BrainMove __vt__Q53scn4step5enemy8rollball9BrainMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8rollball9BrainMoveFv - .byte4 onStart__Q53scn4step5enemy8rollball9BrainMoveFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy8rollball9BrainMoveFv + .4byte onStart__Q53scn4step5enemy8rollball9BrainMoveFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1381,23 +1381,23 @@ __vt__Q53scn4step5enemy8rollball9BrainMove: __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11sisterbound9BrainMove __vt__Q53scn4step5enemy11sisterbound9BrainMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11sisterbound9BrainMoveFv - .byte4 onStart__Q53scn4step5enemy11sisterbound9BrainMoveFv - .byte4 onRecover__Q53scn4step5enemy11sisterbound9BrainMoveFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy11sisterbound9BrainMoveFv + .4byte onStart__Q53scn4step5enemy11sisterbound9BrainMoveFv + .4byte onRecover__Q53scn4step5enemy11sisterbound9BrainMoveFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1405,15 +1405,15 @@ __vt__Q53scn4step5enemy11sisterbound9BrainMove: __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy3sun9StateMove$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy3sun9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy3sun9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy3sun9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy3sun9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy3sun9BrainMove __vt__Q53scn4step5enemy3sun9BrainMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy3sun9BrainMoveFv - .byte4 onStart__Q53scn4step5enemy3sun9BrainMoveFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy3sun9BrainMoveFv + .4byte onStart__Q53scn4step5enemy3sun9BrainMoveFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainMoveAround.s b/asm/src/BrainMoveAround.s index ff1328ec..059334a3 100644 --- a/asm/src/BrainMoveAround.s +++ b/asm/src/BrainMoveAround.s @@ -120,15 +120,15 @@ __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateF __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4kabu15BrainMoveAround __vt__Q53scn4step5enemy4kabu15BrainMoveAround: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4kabu15BrainMoveAroundFv - .byte4 onStart__Q53scn4step5enemy4kabu15BrainMoveAroundFv - .byte4 onRecover__Q53scn4step5enemy4kabu15BrainMoveAroundFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy4kabu15BrainMoveAroundFv + .4byte onStart__Q53scn4step5enemy4kabu15BrainMoveAroundFv + .4byte onRecover__Q53scn4step5enemy4kabu15BrainMoveAroundFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainMoveAttack.s b/asm/src/BrainMoveAttack.s index 0ca5f313..29db3ccf 100644 --- a/asm/src/BrainMoveAttack.s +++ b/asm/src/BrainMoveAttack.s @@ -407,11 +407,11 @@ __dt__Q53scn4step5enemy10poppybrojr15BrainMoveAttackFv: __vt__Q53scn4step5enemy4elec15BrainMoveAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4elec15BrainMoveAttackFv - .byte4 onStart__Q53scn4step5enemy4elec15BrainMoveAttackFv - .byte4 onRecover__Q53scn4step5enemy4elec15BrainMoveAttackFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q53scn4step5enemy4elec15BrainMoveAttackFv + .4byte __dt__Q53scn4step5enemy4elec15BrainMoveAttackFv + .4byte onStart__Q53scn4step5enemy4elec15BrainMoveAttackFv + .4byte onRecover__Q53scn4step5enemy4elec15BrainMoveAttackFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q53scn4step5enemy4elec15BrainMoveAttackFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -419,11 +419,11 @@ __vt__Q53scn4step5enemy4elec15BrainMoveAttack: __vt__Q53scn4step5enemy6flamer15BrainMoveAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6flamer15BrainMoveAttackFv - .byte4 onStart__Q53scn4step5enemy6flamer15BrainMoveAttackFv - .byte4 onRecover__Q53scn4step5enemy6flamer15BrainMoveAttackFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6flamer15BrainMoveAttackFv + .4byte onStart__Q53scn4step5enemy6flamer15BrainMoveAttackFv + .4byte onRecover__Q53scn4step5enemy6flamer15BrainMoveAttackFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -431,11 +431,11 @@ __vt__Q53scn4step5enemy6flamer15BrainMoveAttack: __vt__Q53scn4step5enemy10poppybrojr15BrainMoveAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10poppybrojr15BrainMoveAttackFv - .byte4 onStart__Q53scn4step5enemy10poppybrojr15BrainMoveAttackFv - .byte4 onRecover__Q53scn4step5enemy10poppybrojr15BrainMoveAttackFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy10poppybrojr15BrainMoveAttackFv + .4byte onStart__Q53scn4step5enemy10poppybrojr15BrainMoveAttackFv + .4byte onRecover__Q53scn4step5enemy10poppybrojr15BrainMoveAttackFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/BrainMoveStraight.s b/asm/src/BrainMoveStraight.s index 1b1cb7a0..73f7e023 100644 --- a/asm/src/BrainMoveStraight.s +++ b/asm/src/BrainMoveStraight.s @@ -70,9 +70,9 @@ __dt__Q53scn4step5enemy4kabu17BrainMoveStraightFv: __vt__Q53scn4step5enemy4kabu17BrainMoveStraight: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4kabu17BrainMoveStraightFv - .byte4 onStart__Q53scn4step5enemy4kabu17BrainMoveStraightFv - .byte4 onRecover__Q53scn4step5enemy4kabu17BrainMoveStraightFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy4kabu17BrainMoveStraightFv + .4byte onStart__Q53scn4step5enemy4kabu17BrainMoveStraightFv + .4byte onRecover__Q53scn4step5enemy4kabu17BrainMoveStraightFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainNoseDive.s b/asm/src/BrainNoseDive.s index e6da96a1..81567a21 100644 --- a/asm/src/BrainNoseDive.s +++ b/asm/src/BrainNoseDive.s @@ -255,23 +255,23 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10parasoldee13BrainNoseDive __vt__Q53scn4step5enemy10parasoldee13BrainNoseDive: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10parasoldee13BrainNoseDiveFv - .byte4 onStart__Q53scn4step5enemy10parasoldee13BrainNoseDiveFv - .byte4 onRecover__Q53scn4step5enemy10parasoldee13BrainNoseDiveFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q53scn4step5enemy10parasoldee13BrainNoseDiveFv + .4byte __dt__Q53scn4step5enemy10parasoldee13BrainNoseDiveFv + .4byte onStart__Q53scn4step5enemy10parasoldee13BrainNoseDiveFv + .4byte onRecover__Q53scn4step5enemy10parasoldee13BrainNoseDiveFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q53scn4step5enemy10parasoldee13BrainNoseDiveFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -279,21 +279,21 @@ __vt__Q53scn4step5enemy10parasoldee13BrainNoseDive: __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10parasoldoo13BrainNoseDive __vt__Q53scn4step5enemy10parasoldoo13BrainNoseDive: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10parasoldoo13BrainNoseDiveFv - .byte4 onStart__Q53scn4step5enemy10parasoldoo13BrainNoseDiveFv - .byte4 onRecover__Q53scn4step5enemy10parasoldoo13BrainNoseDiveFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q53scn4step5enemy10parasoldoo13BrainNoseDiveFv + .4byte __dt__Q53scn4step5enemy10parasoldoo13BrainNoseDiveFv + .4byte onStart__Q53scn4step5enemy10parasoldoo13BrainNoseDiveFv + .4byte onRecover__Q53scn4step5enemy10parasoldoo13BrainNoseDiveFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q53scn4step5enemy10parasoldoo13BrainNoseDiveFv .4byte 0 diff --git a/asm/src/BrainPuff.s b/asm/src/BrainPuff.s index 300a9970..99c41847 100644 --- a/asm/src/BrainPuff.s +++ b/asm/src/BrainPuff.s @@ -79,15 +79,15 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect9StatePuff$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect9StatePuff$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect9StatePuff$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect9StatePuff$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect9StatePuff$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10stareffect9BrainPuff __vt__Q53scn4step5enemy10stareffect9BrainPuff: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10stareffect9BrainPuffFv - .byte4 onStart__Q53scn4step5enemy10stareffect9BrainPuffFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy10stareffect9BrainPuffFv + .4byte onStart__Q53scn4step5enemy10stareffect9BrainPuffFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainPursuit.s b/asm/src/BrainPursuit.s index 660fe3e7..8756971d 100644 --- a/asm/src/BrainPursuit.s +++ b/asm/src/BrainPursuit.s @@ -143,17 +143,17 @@ __dt__Q53scn4step5enemy6shotzo12BrainPursuitFv: __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10brontoburt12BrainPursuit __vt__Q53scn4step5enemy10brontoburt12BrainPursuit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10brontoburt12BrainPursuitFv - .byte4 onStart__Q53scn4step5enemy10brontoburt12BrainPursuitFv - .byte4 onRecover__Q53scn4step5enemy10brontoburt12BrainPursuitFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy10brontoburt12BrainPursuitFv + .4byte onStart__Q53scn4step5enemy10brontoburt12BrainPursuitFv + .4byte onRecover__Q53scn4step5enemy10brontoburt12BrainPursuitFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -161,9 +161,9 @@ __vt__Q53scn4step5enemy10brontoburt12BrainPursuit: __vt__Q53scn4step5enemy6shotzo12BrainPursuit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6shotzo12BrainPursuitFv - .byte4 onStart__Q53scn4step5enemy6shotzo12BrainPursuitFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6shotzo12BrainPursuitFv + .4byte onStart__Q53scn4step5enemy6shotzo12BrainPursuitFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainPursuitCeil.s b/asm/src/BrainPursuitCeil.s index 875b2920..50d62c2a 100644 --- a/asm/src/BrainPursuitCeil.s +++ b/asm/src/BrainPursuitCeil.s @@ -32,9 +32,9 @@ __dt__Q53scn4step5enemy6shotzo16BrainPursuitCeilFv: __vt__Q53scn4step5enemy6shotzo16BrainPursuitCeil: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6shotzo16BrainPursuitCeilFv - .byte4 onStart__Q53scn4step5enemy6shotzo16BrainPursuitCeilFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6shotzo16BrainPursuitCeilFv + .4byte onStart__Q53scn4step5enemy6shotzo16BrainPursuitCeilFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainRelease.s b/asm/src/BrainRelease.s index 04928d84..0c41403b 100644 --- a/asm/src/BrainRelease.s +++ b/asm/src/BrainRelease.s @@ -233,17 +233,17 @@ __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldo __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10parasoldee12BrainRelease __vt__Q53scn4step5enemy10parasoldee12BrainRelease: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10parasoldee12BrainReleaseFv - .byte4 onStart__Q53scn4step5enemy10parasoldee12BrainReleaseFv - .byte4 onRecover__Q53scn4step5enemy10parasoldee12BrainReleaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q53scn4step5enemy10parasoldee12BrainReleaseFv + .4byte __dt__Q53scn4step5enemy10parasoldee12BrainReleaseFv + .4byte onStart__Q53scn4step5enemy10parasoldee12BrainReleaseFv + .4byte onRecover__Q53scn4step5enemy10parasoldee12BrainReleaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q53scn4step5enemy10parasoldee12BrainReleaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -251,15 +251,15 @@ __vt__Q53scn4step5enemy10parasoldee12BrainRelease: __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10parasoldoo12BrainRelease __vt__Q53scn4step5enemy10parasoldoo12BrainRelease: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10parasoldoo12BrainReleaseFv - .byte4 onStart__Q53scn4step5enemy10parasoldoo12BrainReleaseFv - .byte4 onRecover__Q53scn4step5enemy10parasoldoo12BrainReleaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q53scn4step5enemy10parasoldoo12BrainReleaseFv + .4byte __dt__Q53scn4step5enemy10parasoldoo12BrainReleaseFv + .4byte onStart__Q53scn4step5enemy10parasoldoo12BrainReleaseFv + .4byte onRecover__Q53scn4step5enemy10parasoldoo12BrainReleaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q53scn4step5enemy10parasoldoo12BrainReleaseFv .4byte 0 diff --git a/asm/src/BrainRise.s b/asm/src/BrainRise.s index f4bdaa05..d0e3d6a1 100644 --- a/asm/src/BrainRise.s +++ b/asm/src/BrainRise.s @@ -79,15 +79,15 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9Sta __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateLink$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateLink$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateLink$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateLink$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateLink$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy7parasol9BrainRise __vt__Q53scn4step5enemy7parasol9BrainRise: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7parasol9BrainRiseFv - .byte4 onStart__Q53scn4step5enemy7parasol9BrainRiseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy7parasol9BrainRiseFv + .4byte onStart__Q53scn4step5enemy7parasol9BrainRiseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainRun.s b/asm/src/BrainRun.s index a1250ee6..1e419535 100644 --- a/asm/src/BrainRun.s +++ b/asm/src/BrainRun.s @@ -74,9 +74,9 @@ __dt__Q53scn4step5enemy5nruff8BrainRunFv: __vt__Q53scn4step5enemy5nruff8BrainRun: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5nruff8BrainRunFv - .byte4 onStart__Q53scn4step5enemy5nruff8BrainRunFv - .byte4 onRecover__Q53scn4step5enemy5nruff8BrainRunFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy5nruff8BrainRunFv + .4byte onStart__Q53scn4step5enemy5nruff8BrainRunFv + .4byte onRecover__Q53scn4step5enemy5nruff8BrainRunFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainShot.s b/asm/src/BrainShot.s index 151054fd..792e0b29 100644 --- a/asm/src/BrainShot.s +++ b/asm/src/BrainShot.s @@ -79,15 +79,15 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybroj __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy14poppybrojrbomb9BrainShot __vt__Q53scn4step5enemy14poppybrojrbomb9BrainShot: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy14poppybrojrbomb9BrainShotFv - .byte4 onStart__Q53scn4step5enemy14poppybrojrbomb9BrainShotFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy14poppybrojrbomb9BrainShotFv + .4byte onStart__Q53scn4step5enemy14poppybrojrbomb9BrainShotFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainSmoke.s b/asm/src/BrainSmoke.s index b42cfdcb..b9df1955 100644 --- a/asm/src/BrainSmoke.s +++ b/asm/src/BrainSmoke.s @@ -65,9 +65,9 @@ __dt__Q53scn4step5enemy9tsukikage10BrainSmokeFv: __vt__Q53scn4step5enemy9tsukikage10BrainSmoke: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9tsukikage10BrainSmokeFv - .byte4 onStart__Q53scn4step5enemy9tsukikage10BrainSmokeFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy9tsukikage10BrainSmokeFv + .4byte onStart__Q53scn4step5enemy9tsukikage10BrainSmokeFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainTeleport.s b/asm/src/BrainTeleport.s index 4e982e4d..8982d99b 100644 --- a/asm/src/BrainTeleport.s +++ b/asm/src/BrainTeleport.s @@ -82,15 +82,15 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu13State __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu13StateTeleport$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu13StateTeleport$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu13StateTeleport$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu13StateTeleport$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu13StateTeleport$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4kabu13BrainTeleport __vt__Q53scn4step5enemy4kabu13BrainTeleport: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4kabu13BrainTeleportFv - .byte4 onStart__Q53scn4step5enemy4kabu13BrainTeleportFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy4kabu13BrainTeleportFv + .4byte onStart__Q53scn4step5enemy4kabu13BrainTeleportFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainTeleportRepeat.s b/asm/src/BrainTeleportRepeat.s index d535f74f..c9ee14f4 100644 --- a/asm/src/BrainTeleportRepeat.s +++ b/asm/src/BrainTeleportRepeat.s @@ -113,9 +113,9 @@ __dt__Q53scn4step5enemy4kabu19BrainTeleportRepeatFv: __vt__Q53scn4step5enemy4kabu19BrainTeleportRepeat: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4kabu19BrainTeleportRepeatFv - .byte4 onStart__Q53scn4step5enemy4kabu19BrainTeleportRepeatFv - .byte4 onRecover__Q53scn4step5enemy4kabu19BrainTeleportRepeatFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy4kabu19BrainTeleportRepeatFv + .4byte onStart__Q53scn4step5enemy4kabu19BrainTeleportRepeatFv + .4byte onRecover__Q53scn4step5enemy4kabu19BrainTeleportRepeatFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainWait.s b/asm/src/BrainWait.s index 820a6378..8d2f0ac3 100644 --- a/asm/src/BrainWait.s +++ b/asm/src/BrainWait.s @@ -973,11 +973,11 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee9S __vt__Q53scn4step5enemy6bouncy9BrainWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6bouncy9BrainWaitFv - .byte4 onStart__Q53scn4step5enemy6bouncy9BrainWaitFv - .byte4 onRecover__Q53scn4step5enemy6bouncy9BrainWaitFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6bouncy9BrainWaitFv + .4byte onStart__Q53scn4step5enemy6bouncy9BrainWaitFv + .4byte onRecover__Q53scn4step5enemy6bouncy9BrainWaitFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -985,11 +985,11 @@ __vt__Q53scn4step5enemy6bouncy9BrainWait: __vt__Q53scn4step5enemy6chilly9BrainWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6chilly9BrainWaitFv - .byte4 onStart__Q53scn4step5enemy6chilly9BrainWaitFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6chilly9BrainWaitFv + .4byte onStart__Q53scn4step5enemy6chilly9BrainWaitFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -997,17 +997,17 @@ __vt__Q53scn4step5enemy6chilly9BrainWait: __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout8StateFly$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6degout9BrainWait __vt__Q53scn4step5enemy6degout9BrainWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6degout9BrainWaitFv - .byte4 onStart__Q53scn4step5enemy6degout9BrainWaitFv - .byte4 onRecover__Q53scn4step5enemy6degout9BrainWaitFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6degout9BrainWaitFv + .4byte onStart__Q53scn4step5enemy6degout9BrainWaitFv + .4byte onRecover__Q53scn4step5enemy6degout9BrainWaitFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1015,17 +1015,17 @@ __vt__Q53scn4step5enemy6degout9BrainWait: __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5foley9BrainWait __vt__Q53scn4step5enemy5foley9BrainWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5foley9BrainWaitFv - .byte4 onStart__Q53scn4step5enemy5foley9BrainWaitFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy5foley9BrainWaitFv + .4byte onStart__Q53scn4step5enemy5foley9BrainWaitFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1033,11 +1033,11 @@ __vt__Q53scn4step5enemy5foley9BrainWait: __vt__Q53scn4step5enemy5gemra9BrainWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5gemra9BrainWaitFv - .byte4 onStart__Q53scn4step5enemy5gemra9BrainWaitFv - .byte4 onRecover__Q53scn4step5enemy5gemra9BrainWaitFv - .byte4 onLanding__Q53scn4step5enemy5gemra9BrainWaitFv - .byte4 update__Q53scn4step5enemy5gemra9BrainWaitFv + .4byte __dt__Q53scn4step5enemy5gemra9BrainWaitFv + .4byte onStart__Q53scn4step5enemy5gemra9BrainWaitFv + .4byte onRecover__Q53scn4step5enemy5gemra9BrainWaitFv + .4byte onLanding__Q53scn4step5enemy5gemra9BrainWaitFv + .4byte update__Q53scn4step5enemy5gemra9BrainWaitFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1045,11 +1045,11 @@ __vt__Q53scn4step5enemy5gemra9BrainWait: __vt__Q53scn4step5enemy6lanzer9BrainWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6lanzer9BrainWaitFv - .byte4 onStart__Q53scn4step5enemy6lanzer9BrainWaitFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy6lanzer9BrainWaitFv - .byte4 update__Q53scn4step5enemy6lanzer9BrainWaitFv + .4byte __dt__Q53scn4step5enemy6lanzer9BrainWaitFv + .4byte onStart__Q53scn4step5enemy6lanzer9BrainWaitFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy6lanzer9BrainWaitFv + .4byte update__Q53scn4step5enemy6lanzer9BrainWaitFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1057,11 +1057,11 @@ __vt__Q53scn4step5enemy6lanzer9BrainWait: __vt__Q53scn4step5enemy5noddy9BrainWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5noddy9BrainWaitFv - .byte4 onStart__Q53scn4step5enemy5noddy9BrainWaitFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy5noddy9BrainWaitFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy5noddy9BrainWaitFv + .4byte onStart__Q53scn4step5enemy5noddy9BrainWaitFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy5noddy9BrainWaitFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1069,11 +1069,11 @@ __vt__Q53scn4step5enemy5noddy9BrainWait: __vt__Q53scn4step5enemy11sisterbound9BrainWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11sisterbound9BrainWaitFv - .byte4 onStart__Q53scn4step5enemy11sisterbound9BrainWaitFv - .byte4 onRecover__Q53scn4step5enemy11sisterbound9BrainWaitFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy11sisterbound9BrainWaitFv + .4byte onStart__Q53scn4step5enemy11sisterbound9BrainWaitFv + .4byte onRecover__Q53scn4step5enemy11sisterbound9BrainWaitFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1081,11 +1081,11 @@ __vt__Q53scn4step5enemy11sisterbound9BrainWait: __vt__Q53scn4step5enemy6sodory9BrainWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6sodory9BrainWaitFv - .byte4 onStart__Q53scn4step5enemy6sodory9BrainWaitFv - .byte4 onRecover__Q53scn4step5enemy6sodory9BrainWaitFv - .byte4 onLanding__Q53scn4step5enemy6sodory9BrainWaitFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6sodory9BrainWaitFv + .4byte onStart__Q53scn4step5enemy6sodory9BrainWaitFv + .4byte onRecover__Q53scn4step5enemy6sodory9BrainWaitFv + .4byte onLanding__Q53scn4step5enemy6sodory9BrainWaitFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1093,15 +1093,15 @@ __vt__Q53scn4step5enemy6sodory9BrainWait: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee9BrainWait __vt__Q53scn4step5enemy9waddledee9BrainWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledee9BrainWaitFv - .byte4 onStart__Q53scn4step5enemy9waddledee9BrainWaitFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q53scn4step5enemy9waddledee9BrainWaitFv + .4byte __dt__Q53scn4step5enemy9waddledee9BrainWaitFv + .4byte onStart__Q53scn4step5enemy9waddledee9BrainWaitFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q53scn4step5enemy9waddledee9BrainWaitFv .4byte 0 diff --git a/asm/src/BrainWaitAndChase.s b/asm/src/BrainWaitAndChase.s index 9d3b08e9..8cd5f558 100644 --- a/asm/src/BrainWaitAndChase.s +++ b/asm/src/BrainWaitAndChase.s @@ -36,9 +36,9 @@ __dt__Q53scn4step5enemy6degout17BrainWaitAndChaseFv: __vt__Q53scn4step5enemy6degout17BrainWaitAndChase: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6degout17BrainWaitAndChaseFv - .byte4 onStart__Q53scn4step5enemy6degout17BrainWaitAndChaseFv - .byte4 onRecover__Q53scn4step5enemy6degout17BrainWaitAndChaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6degout17BrainWaitAndChaseFv + .4byte onStart__Q53scn4step5enemy6degout17BrainWaitAndChaseFv + .4byte onRecover__Q53scn4step5enemy6degout17BrainWaitAndChaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainWaitAttack.s b/asm/src/BrainWaitAttack.s index b969b53f..3f747eff 100644 --- a/asm/src/BrainWaitAttack.s +++ b/asm/src/BrainWaitAttack.s @@ -36,9 +36,9 @@ __dt__Q53scn4step5enemy10poppybrojr15BrainWaitAttackFv: __vt__Q53scn4step5enemy10poppybrojr15BrainWaitAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10poppybrojr15BrainWaitAttackFv - .byte4 onStart__Q53scn4step5enemy10poppybrojr15BrainWaitAttackFv - .byte4 onRecover__Q53scn4step5enemy10poppybrojr15BrainWaitAttackFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy10poppybrojr15BrainWaitAttackFv + .4byte onStart__Q53scn4step5enemy10poppybrojr15BrainWaitAttackFv + .4byte onRecover__Q53scn4step5enemy10poppybrojr15BrainWaitAttackFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainWaitFlyStraight.s b/asm/src/BrainWaitFlyStraight.s index f9bdb074..1ef8cbdb 100644 --- a/asm/src/BrainWaitFlyStraight.s +++ b/asm/src/BrainWaitFlyStraight.s @@ -112,15 +112,15 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraight __vt__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraight: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraightFv - .byte4 onStart__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraightFv - .byte4 onRecover__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraightFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraightFv + .4byte onStart__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraightFv + .4byte onRecover__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraightFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainWaitPursuit.s b/asm/src/BrainWaitPursuit.s index 6ea17614..05c20686 100644 --- a/asm/src/BrainWaitPursuit.s +++ b/asm/src/BrainWaitPursuit.s @@ -67,9 +67,9 @@ __dt__Q53scn4step5enemy10brontoburt16BrainWaitPursuitFv: __vt__Q53scn4step5enemy10brontoburt16BrainWaitPursuit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10brontoburt16BrainWaitPursuitFv - .byte4 onStart__Q53scn4step5enemy10brontoburt16BrainWaitPursuitFv - .byte4 onRecover__Q53scn4step5enemy10brontoburt16BrainWaitPursuitFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy10brontoburt16BrainWaitPursuitFv + .4byte onStart__Q53scn4step5enemy10brontoburt16BrainWaitPursuitFv + .4byte onRecover__Q53scn4step5enemy10brontoburt16BrainWaitPursuitFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainWalk.s b/asm/src/BrainWalk.s index a8f940a4..73d99764 100644 --- a/asm/src/BrainWalk.s +++ b/asm/src/BrainWalk.s @@ -456,11 +456,11 @@ __dt__Q53scn4step5enemy5rocky9BrainWalkFv: __vt__Q53scn4step5enemy11bladeknight9BrainWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11bladeknight9BrainWalkFv - .byte4 onStart__Q53scn4step5enemy11bladeknight9BrainWalkFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy11bladeknight9BrainWalkFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy11bladeknight9BrainWalkFv + .4byte onStart__Q53scn4step5enemy11bladeknight9BrainWalkFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy11bladeknight9BrainWalkFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -468,11 +468,11 @@ __vt__Q53scn4step5enemy11bladeknight9BrainWalk: __vt__Q53scn4step5enemy10knucklejoe9BrainWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10knucklejoe9BrainWalkFv - .byte4 onStart__Q53scn4step5enemy10knucklejoe9BrainWalkFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy10knucklejoe9BrainWalkFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy10knucklejoe9BrainWalkFv + .4byte onStart__Q53scn4step5enemy10knucklejoe9BrainWalkFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy10knucklejoe9BrainWalkFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -480,11 +480,11 @@ __vt__Q53scn4step5enemy10knucklejoe9BrainWalk: __vt__Q53scn4step5enemy6lanzer9BrainWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6lanzer9BrainWalkFv - .byte4 onStart__Q53scn4step5enemy6lanzer9BrainWalkFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy6lanzer9BrainWalkFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6lanzer9BrainWalkFv + .4byte onStart__Q53scn4step5enemy6lanzer9BrainWalkFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy6lanzer9BrainWalkFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -492,11 +492,11 @@ __vt__Q53scn4step5enemy6lanzer9BrainWalk: __vt__Q53scn4step5enemy5noddy9BrainWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5noddy9BrainWalkFv - .byte4 onStart__Q53scn4step5enemy5noddy9BrainWalkFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy5noddy9BrainWalkFv + .4byte onStart__Q53scn4step5enemy5noddy9BrainWalkFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -504,11 +504,11 @@ __vt__Q53scn4step5enemy5noddy9BrainWalk: __vt__Q53scn4step5enemy10parasoldee9BrainWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10parasoldee9BrainWalkFv - .byte4 onStart__Q53scn4step5enemy10parasoldee9BrainWalkFv - .byte4 onRecover__Q53scn4step5enemy10parasoldee9BrainWalkFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q53scn4step5enemy10parasoldee9BrainWalkFv + .4byte __dt__Q53scn4step5enemy10parasoldee9BrainWalkFv + .4byte onStart__Q53scn4step5enemy10parasoldee9BrainWalkFv + .4byte onRecover__Q53scn4step5enemy10parasoldee9BrainWalkFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q53scn4step5enemy10parasoldee9BrainWalkFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -516,11 +516,11 @@ __vt__Q53scn4step5enemy10parasoldee9BrainWalk: __vt__Q53scn4step5enemy10parasoldoo9BrainWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10parasoldoo9BrainWalkFv - .byte4 onStart__Q53scn4step5enemy10parasoldoo9BrainWalkFv - .byte4 onRecover__Q53scn4step5enemy10parasoldoo9BrainWalkFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q53scn4step5enemy10parasoldoo9BrainWalkFv + .4byte __dt__Q53scn4step5enemy10parasoldoo9BrainWalkFv + .4byte onStart__Q53scn4step5enemy10parasoldoo9BrainWalkFv + .4byte onRecover__Q53scn4step5enemy10parasoldoo9BrainWalkFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q53scn4step5enemy10parasoldoo9BrainWalkFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -528,9 +528,9 @@ __vt__Q53scn4step5enemy10parasoldoo9BrainWalk: __vt__Q53scn4step5enemy5rocky9BrainWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5rocky9BrainWalkFv - .byte4 onStart__Q53scn4step5enemy5rocky9BrainWalkFv - .byte4 onRecover__Q53scn4step5enemy5rocky9BrainWalkFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy5rocky9BrainWalkFv + .4byte onStart__Q53scn4step5enemy5rocky9BrainWalkFv + .4byte onRecover__Q53scn4step5enemy5rocky9BrainWalkFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainWalkAround.s b/asm/src/BrainWalkAround.s index 79b60f1a..19e480e3 100644 --- a/asm/src/BrainWalkAround.s +++ b/asm/src/BrainWalkAround.s @@ -400,11 +400,11 @@ __dt__Q53scn4step5enemy9waddledoo15BrainWalkAroundFv: __vt__Q53scn4step5enemy6common15BrainWalkAround: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common15BrainWalkAroundFv - .byte4 onStart__Q43scn4step5enemy9BrainBaseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy6common15BrainWalkAroundFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6common15BrainWalkAroundFv + .4byte onStart__Q43scn4step5enemy9BrainBaseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy6common15BrainWalkAroundFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -412,17 +412,17 @@ __vt__Q53scn4step5enemy6common15BrainWalkAround: __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11broomhatter15BrainWalkAround __vt__Q53scn4step5enemy11broomhatter15BrainWalkAround: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11broomhatter15BrainWalkAroundFv - .byte4 onStart__Q43scn4step5enemy9BrainBaseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy11broomhatter15BrainWalkAroundFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy11broomhatter15BrainWalkAroundFv + .4byte onStart__Q43scn4step5enemy9BrainBaseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy11broomhatter15BrainWalkAroundFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -430,11 +430,11 @@ __vt__Q53scn4step5enemy11broomhatter15BrainWalkAround: __vt__Q53scn4step5enemy6lanzer15BrainWalkAround: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6lanzer15BrainWalkAroundFv - .byte4 onStart__Q53scn4step5enemy6lanzer15BrainWalkAroundFv - .byte4 onRecover__Q53scn4step5enemy6lanzer15BrainWalkAroundFv - .byte4 onLanding__Q53scn4step5enemy6lanzer15BrainWalkAroundFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6lanzer15BrainWalkAroundFv + .4byte onStart__Q53scn4step5enemy6lanzer15BrainWalkAroundFv + .4byte onRecover__Q53scn4step5enemy6lanzer15BrainWalkAroundFv + .4byte onLanding__Q53scn4step5enemy6lanzer15BrainWalkAroundFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -442,11 +442,11 @@ __vt__Q53scn4step5enemy6lanzer15BrainWalkAround: __vt__Q53scn4step5enemy6sodory15BrainWalkAround: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6sodory15BrainWalkAroundFv - .byte4 onStart__Q53scn4step5enemy6sodory15BrainWalkAroundFv - .byte4 onRecover__Q53scn4step5enemy6sodory15BrainWalkAroundFv - .byte4 onLanding__Q53scn4step5enemy6sodory15BrainWalkAroundFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6sodory15BrainWalkAroundFv + .4byte onStart__Q53scn4step5enemy6sodory15BrainWalkAroundFv + .4byte onRecover__Q53scn4step5enemy6sodory15BrainWalkAroundFv + .4byte onLanding__Q53scn4step5enemy6sodory15BrainWalkAroundFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -454,9 +454,9 @@ __vt__Q53scn4step5enemy6sodory15BrainWalkAround: __vt__Q53scn4step5enemy9waddledoo15BrainWalkAround: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledoo15BrainWalkAroundFv - .byte4 onStart__Q43scn4step5enemy9BrainBaseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy9waddledoo15BrainWalkAroundFv - .byte4 update__Q53scn4step5enemy9waddledoo15BrainWalkAroundFv + .4byte __dt__Q53scn4step5enemy9waddledoo15BrainWalkAroundFv + .4byte onStart__Q43scn4step5enemy9BrainBaseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy9waddledoo15BrainWalkAroundFv + .4byte update__Q53scn4step5enemy9waddledoo15BrainWalkAroundFv .4byte 0 diff --git a/asm/src/BrainWalkStepBack.s b/asm/src/BrainWalkStepBack.s index 4e6d4a75..991ba663 100644 --- a/asm/src/BrainWalkStepBack.s +++ b/asm/src/BrainWalkStepBack.s @@ -116,9 +116,9 @@ __dt__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv: __vt__Q53scn4step5enemy10knucklejoe17BrainWalkStepBack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv - .byte4 onStart__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv - .byte4 update__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv + .4byte __dt__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv + .4byte onStart__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv + .4byte update__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv .4byte 0 diff --git a/asm/src/BrainWalkStraight.s b/asm/src/BrainWalkStraight.s index 92baff3f..6a9f9abd 100644 --- a/asm/src/BrainWalkStraight.s +++ b/asm/src/BrainWalkStraight.s @@ -101,11 +101,11 @@ __dt__Q53scn4step5enemy9waddledoo17BrainWalkStraightFv: __vt__Q53scn4step5enemy6common17BrainWalkStraight: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common17BrainWalkStraightFv - .byte4 onStart__Q43scn4step5enemy9BrainBaseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy6common17BrainWalkStraightFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6common17BrainWalkStraightFv + .4byte onStart__Q43scn4step5enemy9BrainBaseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy6common17BrainWalkStraightFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -113,9 +113,9 @@ __vt__Q53scn4step5enemy6common17BrainWalkStraight: __vt__Q53scn4step5enemy9waddledoo17BrainWalkStraight: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledoo17BrainWalkStraightFv - .byte4 onStart__Q43scn4step5enemy9BrainBaseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy9waddledoo17BrainWalkStraightFv - .byte4 update__Q53scn4step5enemy9waddledoo17BrainWalkStraightFv + .4byte __dt__Q53scn4step5enemy9waddledoo17BrainWalkStraightFv + .4byte onStart__Q43scn4step5enemy9BrainBaseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy9waddledoo17BrainWalkStraightFv + .4byte update__Q53scn4step5enemy9waddledoo17BrainWalkStraightFv .4byte 0 diff --git a/asm/src/BrainWalkTurnCliff.s b/asm/src/BrainWalkTurnCliff.s index 55c731df..f8002fc9 100644 --- a/asm/src/BrainWalkTurnCliff.s +++ b/asm/src/BrainWalkTurnCliff.s @@ -32,9 +32,9 @@ __dt__Q53scn4step5enemy6common18BrainWalkTurnCliffFv: __vt__Q53scn4step5enemy6common18BrainWalkTurnCliff: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common18BrainWalkTurnCliffFv - .byte4 onStart__Q43scn4step5enemy9BrainBaseFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy6common18BrainWalkTurnCliffFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6common18BrainWalkTurnCliffFv + .4byte onStart__Q43scn4step5enemy9BrainBaseFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy6common18BrainWalkTurnCliffFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainWall.s b/asm/src/BrainWall.s index 467a7aac..98d12d97 100644 --- a/asm/src/BrainWall.s +++ b/asm/src/BrainWall.s @@ -112,15 +112,15 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9S __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9tsukikage9BrainWall __vt__Q53scn4step5enemy9tsukikage9BrainWall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9tsukikage9BrainWallFv - .byte4 onStart__Q53scn4step5enemy9tsukikage9BrainWallFv - .byte4 onRecover__Q53scn4step5enemy9tsukikage9BrainWallFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy9tsukikage9BrainWallFv + .4byte onStart__Q53scn4step5enemy9tsukikage9BrainWallFv + .4byte onRecover__Q53scn4step5enemy9tsukikage9BrainWallFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainWhispy.s b/asm/src/BrainWhispy.s index bd68dc45..859510bf 100644 --- a/asm/src/BrainWhispy.s +++ b/asm/src/BrainWhispy.s @@ -444,17 +444,17 @@ __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10brontoburt11BrainWhispy __vt__Q53scn4step5enemy10brontoburt11BrainWhispy: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10brontoburt11BrainWhispyFv - .byte4 onStart__Q53scn4step5enemy10brontoburt11BrainWhispyFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy10brontoburt11BrainWhispyFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy10brontoburt11BrainWhispyFv + .4byte onStart__Q53scn4step5enemy10brontoburt11BrainWhispyFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy10brontoburt11BrainWhispyFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -462,17 +462,17 @@ __vt__Q53scn4step5enemy10brontoburt11BrainWhispy: __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como11StateAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como11StateAppear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como11StateAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como11StateAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como11StateAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4como11BrainWhispy __vt__Q53scn4step5enemy4como11BrainWhispy: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4como11BrainWhispyFv - .byte4 onStart__Q53scn4step5enemy4como11BrainWhispyFv - .byte4 onRecover__Q53scn4step5enemy4como11BrainWhispyFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy4como11BrainWhispyFv + .4byte onStart__Q53scn4step5enemy4como11BrainWhispyFv + .4byte onRecover__Q53scn4step5enemy4como11BrainWhispyFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -480,17 +480,17 @@ __vt__Q53scn4step5enemy4como11BrainWhispy: __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5gordo11BrainWhispy __vt__Q53scn4step5enemy5gordo11BrainWhispy: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5gordo11BrainWhispyFv - .byte4 onStart__Q53scn4step5enemy5gordo11BrainWhispyFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy5gordo11BrainWhispyFv + .4byte onStart__Q53scn4step5enemy5gordo11BrainWhispyFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -498,17 +498,17 @@ __vt__Q53scn4step5enemy5gordo11BrainWhispy: __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6scarfy11BrainWhispy __vt__Q53scn4step5enemy6scarfy11BrainWhispy: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6scarfy11BrainWhispyFv - .byte4 onStart__Q53scn4step5enemy6scarfy11BrainWhispyFv - .byte4 onRecover__Q53scn4step5enemy6scarfy11BrainWhispyFv - .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy6scarfy11BrainWhispyFv + .4byte onStart__Q53scn4step5enemy6scarfy11BrainWhispyFv + .4byte onRecover__Q53scn4step5enemy6scarfy11BrainWhispyFv + .4byte onLanding__Q43scn4step5enemy9BrainBaseFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -516,15 +516,15 @@ __vt__Q53scn4step5enemy6scarfy11BrainWhispy: __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee11BrainWhispy __vt__Q53scn4step5enemy9waddledee11BrainWhispy: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledee11BrainWhispyFv - .byte4 onStart__Q53scn4step5enemy9waddledee11BrainWhispyFv - .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv - .byte4 onLanding__Q53scn4step5enemy9waddledee11BrainWhispyFv - .byte4 update__Q43scn4step5enemy9BrainBaseFv + .4byte __dt__Q53scn4step5enemy9waddledee11BrainWhispyFv + .4byte onStart__Q53scn4step5enemy9waddledee11BrainWhispyFv + .4byte onRecover__Q43scn4step5enemy9BrainBaseFv + .4byte onLanding__Q53scn4step5enemy9waddledee11BrainWhispyFv + .4byte update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/Button.s b/asm/src/Button.s index 81b61742..fa2de439 100644 --- a/asm/src/Button.s +++ b/asm/src/Button.s @@ -618,10 +618,10 @@ canCursorMoveRight__Q43scn7history6detail6ButtonCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251957 $$251957: - .byte4 $$251953 - .byte4 $$251954 - .byte4 $$251955 - .byte4 $$251956 + .4byte $$251953 + .4byte $$251954 + .4byte $$251955 + .4byte $$251956 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global MOVE_TABLE__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2 @@ -725,45 +725,45 @@ $$251584: .balign 4 .global PANES__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2 PANES__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2: - .byte4 $$251572 - .byte4 $$251573 - .byte4 $$251574 - .byte4 $$251575 - .byte4 $$251576 - .byte4 $$251577 - .byte4 $$251578 - .byte4 $$251579 - .byte4 $$251580 - .byte4 $$251581 - .byte4 $$251582 - .byte4 $$251583 - .byte4 $$251584 + .4byte $$251572 + .4byte $$251573 + .4byte $$251574 + .4byte $$251575 + .4byte $$251576 + .4byte $$251577 + .4byte $$251578 + .4byte $$251579 + .4byte $$251580 + .4byte $$251581 + .4byte $$251582 + .4byte $$251583 + .4byte $$251584 .global TABLE_2__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2 TABLE_2__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2: - .byte4 $$251572 - .byte4 $$251583 - .byte4 $$251573 - .byte4 $$251575 - .byte4 $$251577 - .byte4 $$251578 - .byte4 $$251579 - .byte4 $$251584 - .byte4 $$251580 - .byte4 $$251580 - .byte4 $$251580 + .4byte $$251572 + .4byte $$251583 + .4byte $$251573 + .4byte $$251575 + .4byte $$251577 + .4byte $$251578 + .4byte $$251579 + .4byte $$251584 + .4byte $$251580 + .4byte $$251580 + .4byte $$251580 .global TABLE_3__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2 TABLE_3__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2: - .byte4 $$251572 - .byte4 $$251583 - .byte4 $$251573 - .byte4 $$251575 - .byte4 $$251577 - .byte4 $$251578 - .byte4 $$251579 - .byte4 $$251584 - .byte4 $$251581 - .byte4 $$251581 - .byte4 $$251581 + .4byte $$251572 + .4byte $$251583 + .4byte $$251573 + .4byte $$251575 + .4byte $$251577 + .4byte $$251578 + .4byte $$251579 + .4byte $$251584 + .4byte $$251581 + .4byte $$251581 + .4byte $$251581 .global $$252197 $$252197: .asciz "history/Detail" diff --git a/asm/src/CaptureHeroReceiver.s b/asm/src/CaptureHeroReceiver.s index e44d8298..f3f4ca6a 100644 --- a/asm/src/CaptureHeroReceiver.s +++ b/asm/src/CaptureHeroReceiver.s @@ -1035,38 +1035,38 @@ __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured25S __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured25StateCapturedWhispyVacuum$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured25StateCapturedWhispyVacuum$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured25StateCapturedWhispyVacuum$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured25StateCapturedWhispyVacuum$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured25StateCapturedWhispyVacuum$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured24StateCapturedWhispyVomit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured24StateCapturedWhispyVomit$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured24StateCapturedWhispyVomit$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured24StateCapturedWhispyVomit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured24StateCapturedWhispyVomit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured24StateCapturedWhispyVomit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyRelease$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyRelease$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyRelease$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyRelease$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyRelease$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyRelease$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWaterGalborosEat$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWaterGalborosEat$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWaterGalborosEat$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWaterGalborosEat$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWaterGalborosEat$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWaterGalborosEat$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit$$4PQ43scn4step4hero4Hero$$1Fv .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: .asciz "NW4R:Pointer must not be NULL (p)" diff --git a/asm/src/CarryBlock.s b/asm/src/CarryBlock.s index c622d51f..fa2dec76 100644 --- a/asm/src/CarryBlock.s +++ b/asm/src/CarryBlock.s @@ -122,7 +122,7 @@ $$252260: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn10grandtitle24$$2unnamed$$2CarryBlock_cpp$$2 G3D_RES_FILE_PATH__Q33scn10grandtitle24$$2unnamed$$2CarryBlock_cpp$$2: - .byte4 $$251790 + .4byte $$251790 .global $$252259 $$252259: .asciz "TopL" diff --git a/asm/src/ChainStarter.s b/asm/src/ChainStarter.s index a80eb280..8085d121 100644 --- a/asm/src/ChainStarter.s +++ b/asm/src/ChainStarter.s @@ -94,9 +94,9 @@ onSwitchOn__Q53scn4step7gimmick12chainstarter12ChainStarterFv: __vt__Q53scn4step7gimmick12chainstarter12ChainStarter: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick12chainstarter12ChainStarterFv - .byte4 onSwitchOn__Q53scn4step7gimmick12chainstarter12ChainStarterFv - .byte4 onSwitchOff__Q43scn4step7gimmick14SwitchReceiverFv - .byte4 onSwitchToggle__Q43scn4step7gimmick14SwitchReceiverFv - .byte4 onSwitchOnFromSuperBeamSwitch__Q43scn4step7gimmick14SwitchReceiverFv - .byte4 checkDemoPos__Q43scn4step7gimmick14SwitchReceiverCFRQ33hel4math7Vector2 + .4byte __dt__Q53scn4step7gimmick12chainstarter12ChainStarterFv + .4byte onSwitchOn__Q53scn4step7gimmick12chainstarter12ChainStarterFv + .4byte onSwitchOff__Q43scn4step7gimmick14SwitchReceiverFv + .4byte onSwitchToggle__Q43scn4step7gimmick14SwitchReceiverFv + .4byte onSwitchOnFromSuperBeamSwitch__Q43scn4step7gimmick14SwitchReceiverFv + .4byte checkDemoPos__Q43scn4step7gimmick14SwitchReceiverCFRQ33hel4math7Vector2 diff --git a/asm/src/ChallengeBattleCtrl.s b/asm/src/ChallengeBattleCtrl.s index 5bf0adeb..8f84f8ff 100644 --- a/asm/src/ChallengeBattleCtrl.s +++ b/asm/src/ChallengeBattleCtrl.s @@ -225,11 +225,11 @@ __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick24St __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick24StateChallengeBattleLose$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick24StateChallengeBattleLose$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick24StateChallengeBattleLose$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick24StateChallengeBattleLose$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick24StateChallengeBattleLose$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$1Fv diff --git a/asm/src/ChallengeDoor.s b/asm/src/ChallengeDoor.s index 0bd2f761..02908563 100644 --- a/asm/src/ChallengeDoor.s +++ b/asm/src/ChallengeDoor.s @@ -1925,9 +1925,9 @@ $$257575: .balign 4 .global T_ANIM_LIST__Q53scn4step7gimmick13challengedoor27$$2unnamed$$2ChallengeDoor_cpp$$2 T_ANIM_LIST__Q53scn4step7gimmick13challengedoor27$$2unnamed$$2ChallengeDoor_cpp$$2: - .byte4 $$257573 - .byte4 $$257574 - .byte4 $$257575 + .4byte $$257573 + .4byte $$257574 + .4byte $$257575 .global $$260101 $$260101: .asciz "step/gimmick/ChallengeDoor" @@ -1975,8 +1975,8 @@ $$260508: __vt__Q24util154StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateEnterChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4Q33scn4step13ChallengeKind$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util154StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateEnterChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4Q33scn4step13ChallengeKind$$4b$$1Fv - .byte4 create__Q24util154StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateEnterChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4Q33scn4step13ChallengeKind$$4b$$1Fv + .4byte __dt__Q24util154StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateEnterChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4Q33scn4step13ChallengeKind$$4b$$1Fv + .4byte create__Q24util154StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateEnterChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4Q33scn4step13ChallengeKind$$4b$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -1985,25 +1985,25 @@ __vt__Q24util154StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick23St __vt__Q53scn4step7gimmick13challengedoor13ChallengeDoor: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte __dt__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv .4byte 0 - .byte4 init__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 registerToRoot__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 registerToRootCharaBack__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 registerToRootCharaFront__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 procAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 startUnlockDemo__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 endUnlockDemo__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 unsetZoomAll__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 unlockAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 isUnlockAnimEnd__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 canEnter__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 isCleared__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 getEnterDistX__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 getEnterDistY__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 modelMainSetWaitAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 reqDoorOpenSE__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 reqDoorCloseSE__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte init__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte registerToRoot__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte registerToRootCharaBack__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte registerToRootCharaFront__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte procAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte startUnlockDemo__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte endUnlockDemo__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte unsetZoomAll__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte unlockAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte isUnlockAnimEnd__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte canEnter__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte isCleared__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte getEnterDistX__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte getEnterDistY__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte modelMainSetWaitAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte reqDoorOpenSE__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte reqDoorCloseSE__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" diff --git a/asm/src/ChallengeDoorMaster.s b/asm/src/ChallengeDoorMaster.s index a0cc7927..1ab0017a 100644 --- a/asm/src/ChallengeDoorMaster.s +++ b/asm/src/ChallengeDoorMaster.s @@ -861,24 +861,24 @@ kind__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$255380 $$255380: - .byte4 $$255367 - .byte4 $$255368 - .byte4 $$255369 - .byte4 $$255370 - .byte4 $$255371 - .byte4 $$255372 - .byte4 $$255373 - .byte4 $$255374 - .byte4 $$255375 - .byte4 $$255376 - .byte4 $$255377 - .byte4 $$255378 - .byte4 $$255379 + .4byte $$255367 + .4byte $$255368 + .4byte $$255369 + .4byte $$255370 + .4byte $$255371 + .4byte $$255372 + .4byte $$255373 + .4byte $$255374 + .4byte $$255375 + .4byte $$255376 + .4byte $$255377 + .4byte $$255378 + .4byte $$255379 .global $$255490 $$255490: - .byte4 $$255487 - .byte4 $$255488 - .byte4 $$255489 + .4byte $$255487 + .4byte $$255488 + .4byte $$255489 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256036 @@ -992,25 +992,25 @@ $$256299: __vt__Q53scn4step7gimmick13challengedoor19ChallengeDoorMaster: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv - .byte4 kind__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterCFv - .byte4 init__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv - .byte4 registerToRoot__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFRQ23g3d4Root - .byte4 registerToRootCharaBack__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFRQ23g3d4Root - .byte4 registerToRootCharaFront__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFRQ23g3d4Root - .byte4 procAnim__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv - .byte4 startUnlockDemo__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv - .byte4 endUnlockDemo__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv - .byte4 unsetZoomAll__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv - .byte4 unlockAnim__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv - .byte4 isUnlockAnimEnd__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterCFv - .byte4 canEnter__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterCFv - .byte4 isCleared__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 getEnterDistX__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterCFv - .byte4 getEnterDistY__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterCFv - .byte4 modelMainSetWaitAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 reqDoorOpenSE__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv - .byte4 reqDoorCloseSE__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv + .4byte __dt__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv + .4byte kind__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterCFv + .4byte init__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv + .4byte registerToRoot__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFRQ23g3d4Root + .4byte registerToRootCharaBack__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFRQ23g3d4Root + .4byte registerToRootCharaFront__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFRQ23g3d4Root + .4byte procAnim__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv + .4byte startUnlockDemo__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv + .4byte endUnlockDemo__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv + .4byte unsetZoomAll__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv + .4byte unlockAnim__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv + .4byte isUnlockAnimEnd__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterCFv + .4byte canEnter__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterCFv + .4byte isCleared__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte getEnterDistX__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterCFv + .4byte getEnterDistY__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterCFv + .4byte modelMainSetWaitAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte reqDoorOpenSE__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv + .4byte reqDoorCloseSE__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" @@ -1055,7 +1055,7 @@ $$256158: .4byte 0 .global $$255480 $$255480: - .byte4 $$255478 + .4byte $$255478 .global lbl_805627C4 lbl_805627C4: - .byte4 $$255479 + .4byte $$255479 diff --git a/asm/src/ChallengeDoorMasterEx.s b/asm/src/ChallengeDoorMasterEx.s index 5180cbfa..cdf2a1b3 100644 --- a/asm/src/ChallengeDoorMasterEx.s +++ b/asm/src/ChallengeDoorMasterEx.s @@ -505,25 +505,25 @@ $$256693: __vt__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterEx: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv - .byte4 kind__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExCFv - .byte4 init__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv - .byte4 registerToRoot__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 registerToRootCharaBack__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 registerToRootCharaFront__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 procAnim__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv - .byte4 startUnlockDemo__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv - .byte4 endUnlockDemo__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv - .byte4 unsetZoomAll__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 unlockAnim__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv - .byte4 isUnlockAnimEnd__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 canEnter__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExCFv - .byte4 isCleared__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 getEnterDistX__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExCFv - .byte4 getEnterDistY__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExCFv - .byte4 modelMainSetWaitAnim__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv - .byte4 reqDoorOpenSE__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv - .byte4 reqDoorCloseSE__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv + .4byte __dt__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv + .4byte kind__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExCFv + .4byte init__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv + .4byte registerToRoot__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte registerToRootCharaBack__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte registerToRootCharaFront__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte procAnim__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv + .4byte startUnlockDemo__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv + .4byte endUnlockDemo__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv + .4byte unsetZoomAll__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte unlockAnim__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv + .4byte isUnlockAnimEnd__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte canEnter__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExCFv + .4byte isCleared__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte getEnterDistX__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExCFv + .4byte getEnterDistY__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExCFv + .4byte modelMainSetWaitAnim__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv + .4byte reqDoorOpenSE__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv + .4byte reqDoorCloseSE__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" diff --git a/asm/src/ChallengeDoorMusou.s b/asm/src/ChallengeDoorMusou.s index 73dcb655..59259ec1 100644 --- a/asm/src/ChallengeDoorMusou.s +++ b/asm/src/ChallengeDoorMusou.s @@ -276,25 +276,25 @@ $$255023: __vt__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusou: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusouFv - .byte4 kind__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusouCFv - .byte4 init__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusouFv - .byte4 registerToRoot__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 registerToRootCharaBack__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 registerToRootCharaFront__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 procAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 startUnlockDemo__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusouFv - .byte4 endUnlockDemo__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusouFv - .byte4 unsetZoomAll__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 unlockAnim__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusouFv - .byte4 isUnlockAnimEnd__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 canEnter__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusouCFv - .byte4 isCleared__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 getEnterDistX__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 getEnterDistY__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 modelMainSetWaitAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 reqDoorOpenSE__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 reqDoorCloseSE__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte __dt__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusouFv + .4byte kind__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusouCFv + .4byte init__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusouFv + .4byte registerToRoot__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte registerToRootCharaBack__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte registerToRootCharaFront__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte procAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte startUnlockDemo__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusouFv + .4byte endUnlockDemo__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusouFv + .4byte unsetZoomAll__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte unlockAnim__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusouFv + .4byte isUnlockAnimEnd__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte canEnter__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusouCFv + .4byte isCleared__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte getEnterDistX__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte getEnterDistY__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte modelMainSetWaitAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte reqDoorOpenSE__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte reqDoorCloseSE__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" diff --git a/asm/src/ChallengeDoorMusouEx.s b/asm/src/ChallengeDoorMusouEx.s index 859acc99..e3b29c53 100644 --- a/asm/src/ChallengeDoorMusouEx.s +++ b/asm/src/ChallengeDoorMusouEx.s @@ -387,25 +387,25 @@ $$256697: __vt__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouEx: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv - .byte4 kind__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExCFv - .byte4 init__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv - .byte4 registerToRoot__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 registerToRootCharaBack__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 registerToRootCharaFront__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 procAnim__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv - .byte4 startUnlockDemo__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv - .byte4 endUnlockDemo__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv - .byte4 unsetZoomAll__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 unlockAnim__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv - .byte4 isUnlockAnimEnd__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 canEnter__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExCFv - .byte4 isCleared__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 getEnterDistX__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExCFv - .byte4 getEnterDistY__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExCFv - .byte4 modelMainSetWaitAnim__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv - .byte4 reqDoorOpenSE__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv - .byte4 reqDoorCloseSE__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv + .4byte __dt__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv + .4byte kind__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExCFv + .4byte init__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv + .4byte registerToRoot__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte registerToRootCharaBack__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte registerToRootCharaFront__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte procAnim__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv + .4byte startUnlockDemo__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv + .4byte endUnlockDemo__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv + .4byte unsetZoomAll__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte unlockAnim__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv + .4byte isUnlockAnimEnd__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte canEnter__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExCFv + .4byte isCleared__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte getEnterDistX__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExCFv + .4byte getEnterDistY__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExCFv + .4byte modelMainSetWaitAnim__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv + .4byte reqDoorOpenSE__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv + .4byte reqDoorCloseSE__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" diff --git a/asm/src/ChallengeDoorNormal.s b/asm/src/ChallengeDoorNormal.s index 1db720c4..413cce03 100644 --- a/asm/src/ChallengeDoorNormal.s +++ b/asm/src/ChallengeDoorNormal.s @@ -216,25 +216,25 @@ $$255043: __vt__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormal: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalFv - .byte4 kind__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalCFv - .byte4 init__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalFv - .byte4 registerToRoot__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 registerToRootCharaBack__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 registerToRootCharaFront__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 procAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 startUnlockDemo__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalFv - .byte4 endUnlockDemo__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalFv - .byte4 unsetZoomAll__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 unlockAnim__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalFv - .byte4 isUnlockAnimEnd__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 canEnter__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalCFv - .byte4 isCleared__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 getEnterDistX__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 getEnterDistY__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 modelMainSetWaitAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 reqDoorOpenSE__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 reqDoorCloseSE__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte __dt__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalFv + .4byte kind__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalCFv + .4byte init__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalFv + .4byte registerToRoot__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte registerToRootCharaBack__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte registerToRootCharaFront__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte procAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte startUnlockDemo__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalFv + .4byte endUnlockDemo__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalFv + .4byte unsetZoomAll__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte unlockAnim__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalFv + .4byte isUnlockAnimEnd__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte canEnter__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalCFv + .4byte isCleared__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte getEnterDistX__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte getEnterDistY__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte modelMainSetWaitAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte reqDoorOpenSE__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte reqDoorCloseSE__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" diff --git a/asm/src/ChallengeDoorTraining.s b/asm/src/ChallengeDoorTraining.s index 8e895982..4d87c7e7 100644 --- a/asm/src/ChallengeDoorTraining.s +++ b/asm/src/ChallengeDoorTraining.s @@ -186,25 +186,25 @@ $$254641: __vt__Q53scn4step7gimmick13challengedoor21ChallengeDoorTraining: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingFv - .byte4 kind__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingCFv - .byte4 init__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingFv - .byte4 registerToRoot__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 registerToRootCharaBack__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 registerToRootCharaFront__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root - .byte4 procAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 startUnlockDemo__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingFv - .byte4 endUnlockDemo__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingFv - .byte4 unsetZoomAll__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 unlockAnim__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingFv - .byte4 isUnlockAnimEnd__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv - .byte4 canEnter__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingCFv - .byte4 isCleared__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingCFv - .byte4 getEnterDistX__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingCFv - .byte4 getEnterDistY__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingCFv - .byte4 modelMainSetWaitAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 reqDoorOpenSE__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv - .byte4 reqDoorCloseSE__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte __dt__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingFv + .4byte kind__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingCFv + .4byte init__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingFv + .4byte registerToRoot__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte registerToRootCharaBack__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte registerToRootCharaFront__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRQ23g3d4Root + .4byte procAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte startUnlockDemo__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingFv + .4byte endUnlockDemo__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingFv + .4byte unsetZoomAll__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte unlockAnim__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingFv + .4byte isUnlockAnimEnd__Q53scn4step7gimmick13challengedoor13ChallengeDoorCFv + .4byte canEnter__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingCFv + .4byte isCleared__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingCFv + .4byte getEnterDistX__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingCFv + .4byte getEnterDistY__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingCFv + .4byte modelMainSetWaitAnim__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte reqDoorOpenSE__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv + .4byte reqDoorCloseSE__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254622 diff --git a/asm/src/ChallengeKindUtil.s b/asm/src/ChallengeKindUtil.s index df75f0b2..f68c9270 100644 --- a/asm/src/ChallengeKindUtil.s +++ b/asm/src/ChallengeKindUtil.s @@ -280,130 +280,130 @@ T_INFOS__Q33scn4step31$$2unnamed$$2ChallengeKindUtil_cpp$$2: .4byte 0 .4byte 0x00000001 .4byte 0x00000002 - .byte4 $$248746 - .byte4 $$248746 - .byte4 $$248747 - .byte4 $$248746 + .4byte $$248746 + .4byte $$248746 + .4byte $$248747 + .4byte $$248746 .4byte 0 .4byte 0x40400000 .4byte 0x0000000B .4byte 0x00000005 - .byte4 $$248748 - .byte4 $$248748 - .byte4 $$248749 - .byte4 $$248748 + .4byte $$248748 + .4byte $$248748 + .4byte $$248749 + .4byte $$248748 .4byte 0x00000022 .4byte 0x3F800000 .4byte 0x00000008 .4byte 0x00000004 - .byte4 $$248750 - .byte4 $$248750 - .byte4 $$248751 - .byte4 $$248750 + .4byte $$248750 + .4byte $$248750 + .4byte $$248751 + .4byte $$248750 .4byte 0x0000000F .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248752 - .byte4 $$248752 - .byte4 $$248753 - .byte4 $$248754 + .4byte $$248752 + .4byte $$248752 + .4byte $$248753 + .4byte $$248754 .4byte 0x00000026 .4byte 0x40000000 .4byte 0x00000004 .4byte 0x00000003 - .byte4 $$248755 - .byte4 $$248755 - .byte4 $$248756 - .byte4 $$248755 + .4byte $$248755 + .4byte $$248755 + .4byte $$248756 + .4byte $$248755 .4byte 0x0000000B .4byte 0x40A00000 .4byte 0x00000015 .4byte 0x00000007 - .byte4 $$248757 - .byte4 $$248757 - .byte4 $$248758 - .byte4 $$248757 + .4byte $$248757 + .4byte $$248757 + .4byte $$248758 + .4byte $$248757 .4byte 0x00000019 .4byte 0x40C00000 .4byte 0x00000013 .4byte 0x00000006 - .byte4 $$248759 - .byte4 $$248759 - .byte4 $$248760 - .byte4 $$248759 + .4byte $$248759 + .4byte $$248759 + .4byte $$248760 + .4byte $$248759 .4byte 0x0000001A .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248761 - .byte4 $$248761 - .byte4 $$248762 - .byte4 $$248754 + .4byte $$248761 + .4byte $$248761 + .4byte $$248762 + .4byte $$248754 .4byte 0x00000027 .4byte 0x41000000 .4byte 0x00000018 .4byte 0x00000008 - .byte4 $$248763 - .byte4 $$248763 - .byte4 $$248764 - .byte4 $$248763 + .4byte $$248763 + .4byte $$248763 + .4byte $$248764 + .4byte $$248763 .4byte 0x00000013 .4byte 0x40E00000 .4byte 0 .4byte 0 - .byte4 $$248754 - .byte4 $$248754 - .byte4 $$248765 - .byte4 $$248754 + .4byte $$248754 + .4byte $$248754 + .4byte $$248765 + .4byte $$248754 .4byte 0x0000001E .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248766 - .byte4 $$248766 - .byte4 $$248767 - .byte4 $$248754 + .4byte $$248766 + .4byte $$248766 + .4byte $$248767 + .4byte $$248754 .4byte 0x00000028 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248768 - .byte4 $$248768 - .byte4 $$248769 - .byte4 $$248754 + .4byte $$248768 + .4byte $$248768 + .4byte $$248769 + .4byte $$248754 .4byte 0x00000029 .4byte 0x41000000 .4byte 0x00000018 .4byte 0x00000008 - .byte4 $$248770 - .byte4 $$248763 - .byte4 $$248771 - .byte4 $$248763 + .4byte $$248770 + .4byte $$248763 + .4byte $$248771 + .4byte $$248763 .4byte 0x00000004 .4byte 0x41000000 .4byte 0 .4byte 0 - .byte4 $$248772 - .byte4 $$248772 - .byte4 $$248773 - .byte4 $$248754 + .4byte $$248772 + .4byte $$248772 + .4byte $$248773 + .4byte $$248754 .4byte 0x0000002A .4byte 0x41000000 .4byte 0 .4byte 0 - .byte4 $$248774 - .byte4 $$248774 - .byte4 $$248775 - .byte4 $$248754 + .4byte $$248774 + .4byte $$248774 + .4byte $$248775 + .4byte $$248754 .4byte 0x0000002B .4byte 0x41000000 .4byte 0 .4byte 0 - .byte4 $$248776 - .byte4 $$248776 - .byte4 $$248777 - .byte4 $$248754 + .4byte $$248776 + .4byte $$248776 + .4byte $$248777 + .4byte $$248754 .4byte 0x0000002C .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/src/Chara.s b/asm/src/Chara.s index f4019720..3ace3e8e 100644 --- a/asm/src/Chara.s +++ b/asm/src/Chara.s @@ -2352,78 +2352,78 @@ lbl_8020243C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_CHARA_INFO_TABLE__Q33scn14challengetitle19$$2unnamed$$2Chara_cpp$$2 T_CHARA_INFO_TABLE__Q33scn14challengetitle19$$2unnamed$$2Chara_cpp$$2: - .byte4 $$253228 - .byte4 $$253229 - .byte4 $$253230 - .byte4 $$253231 - .byte4 $$253229 - .byte4 $$253230 - .byte4 $$253232 - .byte4 $$253229 - .byte4 $$253230 - .byte4 $$253233 - .byte4 $$253229 - .byte4 $$253230 - .byte4 $$253234 - .byte4 $$253229 - .byte4 $$253230 - .byte4 $$253235 - .byte4 $$253229 - .byte4 $$253230 - .byte4 $$253236 - .byte4 $$253229 - .byte4 $$253230 + .4byte $$253228 + .4byte $$253229 + .4byte $$253230 + .4byte $$253231 + .4byte $$253229 + .4byte $$253230 + .4byte $$253232 + .4byte $$253229 + .4byte $$253230 + .4byte $$253233 + .4byte $$253229 + .4byte $$253230 + .4byte $$253234 + .4byte $$253229 + .4byte $$253230 + .4byte $$253235 + .4byte $$253229 + .4byte $$253230 + .4byte $$253236 + .4byte $$253229 + .4byte $$253230 .global $$253282 $$253282: - .byte4 $$253277 - .byte4 $$253278 - .byte4 $$253279 - .byte4 $$253280 - .byte4 $$253281 + .4byte $$253277 + .4byte $$253278 + .4byte $$253279 + .4byte $$253280 + .4byte $$253281 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_CHARA_INFO_TABLE__Q33scn10grandtitle19$$2unnamed$$2Chara_cpp$$2 T_CHARA_INFO_TABLE__Q33scn10grandtitle19$$2unnamed$$2Chara_cpp$$2: - .byte4 $$253143 - .byte4 $$253144 - .byte4 $$253144 - .byte4 $$253145 - .byte4 $$253146 - .byte4 $$253146 - .byte4 $$253147 - .byte4 $$253148 - .byte4 $$253148 - .byte4 $$253143 - .byte4 $$253149 - .byte4 $$253150 - .byte4 $$253145 - .byte4 $$253151 - .byte4 $$253152 - .byte4 $$253147 - .byte4 $$253153 - .byte4 $$253153 - .byte4 $$253154 - .byte4 $$253155 - .byte4 $$253155 - .byte4 $$253156 - .byte4 $$253155 - .byte4 $$253155 - .byte4 $$253157 - .byte4 $$253158 - .byte4 $$253158 - .byte4 $$253159 - .byte4 $$253160 - .byte4 $$253160 - .byte4 $$253161 - .byte4 $$253162 - .byte4 $$253162 + .4byte $$253143 + .4byte $$253144 + .4byte $$253144 + .4byte $$253145 + .4byte $$253146 + .4byte $$253146 + .4byte $$253147 + .4byte $$253148 + .4byte $$253148 + .4byte $$253143 + .4byte $$253149 + .4byte $$253150 + .4byte $$253145 + .4byte $$253151 + .4byte $$253152 + .4byte $$253147 + .4byte $$253153 + .4byte $$253153 + .4byte $$253154 + .4byte $$253155 + .4byte $$253155 + .4byte $$253156 + .4byte $$253155 + .4byte $$253155 + .4byte $$253157 + .4byte $$253158 + .4byte $$253158 + .4byte $$253159 + .4byte $$253160 + .4byte $$253160 + .4byte $$253161 + .4byte $$253162 + .4byte $$253162 .global $$253204 $$253204: - .byte4 $$253199 - .byte4 $$253200 - .byte4 $$253201 - .byte4 $$253202 - .byte4 $$253203 + .4byte $$253199 + .4byte $$253200 + .4byte $$253201 + .4byte $$253202 + .4byte $$253203 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253229 diff --git a/asm/src/CharaAnimBlender.s b/asm/src/CharaAnimBlender.s index 124fcfed..d7284a12 100644 --- a/asm/src/CharaAnimBlender.s +++ b/asm/src/CharaAnimBlender.s @@ -958,26 +958,26 @@ $$249981: __vt__Q23g3d16CharaAnimBlender: .4byte 0 .4byte 0 - .byte4 IsDerivedFrom__Q34nw4r3g3d13AnmObjChrNodeCFQ44nw4r3g3d6G3dObj7TypeObj - .byte4 G3dProc__Q34nw4r3g3d13AnmObjChrNodeFUlUlPv - .byte4 __dt__Q23g3d16CharaAnimBlenderFv - .byte4 GetTypeObj__Q34nw4r3g3d13AnmObjChrNodeCFv - .byte4 GetTypeName__Q34nw4r3g3d13AnmObjChrNodeCFv - .byte4 SetFrame__Q34nw4r3g3d13AnmObjChrNodeFf - .byte4 GetFrame__Q34nw4r3g3d13AnmObjChrNodeCFv - .byte4 UpdateFrame__Q34nw4r3g3d13AnmObjChrNodeFv - .byte4 SetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeFf - .byte4 GetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeCFv - .byte4 Bind__Q23g3d16CharaAnimBlenderFQ34nw4r3g3d6ResMdl - .byte4 Release__Q34nw4r3g3d13AnmObjChrNodeFv - .byte4 GetResult__Q23g3d16CharaAnimBlenderFPQ34nw4r3g3d12ChrAnmResultUl - .byte4 Attach__Q34nw4r3g3d13AnmObjChrNodeFiPQ34nw4r3g3d12AnmObjChrRes - .byte4 Detach__Q34nw4r3g3d13AnmObjChrNodeFi - .byte4 DetachAll__Q34nw4r3g3d13AnmObjChrNodeFv - .byte4 SetWeight__Q34nw4r3g3d9AnmObjChrFif - .byte4 GetWeight__Q34nw4r3g3d9AnmObjChrCFi - .byte4 Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption - .byte4 Release__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption + .4byte IsDerivedFrom__Q34nw4r3g3d13AnmObjChrNodeCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d13AnmObjChrNodeFUlUlPv + .4byte __dt__Q23g3d16CharaAnimBlenderFv + .4byte GetTypeObj__Q34nw4r3g3d13AnmObjChrNodeCFv + .4byte GetTypeName__Q34nw4r3g3d13AnmObjChrNodeCFv + .4byte SetFrame__Q34nw4r3g3d13AnmObjChrNodeFf + .4byte GetFrame__Q34nw4r3g3d13AnmObjChrNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeCFv + .4byte Bind__Q23g3d16CharaAnimBlenderFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte GetResult__Q23g3d16CharaAnimBlenderFPQ34nw4r3g3d12ChrAnmResultUl + .4byte Attach__Q34nw4r3g3d13AnmObjChrNodeFiPQ34nw4r3g3d12AnmObjChrRes + .4byte Detach__Q34nw4r3g3d13AnmObjChrNodeFi + .4byte DetachAll__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte SetWeight__Q34nw4r3g3d9AnmObjChrFif + .4byte GetWeight__Q34nw4r3g3d9AnmObjChrCFi + .4byte Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption + .4byte Release__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption .global $$2STRING$$2FLog__Q24nw4r4mathFf$$20 $$2STRING$$2FLog__Q24nw4r4mathFf$$20: .asciz "FLog: Input is out of the domain." diff --git a/asm/src/CharaModel.s b/asm/src/CharaModel.s index 0af7c153..8aef8e4c 100644 --- a/asm/src/CharaModel.s +++ b/asm/src/CharaModel.s @@ -615,5 +615,5 @@ onDirty__Q23g3d10CharaModelFv: __vt__Q23g3d10CharaModel: .4byte 0 .4byte 0 - .byte4 __dt__Q23g3d10CharaModelFv - .byte4 onFrameChanged__Q23g3d10CharaModelFRCQ23g3d17ModelAnimAccessor + .4byte __dt__Q23g3d10CharaModelFv + .4byte onFrameChanged__Q23g3d10CharaModelFRCQ23g3d17ModelAnimAccessor diff --git a/asm/src/Chronology.s b/asm/src/Chronology.s index 6be00ec6..f2b195d7 100644 --- a/asm/src/Chronology.s +++ b/asm/src/Chronology.s @@ -151,150 +151,150 @@ $$248743: .global PRODUCTS__Q33scn7history24$$2unnamed$$2Chronology_cpp$$2 PRODUCTS__Q33scn7history24$$2unnamed$$2Chronology_cpp$$2: .4byte 0x000007C7 - .byte4 $$248724 - .byte4 $$248725 + .4byte $$248724 + .4byte $$248725 .4byte 0 - .byte4 $$248726 + .4byte $$248726 .4byte 0x000007C8 - .byte4 $$248727 - .byte4 $$248728 + .4byte $$248727 + .4byte $$248728 .4byte 0 - .byte4 $$248726 + .4byte $$248726 .4byte 0x000007C9 - .byte4 $$248727 - .byte4 $$248729 + .4byte $$248727 + .4byte $$248729 .4byte 0 - .byte4 $$248730 + .4byte $$248730 .4byte 0x000007C9 - .byte4 $$248727 - .byte4 $$248728 + .4byte $$248727 + .4byte $$248728 .4byte 0x00000001 - .byte4 $$248731 + .4byte $$248731 .4byte 0x000007CA - .byte4 $$248727 - .byte4 $$248732 + .4byte $$248727 + .4byte $$248732 .4byte 0 - .byte4 $$248726 + .4byte $$248726 .4byte 0x000007CB - .byte4 $$248727 - .byte4 $$248733 + .4byte $$248727 + .4byte $$248733 .4byte 0 - .byte4 $$248734 + .4byte $$248734 .4byte 0x000007CB - .byte4 $$248727 - .byte4 $$248733 + .4byte $$248727 + .4byte $$248733 .4byte 0x00000001 - .byte4 $$248735 + .4byte $$248735 .4byte 0x000007CB - .byte4 $$248727 - .byte4 $$248728 + .4byte $$248727 + .4byte $$248728 .4byte 0x00000002 - .byte4 $$248736 + .4byte $$248736 .4byte 0x000007CC - .byte4 $$248727 - .byte4 $$248728 + .4byte $$248727 + .4byte $$248728 .4byte 0x00000003 - .byte4 $$248730 + .4byte $$248730 .4byte 0x000007CC - .byte4 $$248727 - .byte4 $$248733 + .4byte $$248727 + .4byte $$248733 .4byte 0x00000002 - .byte4 $$248731 + .4byte $$248731 .4byte 0x000007CD - .byte4 $$248727 - .byte4 $$248728 + .4byte $$248727 + .4byte $$248728 .4byte 0x00000004 - .byte4 $$248730 + .4byte $$248730 .4byte 0x000007CD - .byte4 $$248727 - .byte4 $$248733 + .4byte $$248727 + .4byte $$248733 .4byte 0x00000003 - .byte4 $$248731 + .4byte $$248731 .4byte 0x000007CE - .byte4 $$248727 - .byte4 $$248737 + .4byte $$248727 + .4byte $$248737 .4byte 0 - .byte4 $$248726 + .4byte $$248726 .4byte 0x000007CF - .byte4 $$248727 - .byte4 $$248738 + .4byte $$248727 + .4byte $$248738 .4byte 0 - .byte4 $$248726 + .4byte $$248726 .4byte 0x000007D0 - .byte4 $$248727 - .byte4 $$248733 + .4byte $$248727 + .4byte $$248733 .4byte 0x00000004 - .byte4 $$248726 + .4byte $$248726 .4byte 0x000007D1 - .byte4 $$248727 - .byte4 $$248728 + .4byte $$248727 + .4byte $$248728 .4byte 0x00000005 - .byte4 $$248726 + .4byte $$248726 .4byte 0x000007D2 - .byte4 $$248727 - .byte4 $$248728 + .4byte $$248727 + .4byte $$248728 .4byte 0x00000006 - .byte4 $$248730 + .4byte $$248730 .4byte 0x000007D2 - .byte4 $$248727 - .byte4 $$248739 + .4byte $$248727 + .4byte $$248739 .4byte 0 - .byte4 $$248731 + .4byte $$248731 .4byte 0x000007D3 - .byte4 $$248727 - .byte4 $$248740 + .4byte $$248727 + .4byte $$248740 .4byte 0 - .byte4 $$248726 + .4byte $$248726 .4byte 0x000007D4 - .byte4 $$248727 - .byte4 $$248728 + .4byte $$248727 + .4byte $$248728 .4byte 0x00000007 - .byte4 $$248726 + .4byte $$248726 .4byte 0x000007D5 - .byte4 $$248727 - .byte4 $$248741 + .4byte $$248727 + .4byte $$248741 .4byte 0 - .byte4 $$248726 + .4byte $$248726 .4byte 0x000007D6 - .byte4 $$248727 - .byte4 $$248741 + .4byte $$248727 + .4byte $$248741 .4byte 0x00000001 - .byte4 $$248726 + .4byte $$248726 .4byte 0x000007D7 - .byte4 $$248727 - .byte4 $$248742 + .4byte $$248727 + .4byte $$248742 .4byte 0 - .byte4 $$248726 + .4byte $$248726 .4byte 0x000007D8 - .byte4 $$248727 - .byte4 $$248741 + .4byte $$248727 + .4byte $$248741 .4byte 0x00000002 - .byte4 $$248726 + .4byte $$248726 .4byte 0x000007D9 - .byte4 $$248727 - .byte4 $$248743 + .4byte $$248727 + .4byte $$248743 .4byte 0 - .byte4 $$248726 + .4byte $$248726 .4byte 0x000007DA - .byte4 $$248727 - .byte4 $$248744 + .4byte $$248727 + .4byte $$248744 .4byte 0 - .byte4 $$248726 + .4byte $$248726 .4byte 0x000007DB - .byte4 $$248727 - .byte4 $$248741 + .4byte $$248727 + .4byte $$248741 .4byte 0x00000003 - .byte4 $$248730 + .4byte $$248730 .4byte 0x000007DB - .byte4 $$248727 - .byte4 $$248744 + .4byte $$248727 + .4byte $$248744 .4byte 0x00000001 - .byte4 $$248731 + .4byte $$248731 .4byte 0x000007DC - .byte4 $$248727 - .byte4 $$248745 + .4byte $$248727 + .4byte $$248745 .4byte 0 - .byte4 $$248726 + .4byte $$248726 .global $$248900 $$248900: .asciz "DotKirby" diff --git a/asm/src/CinemaScope.s b/asm/src/CinemaScope.s index ff2bad0f..b853f760 100644 --- a/asm/src/CinemaScope.s +++ b/asm/src/CinemaScope.s @@ -187,11 +187,11 @@ $$251631: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_CINEMASCOPE_FILE_PATH__Q33scn10grandtitle25$$2unnamed$$2CinemaScope_cpp$$2 T_CINEMASCOPE_FILE_PATH__Q33scn10grandtitle25$$2unnamed$$2CinemaScope_cpp$$2: - .byte4 $$251791 + .4byte $$251791 .4byte 0 .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: - .byte4 $$251630 - .byte4 $$251631 + .4byte $$251630 + .4byte $$251631 diff --git a/asm/src/Color.s b/asm/src/Color.s index 410c0d39..d8feba4b 100644 --- a/asm/src/Color.s +++ b/asm/src/Color.s @@ -74,7 +74,7 @@ __ct__Q33hel6common5ColorFUcUcUcUc: /* 8019D990 001997D0 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3Color_cpp + .4byte __sinit_$$3Color_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global BLACK__Q33hel6common5Color diff --git a/asm/src/Commander.s b/asm/src/Commander.s index 5cd56432..62ce4163 100644 --- a/asm/src/Commander.s +++ b/asm/src/Commander.s @@ -3078,8 +3078,8 @@ requestEfConfetti__Q33scn11staffcredit9CommanderFv: /* 803F95DC 003F541C 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3Commander_cpp - .byte4 __sinit_$$3Commander_cpp + .4byte __sinit_$$3Commander_cpp + .4byte __sinit_$$3Commander_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_RETRY_HP_RATE_TABLE__Q43scn4step4boss23$$2unnamed$$2Commander_cpp$$2 diff --git a/asm/src/Common.s b/asm/src/Common.s index ca17968d..55fa0aab 100644 --- a/asm/src/Common.s +++ b/asm/src/Common.s @@ -18,1802 +18,1802 @@ Script__Q53scn4step4hero9modeldesc6CommonFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Script__Q53scn4step4hero9modeldesc6CommonFv$$2ENTRIES$$20 $$2LOCAL$$2Script__Q53scn4step4hero9modeldesc6CommonFv$$2ENTRIES$$20: - .byte4 $$248726 + .4byte $$248726 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248727 + .4byte $$248727 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248728 + .4byte $$248728 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248729 + .4byte $$248729 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248730 + .4byte $$248730 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248731 + .4byte $$248731 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248732 + .4byte $$248732 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248733 + .4byte $$248733 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248734 + .4byte $$248734 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248735 + .4byte $$248735 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248736 + .4byte $$248736 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248737 + .4byte $$248737 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248738 + .4byte $$248738 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248739 + .4byte $$248739 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248740 + .4byte $$248740 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248741 + .4byte $$248741 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248742 + .4byte $$248742 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248743 + .4byte $$248743 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248744 + .4byte $$248744 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248745 + .4byte $$248745 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248746 + .4byte $$248746 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248747 + .4byte $$248747 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248748 + .4byte $$248748 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248749 + .4byte $$248749 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248750 + .4byte $$248750 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248751 + .4byte $$248751 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248752 + .4byte $$248752 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248753 + .4byte $$248753 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248754 + .4byte $$248754 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248755 + .4byte $$248755 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248756 + .4byte $$248756 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248757 + .4byte $$248757 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248758 + .4byte $$248758 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248759 + .4byte $$248759 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248760 + .4byte $$248760 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248761 + .4byte $$248761 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248762 + .4byte $$248762 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248763 + .4byte $$248763 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248764 + .4byte $$248764 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248765 + .4byte $$248765 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248766 + .4byte $$248766 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248767 + .4byte $$248767 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248768 + .4byte $$248768 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248769 + .4byte $$248769 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248770 + .4byte $$248770 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248771 + .4byte $$248771 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248772 + .4byte $$248772 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248773 + .4byte $$248773 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248774 + .4byte $$248774 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248775 + .4byte $$248775 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248776 + .4byte $$248776 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248777 + .4byte $$248777 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248778 + .4byte $$248778 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248779 + .4byte $$248779 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248780 + .4byte $$248780 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248781 + .4byte $$248781 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248782 + .4byte $$248782 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248783 + .4byte $$248783 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248784 + .4byte $$248784 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248785 + .4byte $$248785 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248786 + .4byte $$248786 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248787 + .4byte $$248787 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248788 + .4byte $$248788 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248789 + .4byte $$248789 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248790 + .4byte $$248790 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248791 + .4byte $$248791 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248792 + .4byte $$248792 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248793 + .4byte $$248793 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248794 + .4byte $$248794 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248795 + .4byte $$248795 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248796 + .4byte $$248796 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248797 + .4byte $$248797 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248798 + .4byte $$248798 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248799 + .4byte $$248799 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248800 + .4byte $$248800 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248801 + .4byte $$248801 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248802 + .4byte $$248802 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248803 + .4byte $$248803 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248804 + .4byte $$248804 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248805 + .4byte $$248805 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248806 + .4byte $$248806 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248807 + .4byte $$248807 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248808 + .4byte $$248808 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248809 + .4byte $$248809 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248810 + .4byte $$248810 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248811 + .4byte $$248811 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248812 + .4byte $$248812 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248813 + .4byte $$248813 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248814 + .4byte $$248814 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248815 + .4byte $$248815 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248816 + .4byte $$248816 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248817 + .4byte $$248817 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248818 + .4byte $$248818 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248819 + .4byte $$248819 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248820 + .4byte $$248820 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248821 + .4byte $$248821 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248822 + .4byte $$248822 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248823 + .4byte $$248823 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248824 + .4byte $$248824 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248825 + .4byte $$248825 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248826 + .4byte $$248826 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248827 + .4byte $$248827 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248828 + .4byte $$248828 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248829 + .4byte $$248829 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248830 + .4byte $$248830 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248831 + .4byte $$248831 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248832 + .4byte $$248832 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248833 + .4byte $$248833 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248834 + .4byte $$248834 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248835 + .4byte $$248835 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248836 + .4byte $$248836 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248837 + .4byte $$248837 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248838 + .4byte $$248838 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248839 + .4byte $$248839 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248840 + .4byte $$248840 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248841 + .4byte $$248841 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248842 + .4byte $$248842 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248843 + .4byte $$248843 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248844 + .4byte $$248844 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248845 + .4byte $$248845 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248846 + .4byte $$248846 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248847 + .4byte $$248847 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248848 + .4byte $$248848 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248849 + .4byte $$248849 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248850 + .4byte $$248850 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248851 + .4byte $$248851 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248852 + .4byte $$248852 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248853 + .4byte $$248853 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248854 + .4byte $$248854 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248855 + .4byte $$248855 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248856 + .4byte $$248856 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248857 + .4byte $$248857 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248858 + .4byte $$248858 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248859 + .4byte $$248859 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248860 + .4byte $$248860 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248861 + .4byte $$248861 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248862 + .4byte $$248862 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248863 + .4byte $$248863 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248864 + .4byte $$248864 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248865 + .4byte $$248865 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248866 + .4byte $$248866 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248867 + .4byte $$248867 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248868 + .4byte $$248868 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248869 + .4byte $$248869 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248870 + .4byte $$248870 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248871 + .4byte $$248871 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248872 + .4byte $$248872 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248873 + .4byte $$248873 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248874 + .4byte $$248874 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248875 + .4byte $$248875 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248876 + .4byte $$248876 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248877 + .4byte $$248877 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248878 + .4byte $$248878 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248879 + .4byte $$248879 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248880 + .4byte $$248880 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248881 + .4byte $$248881 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248882 + .4byte $$248882 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248883 + .4byte $$248883 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248884 + .4byte $$248884 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248885 + .4byte $$248885 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248886 + .4byte $$248886 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248887 + .4byte $$248887 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248888 + .4byte $$248888 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248889 + .4byte $$248889 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248890 + .4byte $$248890 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248891 + .4byte $$248891 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248892 + .4byte $$248892 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248893 + .4byte $$248893 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248894 + .4byte $$248894 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248895 + .4byte $$248895 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248896 + .4byte $$248896 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248897 + .4byte $$248897 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248898 + .4byte $$248898 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248899 + .4byte $$248899 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248900 + .4byte $$248900 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248901 + .4byte $$248901 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248902 + .4byte $$248902 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248903 + .4byte $$248903 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248904 + .4byte $$248904 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248905 + .4byte $$248905 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248906 + .4byte $$248906 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248907 + .4byte $$248907 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248908 + .4byte $$248908 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248909 + .4byte $$248909 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248910 + .4byte $$248910 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248911 + .4byte $$248911 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248912 + .4byte $$248912 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248913 + .4byte $$248913 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248914 + .4byte $$248914 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248915 + .4byte $$248915 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248916 + .4byte $$248916 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248917 + .4byte $$248917 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248918 + .4byte $$248918 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248919 + .4byte $$248919 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248920 + .4byte $$248920 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248921 + .4byte $$248921 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248922 + .4byte $$248922 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248923 + .4byte $$248923 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248924 + .4byte $$248924 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248925 + .4byte $$248925 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248926 + .4byte $$248926 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248927 + .4byte $$248927 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248928 + .4byte $$248928 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248929 + .4byte $$248929 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248930 + .4byte $$248930 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248931 + .4byte $$248931 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248932 + .4byte $$248932 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248933 + .4byte $$248933 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248934 + .4byte $$248934 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248935 + .4byte $$248935 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248936 + .4byte $$248936 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248937 + .4byte $$248937 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248938 + .4byte $$248938 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248939 + .4byte $$248939 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248940 + .4byte $$248940 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248941 + .4byte $$248941 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248942 + .4byte $$248942 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248943 + .4byte $$248943 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248944 + .4byte $$248944 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248945 + .4byte $$248945 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248946 + .4byte $$248946 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248947 + .4byte $$248947 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248948 + .4byte $$248948 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248949 + .4byte $$248949 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248950 + .4byte $$248950 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248951 + .4byte $$248951 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248952 + .4byte $$248952 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248953 + .4byte $$248953 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248954 + .4byte $$248954 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248955 + .4byte $$248955 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248956 + .4byte $$248956 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248957 + .4byte $$248957 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248958 + .4byte $$248958 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248959 + .4byte $$248959 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248960 + .4byte $$248960 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248961 + .4byte $$248961 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248962 + .4byte $$248962 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248963 + .4byte $$248963 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248964 + .4byte $$248964 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248965 + .4byte $$248965 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248966 + .4byte $$248966 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248967 + .4byte $$248967 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248968 + .4byte $$248968 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248969 + .4byte $$248969 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248970 + .4byte $$248970 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248971 + .4byte $$248971 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248972 + .4byte $$248972 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248973 + .4byte $$248973 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248974 + .4byte $$248974 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248975 + .4byte $$248975 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248976 + .4byte $$248976 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248977 + .4byte $$248977 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248978 + .4byte $$248978 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248979 + .4byte $$248979 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248980 + .4byte $$248980 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248981 + .4byte $$248981 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248982 + .4byte $$248982 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248983 + .4byte $$248983 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248984 + .4byte $$248984 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248985 + .4byte $$248985 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248986 + .4byte $$248986 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248987 + .4byte $$248987 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248988 + .4byte $$248988 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248989 + .4byte $$248989 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248990 + .4byte $$248990 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248991 + .4byte $$248991 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248992 + .4byte $$248992 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248993 + .4byte $$248993 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248994 + .4byte $$248994 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248995 + .4byte $$248995 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248996 + .4byte $$248996 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248997 + .4byte $$248997 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248998 + .4byte $$248998 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248999 + .4byte $$248999 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249000 + .4byte $$249000 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249001 + .4byte $$249001 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249002 + .4byte $$249002 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249003 + .4byte $$249003 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249004 + .4byte $$249004 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249005 + .4byte $$249005 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249006 + .4byte $$249006 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249007 + .4byte $$249007 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249008 + .4byte $$249008 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249009 + .4byte $$249009 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249010 + .4byte $$249010 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249011 + .4byte $$249011 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249012 + .4byte $$249012 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249013 + .4byte $$249013 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249014 + .4byte $$249014 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249015 + .4byte $$249015 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249016 + .4byte $$249016 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249017 + .4byte $$249017 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249018 + .4byte $$249018 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249019 + .4byte $$249019 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249020 + .4byte $$249020 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249021 + .4byte $$249021 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249022 + .4byte $$249022 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249023 + .4byte $$249023 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249024 + .4byte $$249024 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249025 + .4byte $$249025 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249026 + .4byte $$249026 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249027 + .4byte $$249027 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249028 + .4byte $$249028 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249029 + .4byte $$249029 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249030 + .4byte $$249030 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249031 + .4byte $$249031 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249032 + .4byte $$249032 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249033 + .4byte $$249033 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249034 + .4byte $$249034 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249035 + .4byte $$249035 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249036 + .4byte $$249036 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249037 + .4byte $$249037 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249038 + .4byte $$249038 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249039 + .4byte $$249039 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249040 + .4byte $$249040 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249041 + .4byte $$249041 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249042 + .4byte $$249042 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249043 + .4byte $$249043 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249044 + .4byte $$249044 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249045 + .4byte $$249045 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249046 + .4byte $$249046 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249047 + .4byte $$249047 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249048 + .4byte $$249048 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249049 + .4byte $$249049 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249050 + .4byte $$249050 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249051 + .4byte $$249051 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249052 + .4byte $$249052 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249053 + .4byte $$249053 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249054 + .4byte $$249054 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249055 + .4byte $$249055 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249056 + .4byte $$249056 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249057 + .4byte $$249057 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249058 + .4byte $$249058 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249059 + .4byte $$249059 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249060 + .4byte $$249060 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249061 + .4byte $$249061 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249062 + .4byte $$249062 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249063 + .4byte $$249063 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249064 + .4byte $$249064 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249065 + .4byte $$249065 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249066 + .4byte $$249066 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249067 + .4byte $$249067 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249068 + .4byte $$249068 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249069 + .4byte $$249069 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249070 + .4byte $$249070 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249071 + .4byte $$249071 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249072 + .4byte $$249072 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249073 + .4byte $$249073 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249074 + .4byte $$249074 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249075 + .4byte $$249075 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249076 + .4byte $$249076 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249077 + .4byte $$249077 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249078 + .4byte $$249078 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249079 + .4byte $$249079 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249080 + .4byte $$249080 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249081 + .4byte $$249081 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249082 + .4byte $$249082 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249083 + .4byte $$249083 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249084 + .4byte $$249084 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249085 + .4byte $$249085 .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/Constant.s b/asm/src/Constant.s index 01b3b9c6..7c13d08b 100644 --- a/asm/src/Constant.s +++ b/asm/src/Constant.s @@ -18,11 +18,11 @@ LytResPathPage__Q25pause8ConstantFQ25pause11PageResKind: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PAGE_RES_PATH__Q25pause22$$2unnamed$$2Constant_cpp$$2 T_PAGE_RES_PATH__Q25pause22$$2unnamed$$2Constant_cpp$$2: - .byte4 $$248724 - .byte4 $$248725 - .byte4 $$248725 - .byte4 $$248725 - .byte4 $$248725 + .4byte $$248724 + .4byte $$248725 + .4byte $$248725 + .4byte $$248725 + .4byte $$248725 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/src/ControlIcon.s b/asm/src/ControlIcon.s index 031fec60..8d76cd57 100644 --- a/asm/src/ControlIcon.s +++ b/asm/src/ControlIcon.s @@ -273,10 +273,10 @@ $$251820: .4byte 0 .global PANES__Q33scn5anime25$$2unnamed$$2ControlIcon_cpp$$2 PANES__Q33scn5anime25$$2unnamed$$2ControlIcon_cpp$$2: - .byte4 $$251817 - .byte4 $$251818 - .byte4 $$251819 - .byte4 $$251820 + .4byte $$251817 + .4byte $$251818 + .4byte $$251819 + .4byte $$251820 .global $$252408 $$252408: .asciz "history/Detail" diff --git a/asm/src/Cursor.s b/asm/src/Cursor.s index ec4ebc0a..b3d4257b 100644 --- a/asm/src/Cursor.s +++ b/asm/src/Cursor.s @@ -395,15 +395,15 @@ playChoice__Q43scn7history6detail6CursorFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251586 $$251586: - .byte4 $$251578 - .byte4 $$251579 - .byte4 $$251580 - .byte4 $$251581 - .byte4 $$251582 - .byte4 $$251582 - .byte4 $$251583 - .byte4 $$251584 - .byte4 $$251585 + .4byte $$251578 + .4byte $$251579 + .4byte $$251580 + .4byte $$251581 + .4byte $$251582 + .4byte $$251582 + .4byte $$251583 + .4byte $$251584 + .4byte $$251585 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -419,7 +419,7 @@ $$251582: __vt__Q33scn19challengefileselect6Cursor: .4byte 0 .4byte 0 - .byte4 updateFrame__Q33scn19challengefileselect6CursorFv + .4byte updateFrame__Q33scn19challengefileselect6CursorFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -459,43 +459,43 @@ $$251555: .asciz "ListButtonN" .global PANES__Q43scn7history6detail20$$2unnamed$$2Cursor_cpp$$2 PANES__Q43scn7history6detail20$$2unnamed$$2Cursor_cpp$$2: - .byte4 $$251547 - .byte4 $$251548 - .byte4 $$251549 - .byte4 $$251550 - .byte4 $$251551 - .byte4 $$251551 - .byte4 $$251551 - .byte4 $$251552 - .byte4 $$251553 - .byte4 $$251554 - .byte4 $$251555 + .4byte $$251547 + .4byte $$251548 + .4byte $$251549 + .4byte $$251550 + .4byte $$251551 + .4byte $$251551 + .4byte $$251551 + .4byte $$251552 + .4byte $$251553 + .4byte $$251554 + .4byte $$251555 .global TABLE_2__Q43scn7history6detail20$$2unnamed$$2Cursor_cpp$$2 TABLE_2__Q43scn7history6detail20$$2unnamed$$2Cursor_cpp$$2: - .byte4 $$251547 - .byte4 $$251555 - .byte4 $$251548 - .byte4 $$251549 - .byte4 $$251551 - .byte4 $$251551 - .byte4 $$251551 - .byte4 $$251555 - .byte4 $$251552 - .byte4 $$251552 - .byte4 $$251552 + .4byte $$251547 + .4byte $$251555 + .4byte $$251548 + .4byte $$251549 + .4byte $$251551 + .4byte $$251551 + .4byte $$251551 + .4byte $$251555 + .4byte $$251552 + .4byte $$251552 + .4byte $$251552 .global TABLE_3__Q43scn7history6detail20$$2unnamed$$2Cursor_cpp$$2 TABLE_3__Q43scn7history6detail20$$2unnamed$$2Cursor_cpp$$2: - .byte4 $$251547 - .byte4 $$251555 - .byte4 $$251548 - .byte4 $$251549 - .byte4 $$251551 - .byte4 $$251551 - .byte4 $$251551 - .byte4 $$251555 - .byte4 $$251553 - .byte4 $$251553 - .byte4 $$251553 + .4byte $$251547 + .4byte $$251555 + .4byte $$251548 + .4byte $$251549 + .4byte $$251551 + .4byte $$251551 + .4byte $$251551 + .4byte $$251555 + .4byte $$251553 + .4byte $$251553 + .4byte $$251553 .global $$252454 $$252454: .asciz "history/Detail" diff --git a/asm/src/Custom.s b/asm/src/Custom.s index 91788d64..0caa6aa2 100644 --- a/asm/src/Custom.s +++ b/asm/src/Custom.s @@ -22062,8 +22062,8 @@ $$257952: __vt__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss7bonkers8NodeKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss7bonkers8NodeKind$$1Fv - .byte4 create__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss7bonkers8NodeKind$$1Fv + .4byte __dt__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss7bonkers8NodeKind$$1Fv + .4byte create__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss7bonkers8NodeKind$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -22072,8 +22072,8 @@ __vt__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9Stat __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common11StateAppear$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -22082,25 +22082,25 @@ __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common11Stat __vt__Q53scn4step4boss7bonkers6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step4boss7bonkers6CustomCFv - .byte4 __dt__Q53scn4step4boss7bonkers6CustomFv - .byte4 onInit__Q53scn4step4boss7bonkers6CustomFv - .byte4 onAppear__Q53scn4step4boss7bonkers6CustomFv - .byte4 onStart__Q53scn4step4boss7bonkers6CustomFv - .byte4 onDamage__Q53scn4step4boss7bonkers6CustomFv - .byte4 onDead__Q53scn4step4boss7bonkers6CustomFv - .byte4 onStateChange__Q43scn4step4boss10CustomBaseFv - .byte4 onScriptRequested__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopStart__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopEnd__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopStarted__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopFinished__Q43scn4step4boss10CustomBaseFv - .byte4 onProcAnim__Q53scn4step4boss7bonkers6CustomFv - .byte4 onProcMove__Q43scn4step4boss10CustomBaseFv - .byte4 onProcFixPos__Q53scn4step4boss7bonkers6CustomFv - .byte4 onProcObjCollReact__Q43scn4step4boss10CustomBaseFv - .byte4 onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv - .byte4 getFirstOffs__Q43scn4step4boss10CustomBaseCFv + .4byte GetRuntimeTypeInfo__Q53scn4step4boss7bonkers6CustomCFv + .4byte __dt__Q53scn4step4boss7bonkers6CustomFv + .4byte onInit__Q53scn4step4boss7bonkers6CustomFv + .4byte onAppear__Q53scn4step4boss7bonkers6CustomFv + .4byte onStart__Q53scn4step4boss7bonkers6CustomFv + .4byte onDamage__Q53scn4step4boss7bonkers6CustomFv + .4byte onDead__Q53scn4step4boss7bonkers6CustomFv + .4byte onStateChange__Q43scn4step4boss10CustomBaseFv + .4byte onScriptRequested__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopStart__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopEnd__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopStarted__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopFinished__Q43scn4step4boss10CustomBaseFv + .4byte onProcAnim__Q53scn4step4boss7bonkers6CustomFv + .4byte onProcMove__Q43scn4step4boss10CustomBaseFv + .4byte onProcFixPos__Q53scn4step4boss7bonkers6CustomFv + .4byte onProcObjCollReact__Q43scn4step4boss10CustomBaseFv + .4byte onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv + .4byte getFirstOffs__Q43scn4step4boss10CustomBaseCFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" @@ -22130,14 +22130,14 @@ $$257947: __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSCHide$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSCHide$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSCHide$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSCHide$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSCHide$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateStartWait$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateStartWait$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateStartWait$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateStartWait$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateStartWait$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateStartWait$$4PQ43scn4step4boss4Boss$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -22146,25 +22146,25 @@ __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem __vt__Q53scn4step4boss15challengemaster6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step4boss15challengemaster6CustomCFv - .byte4 __dt__Q53scn4step4boss15challengemaster6CustomFv - .byte4 onInit__Q53scn4step4boss15challengemaster6CustomFv - .byte4 onAppear__Q53scn4step4boss15challengemaster6CustomFv - .byte4 onStart__Q53scn4step4boss15challengemaster6CustomFv - .byte4 onDamage__Q53scn4step4boss15challengemaster6CustomFv - .byte4 onDead__Q53scn4step4boss15challengemaster6CustomFv - .byte4 onStateChange__Q43scn4step4boss10CustomBaseFv - .byte4 onScriptRequested__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopStart__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopEnd__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopStarted__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopFinished__Q43scn4step4boss10CustomBaseFv - .byte4 onProcAnim__Q53scn4step4boss15challengemaster6CustomFv - .byte4 onProcMove__Q53scn4step4boss15challengemaster6CustomFv - .byte4 onProcFixPos__Q53scn4step4boss15challengemaster6CustomFv - .byte4 onProcObjCollReact__Q43scn4step4boss10CustomBaseFv - .byte4 onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv - .byte4 getFirstOffs__Q43scn4step4boss10CustomBaseCFv + .4byte GetRuntimeTypeInfo__Q53scn4step4boss15challengemaster6CustomCFv + .4byte __dt__Q53scn4step4boss15challengemaster6CustomFv + .4byte onInit__Q53scn4step4boss15challengemaster6CustomFv + .4byte onAppear__Q53scn4step4boss15challengemaster6CustomFv + .4byte onStart__Q53scn4step4boss15challengemaster6CustomFv + .4byte onDamage__Q53scn4step4boss15challengemaster6CustomFv + .4byte onDead__Q53scn4step4boss15challengemaster6CustomFv + .4byte onStateChange__Q43scn4step4boss10CustomBaseFv + .4byte onScriptRequested__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopStart__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopEnd__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopStarted__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopFinished__Q43scn4step4boss10CustomBaseFv + .4byte onProcAnim__Q53scn4step4boss15challengemaster6CustomFv + .4byte onProcMove__Q53scn4step4boss15challengemaster6CustomFv + .4byte onProcFixPos__Q53scn4step4boss15challengemaster6CustomFv + .4byte onProcObjCollReact__Q43scn4step4boss10CustomBaseFv + .4byte onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv + .4byte getFirstOffs__Q43scn4step4boss10CustomBaseCFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" @@ -22182,31 +22182,31 @@ __vt__Q53scn4step4boss15challengemaster6Custom: __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede9StateHide$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede9StateHide$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede9StateHide$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede9StateHide$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede9StateHide$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss12creditdedede6Custom __vt__Q53scn4step4boss12creditdedede6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step4boss12creditdedede6CustomCFv - .byte4 __dt__Q53scn4step4boss12creditdedede6CustomFv - .byte4 onInit__Q53scn4step4boss12creditdedede6CustomFv - .byte4 onAppear__Q43scn4step4boss10CustomBaseFv - .byte4 onStart__Q53scn4step4boss12creditdedede6CustomFv - .byte4 onDamage__Q53scn4step4boss12creditdedede6CustomFv - .byte4 onDead__Q53scn4step4boss12creditdedede6CustomFv - .byte4 onStateChange__Q43scn4step4boss10CustomBaseFv - .byte4 onScriptRequested__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopStart__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopEnd__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopStarted__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopFinished__Q43scn4step4boss10CustomBaseFv - .byte4 onProcAnim__Q53scn4step4boss12creditdedede6CustomFv - .byte4 onProcMove__Q53scn4step4boss12creditdedede6CustomFv - .byte4 onProcFixPos__Q53scn4step4boss12creditdedede6CustomFv - .byte4 onProcObjCollReact__Q43scn4step4boss10CustomBaseFv - .byte4 onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv - .byte4 getFirstOffs__Q43scn4step4boss10CustomBaseCFv + .4byte GetRuntimeTypeInfo__Q53scn4step4boss12creditdedede6CustomCFv + .4byte __dt__Q53scn4step4boss12creditdedede6CustomFv + .4byte onInit__Q53scn4step4boss12creditdedede6CustomFv + .4byte onAppear__Q43scn4step4boss10CustomBaseFv + .4byte onStart__Q53scn4step4boss12creditdedede6CustomFv + .4byte onDamage__Q53scn4step4boss12creditdedede6CustomFv + .4byte onDead__Q53scn4step4boss12creditdedede6CustomFv + .4byte onStateChange__Q43scn4step4boss10CustomBaseFv + .4byte onScriptRequested__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopStart__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopEnd__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopStarted__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopFinished__Q43scn4step4boss10CustomBaseFv + .4byte onProcAnim__Q53scn4step4boss12creditdedede6CustomFv + .4byte onProcMove__Q53scn4step4boss12creditdedede6CustomFv + .4byte onProcFixPos__Q53scn4step4boss12creditdedede6CustomFv + .4byte onProcObjCollReact__Q43scn4step4boss10CustomBaseFv + .4byte onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv + .4byte getFirstOffs__Q43scn4step4boss10CustomBaseCFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22214,31 +22214,31 @@ __vt__Q53scn4step4boss12creditdedede6Custom: __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StateHide$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StateHide$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StateHide$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StateHide$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StateHide$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9creditdee6Custom __vt__Q53scn4step4boss9creditdee6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step4boss9creditdee6CustomCFv - .byte4 __dt__Q53scn4step4boss9creditdee6CustomFv - .byte4 onInit__Q53scn4step4boss9creditdee6CustomFv - .byte4 onAppear__Q43scn4step4boss10CustomBaseFv - .byte4 onStart__Q53scn4step4boss9creditdee6CustomFv - .byte4 onDamage__Q53scn4step4boss9creditdee6CustomFv - .byte4 onDead__Q53scn4step4boss9creditdee6CustomFv - .byte4 onStateChange__Q43scn4step4boss10CustomBaseFv - .byte4 onScriptRequested__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopStart__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopEnd__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopStarted__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopFinished__Q43scn4step4boss10CustomBaseFv - .byte4 onProcAnim__Q53scn4step4boss9creditdee6CustomFv - .byte4 onProcMove__Q53scn4step4boss9creditdee6CustomFv - .byte4 onProcFixPos__Q53scn4step4boss9creditdee6CustomFv - .byte4 onProcObjCollReact__Q43scn4step4boss10CustomBaseFv - .byte4 onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv - .byte4 getFirstOffs__Q43scn4step4boss10CustomBaseCFv + .4byte GetRuntimeTypeInfo__Q53scn4step4boss9creditdee6CustomCFv + .4byte __dt__Q53scn4step4boss9creditdee6CustomFv + .4byte onInit__Q53scn4step4boss9creditdee6CustomFv + .4byte onAppear__Q43scn4step4boss10CustomBaseFv + .4byte onStart__Q53scn4step4boss9creditdee6CustomFv + .4byte onDamage__Q53scn4step4boss9creditdee6CustomFv + .4byte onDead__Q53scn4step4boss9creditdee6CustomFv + .4byte onStateChange__Q43scn4step4boss10CustomBaseFv + .4byte onScriptRequested__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopStart__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopEnd__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopStarted__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopFinished__Q43scn4step4boss10CustomBaseFv + .4byte onProcAnim__Q53scn4step4boss9creditdee6CustomFv + .4byte onProcMove__Q53scn4step4boss9creditdee6CustomFv + .4byte onProcFixPos__Q53scn4step4boss9creditdee6CustomFv + .4byte onProcObjCollReact__Q43scn4step4boss10CustomBaseFv + .4byte onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv + .4byte getFirstOffs__Q43scn4step4boss10CustomBaseCFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22246,31 +22246,31 @@ __vt__Q53scn4step4boss9creditdee6Custom: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta9StateHide$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta9StateHide$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta9StateHide$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta9StateHide$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta9StateHide$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss10creditmeta6Custom __vt__Q53scn4step4boss10creditmeta6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step4boss10creditmeta6CustomCFv - .byte4 __dt__Q53scn4step4boss10creditmeta6CustomFv - .byte4 onInit__Q53scn4step4boss10creditmeta6CustomFv - .byte4 onAppear__Q43scn4step4boss10CustomBaseFv - .byte4 onStart__Q53scn4step4boss10creditmeta6CustomFv - .byte4 onDamage__Q53scn4step4boss10creditmeta6CustomFv - .byte4 onDead__Q53scn4step4boss10creditmeta6CustomFv - .byte4 onStateChange__Q43scn4step4boss10CustomBaseFv - .byte4 onScriptRequested__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopStart__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopEnd__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopStarted__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopFinished__Q43scn4step4boss10CustomBaseFv - .byte4 onProcAnim__Q53scn4step4boss10creditmeta6CustomFv - .byte4 onProcMove__Q53scn4step4boss10creditmeta6CustomFv - .byte4 onProcFixPos__Q53scn4step4boss10creditmeta6CustomFv - .byte4 onProcObjCollReact__Q43scn4step4boss10CustomBaseFv - .byte4 onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv - .byte4 getFirstOffs__Q43scn4step4boss10CustomBaseCFv + .4byte GetRuntimeTypeInfo__Q53scn4step4boss10creditmeta6CustomCFv + .4byte __dt__Q53scn4step4boss10creditmeta6CustomFv + .4byte onInit__Q53scn4step4boss10creditmeta6CustomFv + .4byte onAppear__Q43scn4step4boss10CustomBaseFv + .4byte onStart__Q53scn4step4boss10creditmeta6CustomFv + .4byte onDamage__Q53scn4step4boss10creditmeta6CustomFv + .4byte onDead__Q53scn4step4boss10creditmeta6CustomFv + .4byte onStateChange__Q43scn4step4boss10CustomBaseFv + .4byte onScriptRequested__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopStart__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopEnd__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopStarted__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopFinished__Q43scn4step4boss10CustomBaseFv + .4byte onProcAnim__Q53scn4step4boss10creditmeta6CustomFv + .4byte onProcMove__Q53scn4step4boss10creditmeta6CustomFv + .4byte onProcFixPos__Q53scn4step4boss10creditmeta6CustomFv + .4byte onProcObjCollReact__Q43scn4step4boss10CustomBaseFv + .4byte onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv + .4byte getFirstOffs__Q43scn4step4boss10CustomBaseCFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22278,31 +22278,31 @@ __vt__Q53scn4step4boss10creditmeta6Custom: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah9StateHide$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah9StateHide$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah9StateHide$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah9StateHide$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah9StateHide$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss10creditroah6Custom __vt__Q53scn4step4boss10creditroah6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step4boss10creditroah6CustomCFv - .byte4 __dt__Q53scn4step4boss10creditroah6CustomFv - .byte4 onInit__Q53scn4step4boss10creditroah6CustomFv - .byte4 onAppear__Q43scn4step4boss10CustomBaseFv - .byte4 onStart__Q53scn4step4boss10creditroah6CustomFv - .byte4 onDamage__Q53scn4step4boss10creditroah6CustomFv - .byte4 onDead__Q53scn4step4boss10creditroah6CustomFv - .byte4 onStateChange__Q43scn4step4boss10CustomBaseFv - .byte4 onScriptRequested__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopStart__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopEnd__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopStarted__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopFinished__Q43scn4step4boss10CustomBaseFv - .byte4 onProcAnim__Q53scn4step4boss10creditroah6CustomFv - .byte4 onProcMove__Q53scn4step4boss10creditroah6CustomFv - .byte4 onProcFixPos__Q53scn4step4boss10creditroah6CustomFv - .byte4 onProcObjCollReact__Q43scn4step4boss10CustomBaseFv - .byte4 onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv - .byte4 getFirstOffs__Q43scn4step4boss10CustomBaseCFv + .4byte GetRuntimeTypeInfo__Q53scn4step4boss10creditroah6CustomCFv + .4byte __dt__Q53scn4step4boss10creditroah6CustomFv + .4byte onInit__Q53scn4step4boss10creditroah6CustomFv + .4byte onAppear__Q43scn4step4boss10CustomBaseFv + .4byte onStart__Q53scn4step4boss10creditroah6CustomFv + .4byte onDamage__Q53scn4step4boss10creditroah6CustomFv + .4byte onDead__Q53scn4step4boss10creditroah6CustomFv + .4byte onStateChange__Q43scn4step4boss10CustomBaseFv + .4byte onScriptRequested__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopStart__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopEnd__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopStarted__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopFinished__Q43scn4step4boss10CustomBaseFv + .4byte onProcAnim__Q53scn4step4boss10creditroah6CustomFv + .4byte onProcMove__Q53scn4step4boss10creditroah6CustomFv + .4byte onProcFixPos__Q53scn4step4boss10creditroah6CustomFv + .4byte onProcObjCollReact__Q43scn4step4boss10CustomBaseFv + .4byte onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv + .4byte getFirstOffs__Q43scn4step4boss10CustomBaseCFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22332,14 +22332,14 @@ $$258564: __vt__Q24util122StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6dubior8NodeKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util122StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6dubior8NodeKind$$1Fv - .byte4 create__Q24util122StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6dubior8NodeKind$$1Fv + .4byte __dt__Q24util122StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6dubior8NodeKind$$1Fv + .4byte create__Q24util122StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6dubior8NodeKind$$1Fv .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateWait$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateWait$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateWait$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateWait$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateWait$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateWait$$4PQ43scn4step4boss4Boss$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -22352,25 +22352,25 @@ __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9State __vt__Q53scn4step4boss6dubior6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step4boss6dubior6CustomCFv - .byte4 __dt__Q53scn4step4boss6dubior6CustomFv - .byte4 onInit__Q53scn4step4boss6dubior6CustomFv - .byte4 onAppear__Q53scn4step4boss6dubior6CustomFv - .byte4 onStart__Q53scn4step4boss6dubior6CustomFv - .byte4 onDamage__Q53scn4step4boss6dubior6CustomFv - .byte4 onDead__Q53scn4step4boss6dubior6CustomFv - .byte4 onStateChange__Q43scn4step4boss10CustomBaseFv - .byte4 onScriptRequested__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopStart__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopEnd__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopStarted__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopFinished__Q43scn4step4boss10CustomBaseFv - .byte4 onProcAnim__Q53scn4step4boss6dubior6CustomFv - .byte4 onProcMove__Q43scn4step4boss10CustomBaseFv - .byte4 onProcFixPos__Q53scn4step4boss6dubior6CustomFv - .byte4 onProcObjCollReact__Q43scn4step4boss10CustomBaseFv - .byte4 onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv - .byte4 getFirstOffs__Q53scn4step4boss6dubior6CustomCFv + .4byte GetRuntimeTypeInfo__Q53scn4step4boss6dubior6CustomCFv + .4byte __dt__Q53scn4step4boss6dubior6CustomFv + .4byte onInit__Q53scn4step4boss6dubior6CustomFv + .4byte onAppear__Q53scn4step4boss6dubior6CustomFv + .4byte onStart__Q53scn4step4boss6dubior6CustomFv + .4byte onDamage__Q53scn4step4boss6dubior6CustomFv + .4byte onDead__Q53scn4step4boss6dubior6CustomFv + .4byte onStateChange__Q43scn4step4boss10CustomBaseFv + .4byte onScriptRequested__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopStart__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopEnd__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopStarted__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopFinished__Q43scn4step4boss10CustomBaseFv + .4byte onProcAnim__Q53scn4step4boss6dubior6CustomFv + .4byte onProcMove__Q43scn4step4boss10CustomBaseFv + .4byte onProcFixPos__Q53scn4step4boss6dubior6CustomFv + .4byte onProcObjCollReact__Q43scn4step4boss10CustomBaseFv + .4byte onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv + .4byte getFirstOffs__Q53scn4step4boss6dubior6CustomCFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" @@ -22406,8 +22406,8 @@ $$257882: __vt__Q24util127StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss10gigantedge8NodeKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util127StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss10gigantedge8NodeKind$$1Fv - .byte4 create__Q24util127StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss10gigantedge8NodeKind$$1Fv + .4byte __dt__Q24util127StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss10gigantedge8NodeKind$$1Fv + .4byte create__Q24util127StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss10gigantedge8NodeKind$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -22424,25 +22424,25 @@ __vt__Q24util127StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9Stat __vt__Q53scn4step4boss10gigantedge6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step4boss10gigantedge6CustomCFv - .byte4 __dt__Q53scn4step4boss10gigantedge6CustomFv - .byte4 onInit__Q53scn4step4boss10gigantedge6CustomFv - .byte4 onAppear__Q53scn4step4boss10gigantedge6CustomFv - .byte4 onStart__Q53scn4step4boss10gigantedge6CustomFv - .byte4 onDamage__Q53scn4step4boss10gigantedge6CustomFv - .byte4 onDead__Q53scn4step4boss10gigantedge6CustomFv - .byte4 onStateChange__Q43scn4step4boss10CustomBaseFv - .byte4 onScriptRequested__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopStart__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopEnd__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopStarted__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopFinished__Q43scn4step4boss10CustomBaseFv - .byte4 onProcAnim__Q53scn4step4boss10gigantedge6CustomFv - .byte4 onProcMove__Q43scn4step4boss10CustomBaseFv - .byte4 onProcFixPos__Q53scn4step4boss10gigantedge6CustomFv - .byte4 onProcObjCollReact__Q43scn4step4boss10CustomBaseFv - .byte4 onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv - .byte4 getFirstOffs__Q43scn4step4boss10CustomBaseCFv + .4byte GetRuntimeTypeInfo__Q53scn4step4boss10gigantedge6CustomCFv + .4byte __dt__Q53scn4step4boss10gigantedge6CustomFv + .4byte onInit__Q53scn4step4boss10gigantedge6CustomFv + .4byte onAppear__Q53scn4step4boss10gigantedge6CustomFv + .4byte onStart__Q53scn4step4boss10gigantedge6CustomFv + .4byte onDamage__Q53scn4step4boss10gigantedge6CustomFv + .4byte onDead__Q53scn4step4boss10gigantedge6CustomFv + .4byte onStateChange__Q43scn4step4boss10CustomBaseFv + .4byte onScriptRequested__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopStart__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopEnd__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopStarted__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopFinished__Q43scn4step4boss10CustomBaseFv + .4byte onProcAnim__Q53scn4step4boss10gigantedge6CustomFv + .4byte onProcMove__Q43scn4step4boss10CustomBaseFv + .4byte onProcFixPos__Q53scn4step4boss10gigantedge6CustomFv + .4byte onProcObjCollReact__Q43scn4step4boss10CustomBaseFv + .4byte onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv + .4byte getFirstOffs__Q43scn4step4boss10CustomBaseCFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" @@ -22479,8 +22479,8 @@ $$256380: __vt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss8kingsdoo8NodeKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss8kingsdoo8NodeKind$$1Fv - .byte4 create__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss8kingsdoo8NodeKind$$1Fv + .4byte __dt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss8kingsdoo8NodeKind$$1Fv + .4byte create__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss8kingsdoo8NodeKind$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -22497,25 +22497,25 @@ __vt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9Stat __vt__Q53scn4step4boss8kingsdoo6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step4boss8kingsdoo6CustomCFv - .byte4 __dt__Q53scn4step4boss8kingsdoo6CustomFv - .byte4 onInit__Q53scn4step4boss8kingsdoo6CustomFv - .byte4 onAppear__Q53scn4step4boss8kingsdoo6CustomFv - .byte4 onStart__Q53scn4step4boss8kingsdoo6CustomFv - .byte4 onDamage__Q53scn4step4boss8kingsdoo6CustomFv - .byte4 onDead__Q53scn4step4boss8kingsdoo6CustomFv - .byte4 onStateChange__Q43scn4step4boss10CustomBaseFv - .byte4 onScriptRequested__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopStart__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopEnd__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopStarted__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopFinished__Q43scn4step4boss10CustomBaseFv - .byte4 onProcAnim__Q53scn4step4boss8kingsdoo6CustomFv - .byte4 onProcMove__Q43scn4step4boss10CustomBaseFv - .byte4 onProcFixPos__Q53scn4step4boss8kingsdoo6CustomFv - .byte4 onProcObjCollReact__Q43scn4step4boss10CustomBaseFv - .byte4 onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv - .byte4 getFirstOffs__Q43scn4step4boss10CustomBaseCFv + .4byte GetRuntimeTypeInfo__Q53scn4step4boss8kingsdoo6CustomCFv + .4byte __dt__Q53scn4step4boss8kingsdoo6CustomFv + .4byte onInit__Q53scn4step4boss8kingsdoo6CustomFv + .4byte onAppear__Q53scn4step4boss8kingsdoo6CustomFv + .4byte onStart__Q53scn4step4boss8kingsdoo6CustomFv + .4byte onDamage__Q53scn4step4boss8kingsdoo6CustomFv + .4byte onDead__Q53scn4step4boss8kingsdoo6CustomFv + .4byte onStateChange__Q43scn4step4boss10CustomBaseFv + .4byte onScriptRequested__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopStart__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopEnd__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopStarted__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopFinished__Q43scn4step4boss10CustomBaseFv + .4byte onProcAnim__Q53scn4step4boss8kingsdoo6CustomFv + .4byte onProcMove__Q43scn4step4boss10CustomBaseFv + .4byte onProcFixPos__Q53scn4step4boss8kingsdoo6CustomFv + .4byte onProcObjCollReact__Q43scn4step4boss10CustomBaseFv + .4byte onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv + .4byte getFirstOffs__Q43scn4step4boss10CustomBaseCFv .asciz "no name class" .balign 4 .4byte 0 @@ -22549,8 +22549,8 @@ $$257225: __vt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8NodeKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8NodeKind$$1Fv - .byte4 create__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8NodeKind$$1Fv + .4byte __dt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8NodeKind$$1Fv + .4byte create__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8NodeKind$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -22567,25 +22567,25 @@ __vt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9Stat __vt__Q53scn4step4boss9moundeath6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step4boss9moundeath6CustomCFv - .byte4 __dt__Q53scn4step4boss9moundeath6CustomFv - .byte4 onInit__Q53scn4step4boss9moundeath6CustomFv - .byte4 onAppear__Q53scn4step4boss9moundeath6CustomFv - .byte4 onStart__Q53scn4step4boss9moundeath6CustomFv - .byte4 onDamage__Q53scn4step4boss9moundeath6CustomFv - .byte4 onDead__Q53scn4step4boss9moundeath6CustomFv - .byte4 onStateChange__Q43scn4step4boss10CustomBaseFv - .byte4 onScriptRequested__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopStart__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopEnd__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopStarted__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopFinished__Q43scn4step4boss10CustomBaseFv - .byte4 onProcAnim__Q53scn4step4boss9moundeath6CustomFv - .byte4 onProcMove__Q43scn4step4boss10CustomBaseFv - .byte4 onProcFixPos__Q53scn4step4boss9moundeath6CustomFv - .byte4 onProcObjCollReact__Q43scn4step4boss10CustomBaseFv - .byte4 onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv - .byte4 getFirstOffs__Q43scn4step4boss10CustomBaseCFv + .4byte GetRuntimeTypeInfo__Q53scn4step4boss9moundeath6CustomCFv + .4byte __dt__Q53scn4step4boss9moundeath6CustomFv + .4byte onInit__Q53scn4step4boss9moundeath6CustomFv + .4byte onAppear__Q53scn4step4boss9moundeath6CustomFv + .4byte onStart__Q53scn4step4boss9moundeath6CustomFv + .4byte onDamage__Q53scn4step4boss9moundeath6CustomFv + .4byte onDead__Q53scn4step4boss9moundeath6CustomFv + .4byte onStateChange__Q43scn4step4boss10CustomBaseFv + .4byte onScriptRequested__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopStart__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopEnd__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopStarted__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopFinished__Q43scn4step4boss10CustomBaseFv + .4byte onProcAnim__Q53scn4step4boss9moundeath6CustomFv + .4byte onProcMove__Q43scn4step4boss10CustomBaseFv + .4byte onProcFixPos__Q53scn4step4boss9moundeath6CustomFv + .4byte onProcObjCollReact__Q43scn4step4boss10CustomBaseFv + .4byte onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv + .4byte getFirstOffs__Q43scn4step4boss10CustomBaseCFv .asciz "no name class" .balign 4 .4byte 0 @@ -22619,8 +22619,8 @@ $$256478: __vt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros8NodeKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros8NodeKind$$1Fv - .byte4 create__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros8NodeKind$$1Fv + .4byte __dt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros8NodeKind$$1Fv + .4byte create__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros8NodeKind$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -22637,25 +22637,25 @@ __vt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9Stat __vt__Q53scn4step4boss13watergalboros6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step4boss13watergalboros6CustomCFv - .byte4 __dt__Q53scn4step4boss13watergalboros6CustomFv - .byte4 onInit__Q53scn4step4boss13watergalboros6CustomFv - .byte4 onAppear__Q53scn4step4boss13watergalboros6CustomFv - .byte4 onStart__Q53scn4step4boss13watergalboros6CustomFv - .byte4 onDamage__Q53scn4step4boss13watergalboros6CustomFv - .byte4 onDead__Q53scn4step4boss13watergalboros6CustomFv - .byte4 onStateChange__Q43scn4step4boss10CustomBaseFv - .byte4 onScriptRequested__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopStart__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopEnd__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopStarted__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopFinished__Q43scn4step4boss10CustomBaseFv - .byte4 onProcAnim__Q53scn4step4boss13watergalboros6CustomFv - .byte4 onProcMove__Q43scn4step4boss10CustomBaseFv - .byte4 onProcFixPos__Q53scn4step4boss13watergalboros6CustomFv - .byte4 onProcObjCollReact__Q43scn4step4boss10CustomBaseFv - .byte4 onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv - .byte4 getFirstOffs__Q43scn4step4boss10CustomBaseCFv + .4byte GetRuntimeTypeInfo__Q53scn4step4boss13watergalboros6CustomCFv + .4byte __dt__Q53scn4step4boss13watergalboros6CustomFv + .4byte onInit__Q53scn4step4boss13watergalboros6CustomFv + .4byte onAppear__Q53scn4step4boss13watergalboros6CustomFv + .4byte onStart__Q53scn4step4boss13watergalboros6CustomFv + .4byte onDamage__Q53scn4step4boss13watergalboros6CustomFv + .4byte onDead__Q53scn4step4boss13watergalboros6CustomFv + .4byte onStateChange__Q43scn4step4boss10CustomBaseFv + .4byte onScriptRequested__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopStart__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopEnd__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopStarted__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopFinished__Q43scn4step4boss10CustomBaseFv + .4byte onProcAnim__Q53scn4step4boss13watergalboros6CustomFv + .4byte onProcMove__Q43scn4step4boss10CustomBaseFv + .4byte onProcFixPos__Q53scn4step4boss13watergalboros6CustomFv + .4byte onProcObjCollReact__Q43scn4step4boss10CustomBaseFv + .4byte onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv + .4byte getFirstOffs__Q43scn4step4boss10CustomBaseCFv .asciz "no name class" .balign 4 .4byte 0 @@ -22681,20 +22681,20 @@ $$257038: __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateDamageL$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateDamageL$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateDamageL$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateDamageL$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateDamageL$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateDead$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateDead$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateDead$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateDead$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateDead$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateDead$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateFirst$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateFirst$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateFirst$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateFirst$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateFirst$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateFirst$$4PQ43scn4step4boss4Boss$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -22703,25 +22703,25 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy10Stat __vt__Q53scn4step4boss6whispy6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step4boss6whispy6CustomCFv - .byte4 __dt__Q53scn4step4boss6whispy6CustomFv - .byte4 onInit__Q53scn4step4boss6whispy6CustomFv - .byte4 onAppear__Q53scn4step4boss6whispy6CustomFv - .byte4 onStart__Q53scn4step4boss6whispy6CustomFv - .byte4 onDamage__Q53scn4step4boss6whispy6CustomFv - .byte4 onDead__Q53scn4step4boss6whispy6CustomFv - .byte4 onStateChange__Q43scn4step4boss10CustomBaseFv - .byte4 onScriptRequested__Q53scn4step4boss6whispy6CustomFv - .byte4 onHitStopStart__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopEnd__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopStarted__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopFinished__Q43scn4step4boss10CustomBaseFv - .byte4 onProcAnim__Q53scn4step4boss6whispy6CustomFv - .byte4 onProcMove__Q43scn4step4boss10CustomBaseFv - .byte4 onProcFixPos__Q53scn4step4boss6whispy6CustomFv - .byte4 onProcObjCollReact__Q43scn4step4boss10CustomBaseFv - .byte4 onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv - .byte4 getFirstOffs__Q43scn4step4boss10CustomBaseCFv + .4byte GetRuntimeTypeInfo__Q53scn4step4boss6whispy6CustomCFv + .4byte __dt__Q53scn4step4boss6whispy6CustomFv + .4byte onInit__Q53scn4step4boss6whispy6CustomFv + .4byte onAppear__Q53scn4step4boss6whispy6CustomFv + .4byte onStart__Q53scn4step4boss6whispy6CustomFv + .4byte onDamage__Q53scn4step4boss6whispy6CustomFv + .4byte onDead__Q53scn4step4boss6whispy6CustomFv + .4byte onStateChange__Q43scn4step4boss10CustomBaseFv + .4byte onScriptRequested__Q53scn4step4boss6whispy6CustomFv + .4byte onHitStopStart__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopEnd__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopStarted__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopFinished__Q43scn4step4boss10CustomBaseFv + .4byte onProcAnim__Q53scn4step4boss6whispy6CustomFv + .4byte onProcMove__Q43scn4step4boss10CustomBaseFv + .4byte onProcFixPos__Q53scn4step4boss6whispy6CustomFv + .4byte onProcObjCollReact__Q43scn4step4boss10CustomBaseFv + .4byte onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv + .4byte getFirstOffs__Q43scn4step4boss10CustomBaseCFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" @@ -22759,8 +22759,8 @@ $$256698: __vt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble8NodeKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble8NodeKind$$1Fv - .byte4 create__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble8NodeKind$$1Fv + .4byte __dt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble8NodeKind$$1Fv + .4byte create__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble8NodeKind$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -22777,25 +22777,25 @@ __vt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9Stat __vt__Q53scn4step4boss9zankibble6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step4boss9zankibble6CustomCFv - .byte4 __dt__Q53scn4step4boss9zankibble6CustomFv - .byte4 onInit__Q53scn4step4boss9zankibble6CustomFv - .byte4 onAppear__Q53scn4step4boss9zankibble6CustomFv - .byte4 onStart__Q53scn4step4boss9zankibble6CustomFv - .byte4 onDamage__Q53scn4step4boss9zankibble6CustomFv - .byte4 onDead__Q53scn4step4boss9zankibble6CustomFv - .byte4 onStateChange__Q43scn4step4boss10CustomBaseFv - .byte4 onScriptRequested__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopStart__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopEnd__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopStarted__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopFinished__Q43scn4step4boss10CustomBaseFv - .byte4 onProcAnim__Q53scn4step4boss9zankibble6CustomFv - .byte4 onProcMove__Q43scn4step4boss10CustomBaseFv - .byte4 onProcFixPos__Q53scn4step4boss9zankibble6CustomFv - .byte4 onProcObjCollReact__Q43scn4step4boss10CustomBaseFv - .byte4 onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv - .byte4 getFirstOffs__Q43scn4step4boss10CustomBaseCFv + .4byte GetRuntimeTypeInfo__Q53scn4step4boss9zankibble6CustomCFv + .4byte __dt__Q53scn4step4boss9zankibble6CustomFv + .4byte onInit__Q53scn4step4boss9zankibble6CustomFv + .4byte onAppear__Q53scn4step4boss9zankibble6CustomFv + .4byte onStart__Q53scn4step4boss9zankibble6CustomFv + .4byte onDamage__Q53scn4step4boss9zankibble6CustomFv + .4byte onDead__Q53scn4step4boss9zankibble6CustomFv + .4byte onStateChange__Q43scn4step4boss10CustomBaseFv + .4byte onScriptRequested__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopStart__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopEnd__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopStarted__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopFinished__Q43scn4step4boss10CustomBaseFv + .4byte onProcAnim__Q53scn4step4boss9zankibble6CustomFv + .4byte onProcMove__Q43scn4step4boss10CustomBaseFv + .4byte onProcFixPos__Q53scn4step4boss9zankibble6CustomFv + .4byte onProcObjCollReact__Q43scn4step4boss10CustomBaseFv + .4byte onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv + .4byte getFirstOffs__Q43scn4step4boss10CustomBaseCFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" @@ -22809,21 +22809,21 @@ __vt__Q53scn4step4boss9zankibble6Custom: __vt__Q53scn4step5enemy8armordee6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy8armordee6CustomCFv - .byte4 __dt__Q53scn4step5enemy8armordee6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q53scn4step5enemy8armordee6CustomFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy8armordee6CustomCFv + .4byte __dt__Q53scn4step5enemy8armordee6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q53scn4step5enemy8armordee6CustomFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22831,21 +22831,21 @@ __vt__Q53scn4step5enemy8armordee6Custom: __vt__Q53scn4step5enemy11bladeknight6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy11bladeknight6CustomCFv - .byte4 __dt__Q53scn4step5enemy11bladeknight6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy11bladeknight6CustomCFv + .4byte __dt__Q53scn4step5enemy11bladeknight6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22853,21 +22853,21 @@ __vt__Q53scn4step5enemy11bladeknight6Custom: __vt__Q53scn4step5enemy7blipper6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy7blipper6CustomCFv - .byte4 __dt__Q53scn4step5enemy7blipper6CustomFv - .byte4 onInit__Q53scn4step5enemy7blipper6CustomFv - .byte4 onHitPointIsZero__Q53scn4step5enemy7blipper6CustomFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q53scn4step5enemy7blipper6CustomFv - .byte4 onOutWater__Q53scn4step5enemy7blipper6CustomFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q53scn4step5enemy7blipper6CustomFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy7blipper6CustomCFv + .4byte __dt__Q53scn4step5enemy7blipper6CustomFv + .4byte onInit__Q53scn4step5enemy7blipper6CustomFv + .4byte onHitPointIsZero__Q53scn4step5enemy7blipper6CustomFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q53scn4step5enemy7blipper6CustomFv + .4byte onOutWater__Q53scn4step5enemy7blipper6CustomFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q53scn4step5enemy7blipper6CustomFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22875,27 +22875,27 @@ __vt__Q53scn4step5enemy7blipper6Custom: __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11bonkersbomb6Custom __vt__Q53scn4step5enemy11bonkersbomb6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy11bonkersbomb6CustomCFv - .byte4 __dt__Q53scn4step5enemy11bonkersbomb6CustomFv - .byte4 onInit__Q53scn4step5enemy11bonkersbomb6CustomFv - .byte4 onHitPointIsZero__Q53scn4step5enemy11bonkersbomb6CustomFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy11bonkersbomb6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q53scn4step5enemy11bonkersbomb6CustomFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy11bonkersbomb6CustomCFv + .4byte __dt__Q53scn4step5enemy11bonkersbomb6CustomFv + .4byte onInit__Q53scn4step5enemy11bonkersbomb6CustomFv + .4byte onHitPointIsZero__Q53scn4step5enemy11bonkersbomb6CustomFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy11bonkersbomb6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q53scn4step5enemy11bonkersbomb6CustomFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22903,21 +22903,21 @@ __vt__Q53scn4step5enemy11bonkersbomb6Custom: __vt__Q53scn4step5enemy6bouncy6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy6bouncy6CustomCFv - .byte4 __dt__Q53scn4step5enemy6bouncy6CustomFv - .byte4 onInit__Q53scn4step5enemy6bouncy6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy6bouncy6CustomCFv + .4byte __dt__Q53scn4step5enemy6bouncy6CustomFv + .4byte onInit__Q53scn4step5enemy6bouncy6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22925,21 +22925,21 @@ __vt__Q53scn4step5enemy6bouncy6Custom: __vt__Q53scn4step5enemy5bowby6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy5bowby6CustomCFv - .byte4 __dt__Q53scn4step5enemy5bowby6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q53scn4step5enemy5bowby6CustomFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q53scn4step5enemy5bowby6CustomFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy5bowby6CustomCFv + .4byte __dt__Q53scn4step5enemy5bowby6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q53scn4step5enemy5bowby6CustomFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q53scn4step5enemy5bowby6CustomFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22947,27 +22947,27 @@ __vt__Q53scn4step5enemy5bowby6Custom: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateSkinned$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateSkinned$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateSkinned$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateSkinned$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateSkinned$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5cappy6Custom __vt__Q53scn4step5enemy5cappy6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy5cappy6CustomCFv - .byte4 __dt__Q53scn4step5enemy5cappy6CustomFv - .byte4 onInit__Q53scn4step5enemy5cappy6CustomFv - .byte4 onHitPointIsZero__Q53scn4step5enemy5cappy6CustomFv - .byte4 onVacuumReceive__Q53scn4step5enemy5cappy6CustomFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy5cappy6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q53scn4step5enemy5cappy6CustomFv - .byte4 onDead__Q53scn4step5enemy5cappy6CustomFv - .byte4 onProcFixPos__Q53scn4step5enemy5cappy6CustomFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy5cappy6CustomCFv + .4byte __dt__Q53scn4step5enemy5cappy6CustomFv + .4byte onInit__Q53scn4step5enemy5cappy6CustomFv + .4byte onHitPointIsZero__Q53scn4step5enemy5cappy6CustomFv + .4byte onVacuumReceive__Q53scn4step5enemy5cappy6CustomFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy5cappy6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q53scn4step5enemy5cappy6CustomFv + .4byte onDead__Q53scn4step5enemy5cappy6CustomFv + .4byte onProcFixPos__Q53scn4step5enemy5cappy6CustomFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22975,21 +22975,21 @@ __vt__Q53scn4step5enemy5cappy6Custom: __vt__Q53scn4step5enemy8cappyhat6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy8cappyhat6CustomCFv - .byte4 __dt__Q53scn4step5enemy8cappyhat6CustomFv - .byte4 onInit__Q53scn4step5enemy8cappyhat6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q53scn4step5enemy8cappyhat6CustomFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy8cappyhat6CustomCFv + .4byte __dt__Q53scn4step5enemy8cappyhat6CustomFv + .4byte onInit__Q53scn4step5enemy8cappyhat6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q53scn4step5enemy8cappyhat6CustomFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22997,21 +22997,21 @@ __vt__Q53scn4step5enemy8cappyhat6Custom: __vt__Q53scn4step5enemy6chilly6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy6chilly6CustomCFv - .byte4 __dt__Q53scn4step5enemy6chilly6CustomFv - .byte4 onInit__Q53scn4step5enemy6chilly6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy6chilly6CustomCFv + .4byte __dt__Q53scn4step5enemy6chilly6CustomFv + .4byte onInit__Q53scn4step5enemy6chilly6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23019,21 +23019,21 @@ __vt__Q53scn4step5enemy6chilly6Custom: __vt__Q53scn4step5enemy4como6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy4como6CustomCFv - .byte4 __dt__Q53scn4step5enemy4como6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q53scn4step5enemy4como6CustomFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q53scn4step5enemy4como6CustomFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q53scn4step5enemy4como6CustomFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy4como6CustomCFv + .4byte __dt__Q53scn4step5enemy4como6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q53scn4step5enemy4como6CustomFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q53scn4step5enemy4como6CustomFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q53scn4step5enemy4como6CustomFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23041,21 +23041,21 @@ __vt__Q53scn4step5enemy4como6Custom: __vt__Q53scn4step5enemy6degout6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy6degout6CustomCFv - .byte4 __dt__Q53scn4step5enemy6degout6CustomFv - .byte4 onInit__Q53scn4step5enemy6degout6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy6degout6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy6degout6CustomCFv + .4byte __dt__Q53scn4step5enemy6degout6CustomFv + .4byte onInit__Q53scn4step5enemy6degout6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy6degout6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23063,21 +23063,21 @@ __vt__Q53scn4step5enemy6degout6Custom: __vt__Q53scn4step5enemy8dubiorjr6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy8dubiorjr6CustomCFv - .byte4 __dt__Q53scn4step5enemy8dubiorjr6CustomFv - .byte4 onInit__Q53scn4step5enemy8dubiorjr6CustomFv - .byte4 onHitPointIsZero__Q53scn4step5enemy8dubiorjr6CustomFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy8dubiorjr6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q53scn4step5enemy8dubiorjr6CustomFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy8dubiorjr6CustomCFv + .4byte __dt__Q53scn4step5enemy8dubiorjr6CustomFv + .4byte onInit__Q53scn4step5enemy8dubiorjr6CustomFv + .4byte onHitPointIsZero__Q53scn4step5enemy8dubiorjr6CustomFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy8dubiorjr6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q53scn4step5enemy8dubiorjr6CustomFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23085,27 +23085,27 @@ __vt__Q53scn4step5enemy8dubiorjr6Custom: __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11dubiorspark9StateShot$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11dubiorspark9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11dubiorspark9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11dubiorspark9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11dubiorspark9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11dubiorspark6Custom __vt__Q53scn4step5enemy11dubiorspark6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy11dubiorspark6CustomCFv - .byte4 __dt__Q53scn4step5enemy11dubiorspark6CustomFv - .byte4 onInit__Q53scn4step5enemy11dubiorspark6CustomFv - .byte4 onHitPointIsZero__Q53scn4step5enemy11dubiorspark6CustomFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy11dubiorspark6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q53scn4step5enemy11dubiorspark6CustomFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy11dubiorspark6CustomCFv + .4byte __dt__Q53scn4step5enemy11dubiorspark6CustomFv + .4byte onInit__Q53scn4step5enemy11dubiorspark6CustomFv + .4byte onHitPointIsZero__Q53scn4step5enemy11dubiorspark6CustomFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy11dubiorspark6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q53scn4step5enemy11dubiorspark6CustomFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23113,21 +23113,21 @@ __vt__Q53scn4step5enemy11dubiorspark6Custom: __vt__Q53scn4step5enemy4elec6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy4elec6CustomCFv - .byte4 __dt__Q53scn4step5enemy4elec6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q53scn4step5enemy4elec6CustomFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy4elec6CustomCFv + .4byte __dt__Q53scn4step5enemy4elec6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q53scn4step5enemy4elec6CustomFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23135,21 +23135,21 @@ __vt__Q53scn4step5enemy4elec6Custom: __vt__Q53scn4step5enemy6flamer6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy6flamer6CustomCFv - .byte4 __dt__Q53scn4step5enemy6flamer6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy6flamer6CustomCFv + .4byte __dt__Q53scn4step5enemy6flamer6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23157,21 +23157,21 @@ __vt__Q53scn4step5enemy6flamer6Custom: __vt__Q53scn4step5enemy5foley6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy5foley6CustomCFv - .byte4 __dt__Q53scn4step5enemy5foley6CustomFv - .byte4 onInit__Q53scn4step5enemy5foley6CustomFv - .byte4 onHitPointIsZero__Q53scn4step5enemy5foley6CustomFv - .byte4 onVacuumReceive__Q53scn4step5enemy5foley6CustomFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy5foley6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy5foley6CustomCFv + .4byte __dt__Q53scn4step5enemy5foley6CustomFv + .4byte onInit__Q53scn4step5enemy5foley6CustomFv + .4byte onHitPointIsZero__Q53scn4step5enemy5foley6CustomFv + .4byte onVacuumReceive__Q53scn4step5enemy5foley6CustomFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy5foley6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23179,21 +23179,21 @@ __vt__Q53scn4step5enemy5foley6Custom: __vt__Q53scn4step5enemy5gemra6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy5gemra6CustomCFv - .byte4 __dt__Q53scn4step5enemy5gemra6CustomFv - .byte4 onInit__Q53scn4step5enemy5gemra6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q53scn4step5enemy5gemra6CustomFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy5gemra6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy5gemra6CustomCFv + .4byte __dt__Q53scn4step5enemy5gemra6CustomFv + .4byte onInit__Q53scn4step5enemy5gemra6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q53scn4step5enemy5gemra6CustomFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy5gemra6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23201,21 +23201,21 @@ __vt__Q53scn4step5enemy5gemra6Custom: __vt__Q53scn4step5enemy7gigatzo6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy7gigatzo6CustomCFv - .byte4 __dt__Q53scn4step5enemy7gigatzo6CustomFv - .byte4 onInit__Q53scn4step5enemy7gigatzo6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q53scn4step5enemy7gigatzo6CustomFv - .byte4 onOutWater__Q53scn4step5enemy7gigatzo6CustomFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q53scn4step5enemy7gigatzo6CustomFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy7gigatzo6CustomCFv + .4byte __dt__Q53scn4step5enemy7gigatzo6CustomFv + .4byte onInit__Q53scn4step5enemy7gigatzo6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q53scn4step5enemy7gigatzo6CustomFv + .4byte onOutWater__Q53scn4step5enemy7gigatzo6CustomFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q53scn4step5enemy7gigatzo6CustomFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23223,21 +23223,21 @@ __vt__Q53scn4step5enemy7gigatzo6Custom: __vt__Q53scn4step5enemy5gordo6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy5gordo6CustomCFv - .byte4 __dt__Q53scn4step5enemy5gordo6CustomFv - .byte4 onInit__Q53scn4step5enemy5gordo6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q53scn4step5enemy5gordo6CustomFv - .byte4 onOutWater__Q53scn4step5enemy5gordo6CustomFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q53scn4step5enemy5gordo6CustomFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy5gordo6CustomCFv + .4byte __dt__Q53scn4step5enemy5gordo6CustomFv + .4byte onInit__Q53scn4step5enemy5gordo6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q53scn4step5enemy5gordo6CustomFv + .4byte onOutWater__Q53scn4step5enemy5gordo6CustomFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q53scn4step5enemy5gordo6CustomFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23245,21 +23245,21 @@ __vt__Q53scn4step5enemy5gordo6Custom: __vt__Q53scn4step5enemy7hothead6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy7hothead6CustomCFv - .byte4 __dt__Q53scn4step5enemy7hothead6CustomFv - .byte4 onInit__Q53scn4step5enemy7hothead6CustomFv - .byte4 onHitPointIsZero__Q53scn4step5enemy7hothead6CustomFv - .byte4 onVacuumReceive__Q53scn4step5enemy7hothead6CustomFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy7hothead6CustomFv - .byte4 onInWater__Q53scn4step5enemy7hothead6CustomFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q53scn4step5enemy7hothead6CustomFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy7hothead6CustomCFv + .4byte __dt__Q53scn4step5enemy7hothead6CustomFv + .4byte onInit__Q53scn4step5enemy7hothead6CustomFv + .4byte onHitPointIsZero__Q53scn4step5enemy7hothead6CustomFv + .4byte onVacuumReceive__Q53scn4step5enemy7hothead6CustomFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy7hothead6CustomFv + .4byte onInWater__Q53scn4step5enemy7hothead6CustomFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q53scn4step5enemy7hothead6CustomFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23279,21 +23279,21 @@ $$255360: __vt__Q53scn4step5enemy6juckle6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy6juckle6CustomCFv - .byte4 __dt__Q53scn4step5enemy6juckle6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q53scn4step5enemy6juckle6CustomFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q53scn4step5enemy6juckle6CustomFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy6juckle6CustomCFv + .4byte __dt__Q53scn4step5enemy6juckle6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q53scn4step5enemy6juckle6CustomFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q53scn4step5enemy6juckle6CustomFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23301,21 +23301,21 @@ __vt__Q53scn4step5enemy6juckle6Custom: __vt__Q53scn4step5enemy4kabu6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy4kabu6CustomCFv - .byte4 __dt__Q53scn4step5enemy4kabu6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q53scn4step5enemy4kabu6CustomFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy4kabu6CustomCFv + .4byte __dt__Q53scn4step5enemy4kabu6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q53scn4step5enemy4kabu6CustomFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23323,21 +23323,21 @@ __vt__Q53scn4step5enemy4kabu6Custom: __vt__Q53scn4step5enemy10knucklejoe6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy10knucklejoe6CustomCFv - .byte4 __dt__Q53scn4step5enemy10knucklejoe6CustomFv - .byte4 onInit__Q53scn4step5enemy10knucklejoe6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy10knucklejoe6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy10knucklejoe6CustomCFv + .4byte __dt__Q53scn4step5enemy10knucklejoe6CustomFv + .4byte onInit__Q53scn4step5enemy10knucklejoe6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy10knucklejoe6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23345,21 +23345,21 @@ __vt__Q53scn4step5enemy10knucklejoe6Custom: __vt__Q53scn4step5enemy6lanzer6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy6lanzer6CustomCFv - .byte4 __dt__Q53scn4step5enemy6lanzer6CustomFv - .byte4 onInit__Q53scn4step5enemy6lanzer6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy6lanzer6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy6lanzer6CustomCFv + .4byte __dt__Q53scn4step5enemy6lanzer6CustomFv + .4byte onInit__Q53scn4step5enemy6lanzer6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy6lanzer6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23367,27 +23367,27 @@ __vt__Q53scn4step5enemy6lanzer6Custom: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9mbossdead9StateMain$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9mbossdead9StateMain$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9mbossdead9StateMain$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9mbossdead9StateMain$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9mbossdead9StateMain$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9mbossdead6Custom __vt__Q53scn4step5enemy9mbossdead6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy9mbossdead6CustomCFv - .byte4 __dt__Q53scn4step5enemy9mbossdead6CustomFv - .byte4 onInit__Q53scn4step5enemy9mbossdead6CustomFv - .byte4 onHitPointIsZero__Q53scn4step5enemy9mbossdead6CustomFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy9mbossdead6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q53scn4step5enemy9mbossdead6CustomFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q53scn4step5enemy9mbossdead6CustomFv - .byte4 reqCustomDeadEffect__Q53scn4step5enemy9mbossdead6CustomFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy9mbossdead6CustomCFv + .4byte __dt__Q53scn4step5enemy9mbossdead6CustomFv + .4byte onInit__Q53scn4step5enemy9mbossdead6CustomFv + .4byte onHitPointIsZero__Q53scn4step5enemy9mbossdead6CustomFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy9mbossdead6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q53scn4step5enemy9mbossdead6CustomFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q53scn4step5enemy9mbossdead6CustomFv + .4byte reqCustomDeadEffect__Q53scn4step5enemy9mbossdead6CustomFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23395,27 +23395,27 @@ __vt__Q53scn4step5enemy9mbossdead6Custom: __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies11StateEndure$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies11StateEndure$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies11StateEndure$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies11StateEndure$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies11StateEndure$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy7mumbies6Custom __vt__Q53scn4step5enemy7mumbies6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy7mumbies6CustomCFv - .byte4 __dt__Q53scn4step5enemy7mumbies6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q53scn4step5enemy7mumbies6CustomFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q53scn4step5enemy7mumbies6CustomFv - .byte4 onDamaged__Q53scn4step5enemy7mumbies6CustomFv - .byte4 onInWater__Q53scn4step5enemy7mumbies6CustomFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q53scn4step5enemy7mumbies6CustomFv - .byte4 onCaptured__Q53scn4step5enemy7mumbies6CustomFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy7mumbies6CustomCFv + .4byte __dt__Q53scn4step5enemy7mumbies6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q53scn4step5enemy7mumbies6CustomFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q53scn4step5enemy7mumbies6CustomFv + .4byte onDamaged__Q53scn4step5enemy7mumbies6CustomFv + .4byte onInWater__Q53scn4step5enemy7mumbies6CustomFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q53scn4step5enemy7mumbies6CustomFv + .4byte onCaptured__Q53scn4step5enemy7mumbies6CustomFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23423,21 +23423,21 @@ __vt__Q53scn4step5enemy7mumbies6Custom: __vt__Q53scn4step5enemy8needlous6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy8needlous6CustomCFv - .byte4 __dt__Q53scn4step5enemy8needlous6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q53scn4step5enemy8needlous6CustomFv - .byte4 onProcFixPos__Q53scn4step5enemy8needlous6CustomFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy8needlous6CustomCFv + .4byte __dt__Q53scn4step5enemy8needlous6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q53scn4step5enemy8needlous6CustomFv + .4byte onProcFixPos__Q53scn4step5enemy8needlous6CustomFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23445,21 +23445,21 @@ __vt__Q53scn4step5enemy8needlous6Custom: __vt__Q53scn4step5enemy5nruff6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy5nruff6CustomCFv - .byte4 __dt__Q53scn4step5enemy5nruff6CustomFv - .byte4 onInit__Q53scn4step5enemy5nruff6CustomFv - .byte4 onHitPointIsZero__Q53scn4step5enemy5nruff6CustomFv - .byte4 onVacuumReceive__Q53scn4step5enemy5nruff6CustomFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy5nruff6CustomFv - .byte4 onInWater__Q53scn4step5enemy5nruff6CustomFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q53scn4step5enemy5nruff6CustomFv - .byte4 onDead__Q53scn4step5enemy5nruff6CustomFv - .byte4 onProcFixPos__Q53scn4step5enemy5nruff6CustomFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy5nruff6CustomCFv + .4byte __dt__Q53scn4step5enemy5nruff6CustomFv + .4byte onInit__Q53scn4step5enemy5nruff6CustomFv + .4byte onHitPointIsZero__Q53scn4step5enemy5nruff6CustomFv + .4byte onVacuumReceive__Q53scn4step5enemy5nruff6CustomFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy5nruff6CustomFv + .4byte onInWater__Q53scn4step5enemy5nruff6CustomFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q53scn4step5enemy5nruff6CustomFv + .4byte onDead__Q53scn4step5enemy5nruff6CustomFv + .4byte onProcFixPos__Q53scn4step5enemy5nruff6CustomFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23467,21 +23467,21 @@ __vt__Q53scn4step5enemy5nruff6Custom: __vt__Q53scn4step5enemy6owgulf6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy6owgulf6CustomCFv - .byte4 __dt__Q53scn4step5enemy6owgulf6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy6owgulf6CustomCFv + .4byte __dt__Q53scn4step5enemy6owgulf6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23489,21 +23489,21 @@ __vt__Q53scn4step5enemy6owgulf6Custom: __vt__Q53scn4step5enemy7parasol6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy7parasol6CustomCFv - .byte4 __dt__Q53scn4step5enemy7parasol6CustomFv - .byte4 onInit__Q53scn4step5enemy7parasol6CustomFv - .byte4 onHitPointIsZero__Q53scn4step5enemy7parasol6CustomFv - .byte4 onVacuumReceive__Q53scn4step5enemy7parasol6CustomFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy7parasol6CustomFv - .byte4 onInWater__Q53scn4step5enemy7parasol6CustomFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q53scn4step5enemy7parasol6CustomFv - .byte4 onDead__Q53scn4step5enemy7parasol6CustomFv - .byte4 onProcFixPos__Q53scn4step5enemy7parasol6CustomFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy7parasol6CustomCFv + .4byte __dt__Q53scn4step5enemy7parasol6CustomFv + .4byte onInit__Q53scn4step5enemy7parasol6CustomFv + .4byte onHitPointIsZero__Q53scn4step5enemy7parasol6CustomFv + .4byte onVacuumReceive__Q53scn4step5enemy7parasol6CustomFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy7parasol6CustomFv + .4byte onInWater__Q53scn4step5enemy7parasol6CustomFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q53scn4step5enemy7parasol6CustomFv + .4byte onDead__Q53scn4step5enemy7parasol6CustomFv + .4byte onProcFixPos__Q53scn4step5enemy7parasol6CustomFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23511,77 +23511,77 @@ __vt__Q53scn4step5enemy7parasol6Custom: __vt__Q53scn4step5enemy10parasoldee6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy10parasoldee6CustomCFv - .byte4 __dt__Q53scn4step5enemy10parasoldee6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q53scn4step5enemy10parasoldee6CustomFv - .byte4 onVacuumReceive__Q53scn4step5enemy10parasoldee6CustomFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy10parasoldee6CustomFv - .byte4 onInWater__Q53scn4step5enemy10parasoldee6CustomFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q53scn4step5enemy10parasoldee6CustomFv - .byte4 onDead__Q53scn4step5enemy10parasoldee6CustomFv - .byte4 onProcFixPos__Q53scn4step5enemy10parasoldee6CustomFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy10parasoldee6CustomCFv + .4byte __dt__Q53scn4step5enemy10parasoldee6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q53scn4step5enemy10parasoldee6CustomFv + .4byte onVacuumReceive__Q53scn4step5enemy10parasoldee6CustomFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy10parasoldee6CustomFv + .4byte onInWater__Q53scn4step5enemy10parasoldee6CustomFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q53scn4step5enemy10parasoldee6CustomFv + .4byte onDead__Q53scn4step5enemy10parasoldee6CustomFv + .4byte onProcFixPos__Q53scn4step5enemy10parasoldee6CustomFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .4byte 0 - .byte4 $$28$$2__dt__Q53scn4step5enemy10parasoldee6CustomFv - .byte4 $$28$$2onParasolRelease__Q53scn4step5enemy10parasoldee6CustomFRQ53scn4step5enemy7parasol6Custom - .byte4 $$28$$2onParasolRequireUnsetReceiver__Q53scn4step5enemy10parasoldee6CustomFRQ53scn4step5enemy7parasol6Custom - .byte4 onParasolRelease__Q53scn4step5enemy10parasoldee6CustomFRQ53scn4step5enemy7parasol6Custom - .byte4 onParasolRequireUnsetReceiver__Q53scn4step5enemy10parasoldee6CustomFRQ53scn4step5enemy7parasol6Custom + .4byte $$28$$2__dt__Q53scn4step5enemy10parasoldee6CustomFv + .4byte $$28$$2onParasolRelease__Q53scn4step5enemy10parasoldee6CustomFRQ53scn4step5enemy7parasol6Custom + .4byte $$28$$2onParasolRequireUnsetReceiver__Q53scn4step5enemy10parasoldee6CustomFRQ53scn4step5enemy7parasol6Custom + .4byte onParasolRelease__Q53scn4step5enemy10parasoldee6CustomFRQ53scn4step5enemy7parasol6Custom + .4byte onParasolRequireUnsetReceiver__Q53scn4step5enemy10parasoldee6CustomFRQ53scn4step5enemy7parasol6Custom .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo6Custom __vt__Q53scn4step5enemy10parasoldoo6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy10parasoldoo6CustomCFv - .byte4 __dt__Q53scn4step5enemy10parasoldoo6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q53scn4step5enemy10parasoldoo6CustomFv - .byte4 onVacuumReceive__Q53scn4step5enemy10parasoldoo6CustomFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy10parasoldoo6CustomFv - .byte4 onInWater__Q53scn4step5enemy10parasoldoo6CustomFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q53scn4step5enemy10parasoldoo6CustomFv - .byte4 onDead__Q53scn4step5enemy10parasoldoo6CustomFv - .byte4 onProcFixPos__Q53scn4step5enemy10parasoldoo6CustomFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy10parasoldoo6CustomCFv + .4byte __dt__Q53scn4step5enemy10parasoldoo6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q53scn4step5enemy10parasoldoo6CustomFv + .4byte onVacuumReceive__Q53scn4step5enemy10parasoldoo6CustomFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy10parasoldoo6CustomFv + .4byte onInWater__Q53scn4step5enemy10parasoldoo6CustomFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q53scn4step5enemy10parasoldoo6CustomFv + .4byte onDead__Q53scn4step5enemy10parasoldoo6CustomFv + .4byte onProcFixPos__Q53scn4step5enemy10parasoldoo6CustomFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .4byte 0 - .byte4 $$28$$2__dt__Q53scn4step5enemy10parasoldoo6CustomFv - .byte4 $$28$$2onParasolRelease__Q53scn4step5enemy10parasoldoo6CustomFRQ53scn4step5enemy7parasol6Custom - .byte4 $$28$$2onParasolRequireUnsetReceiver__Q53scn4step5enemy10parasoldoo6CustomFRQ53scn4step5enemy7parasol6Custom - .byte4 onParasolRelease__Q53scn4step5enemy10parasoldoo6CustomFRQ53scn4step5enemy7parasol6Custom - .byte4 onParasolRequireUnsetReceiver__Q53scn4step5enemy10parasoldoo6CustomFRQ53scn4step5enemy7parasol6Custom + .4byte $$28$$2__dt__Q53scn4step5enemy10parasoldoo6CustomFv + .4byte $$28$$2onParasolRelease__Q53scn4step5enemy10parasoldoo6CustomFRQ53scn4step5enemy7parasol6Custom + .4byte $$28$$2onParasolRequireUnsetReceiver__Q53scn4step5enemy10parasoldoo6CustomFRQ53scn4step5enemy7parasol6Custom + .4byte onParasolRelease__Q53scn4step5enemy10parasoldoo6CustomFRQ53scn4step5enemy7parasol6Custom + .4byte onParasolRequireUnsetReceiver__Q53scn4step5enemy10parasoldoo6CustomFRQ53scn4step5enemy7parasol6Custom .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6pierce6Custom __vt__Q53scn4step5enemy6pierce6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy6pierce6CustomCFv - .byte4 __dt__Q53scn4step5enemy6pierce6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy6pierce6CustomCFv + .4byte __dt__Q53scn4step5enemy6pierce6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23589,27 +23589,27 @@ __vt__Q53scn4step5enemy6pierce6Custom: __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10poppybrojr6Custom __vt__Q53scn4step5enemy10poppybrojr6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy10poppybrojr6CustomCFv - .byte4 __dt__Q53scn4step5enemy10poppybrojr6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy10poppybrojr6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q53scn4step5enemy10poppybrojr6CustomFv - .byte4 onDead__Q53scn4step5enemy10poppybrojr6CustomFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy10poppybrojr6CustomCFv + .4byte __dt__Q53scn4step5enemy10poppybrojr6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy10poppybrojr6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q53scn4step5enemy10poppybrojr6CustomFv + .4byte onDead__Q53scn4step5enemy10poppybrojr6CustomFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23617,21 +23617,21 @@ __vt__Q53scn4step5enemy10poppybrojr6Custom: __vt__Q53scn4step5enemy14poppybrojrbomb6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy14poppybrojrbomb6CustomCFv - .byte4 __dt__Q53scn4step5enemy14poppybrojrbomb6CustomFv - .byte4 onInit__Q53scn4step5enemy14poppybrojrbomb6CustomFv - .byte4 onHitPointIsZero__Q53scn4step5enemy14poppybrojrbomb6CustomFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy14poppybrojrbomb6CustomFv - .byte4 onInWater__Q53scn4step5enemy14poppybrojrbomb6CustomFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy14poppybrojrbomb6CustomCFv + .4byte __dt__Q53scn4step5enemy14poppybrojrbomb6CustomFv + .4byte onInit__Q53scn4step5enemy14poppybrojrbomb6CustomFv + .4byte onHitPointIsZero__Q53scn4step5enemy14poppybrojrbomb6CustomFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy14poppybrojrbomb6CustomFv + .4byte onInWater__Q53scn4step5enemy14poppybrojrbomb6CustomFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23639,21 +23639,21 @@ __vt__Q53scn4step5enemy14poppybrojrbomb6Custom: __vt__Q53scn4step5enemy9puppetdee6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy9puppetdee6CustomCFv - .byte4 __dt__Q53scn4step5enemy9puppetdee6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q53scn4step5enemy9puppetdee6CustomFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy9puppetdee6CustomCFv + .4byte __dt__Q53scn4step5enemy9puppetdee6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q53scn4step5enemy9puppetdee6CustomFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23661,21 +23661,21 @@ __vt__Q53scn4step5enemy9puppetdee6Custom: __vt__Q53scn4step5enemy5rocky6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy5rocky6CustomCFv - .byte4 __dt__Q53scn4step5enemy5rocky6CustomFv - .byte4 onInit__Q53scn4step5enemy5rocky6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy5rocky6CustomCFv + .4byte __dt__Q53scn4step5enemy5rocky6CustomFv + .4byte onInit__Q53scn4step5enemy5rocky6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23683,21 +23683,21 @@ __vt__Q53scn4step5enemy5rocky6Custom: __vt__Q53scn4step5enemy8rollball6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy8rollball6CustomCFv - .byte4 __dt__Q53scn4step5enemy8rollball6CustomFv - .byte4 onInit__Q53scn4step5enemy8rollball6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q53scn4step5enemy8rollball6CustomFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy8rollball6CustomCFv + .4byte __dt__Q53scn4step5enemy8rollball6CustomFv + .4byte onInit__Q53scn4step5enemy8rollball6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q53scn4step5enemy8rollball6CustomFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23705,21 +23705,21 @@ __vt__Q53scn4step5enemy8rollball6Custom: __vt__Q53scn4step5enemy7sandbag6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy7sandbag6CustomCFv - .byte4 __dt__Q53scn4step5enemy7sandbag6CustomFv - .byte4 onInit__Q53scn4step5enemy7sandbag6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q53scn4step5enemy7sandbag6CustomFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy7sandbag6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q53scn4step5enemy7sandbag6CustomFv - .byte4 onCaptured__Q53scn4step5enemy7sandbag6CustomFv - .byte4 onDead__Q53scn4step5enemy7sandbag6CustomFv - .byte4 onProcFixPos__Q53scn4step5enemy7sandbag6CustomFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy7sandbag6CustomCFv + .4byte __dt__Q53scn4step5enemy7sandbag6CustomFv + .4byte onInit__Q53scn4step5enemy7sandbag6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q53scn4step5enemy7sandbag6CustomFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy7sandbag6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q53scn4step5enemy7sandbag6CustomFv + .4byte onCaptured__Q53scn4step5enemy7sandbag6CustomFv + .4byte onDead__Q53scn4step5enemy7sandbag6CustomFv + .4byte onProcFixPos__Q53scn4step5enemy7sandbag6CustomFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23727,21 +23727,21 @@ __vt__Q53scn4step5enemy7sandbag6Custom: __vt__Q53scn4step5enemy6scarfy6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy6scarfy6CustomCFv - .byte4 __dt__Q53scn4step5enemy6scarfy6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q53scn4step5enemy6scarfy6CustomFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q53scn4step5enemy6scarfy6CustomFv - .byte4 onDamaged__Q53scn4step5enemy6scarfy6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy6scarfy6CustomCFv + .4byte __dt__Q53scn4step5enemy6scarfy6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q53scn4step5enemy6scarfy6CustomFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q53scn4step5enemy6scarfy6CustomFv + .4byte onDamaged__Q53scn4step5enemy6scarfy6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23749,21 +23749,21 @@ __vt__Q53scn4step5enemy6scarfy6Custom: __vt__Q53scn4step5enemy8searches6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy8searches6CustomCFv - .byte4 __dt__Q53scn4step5enemy8searches6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q53scn4step5enemy8searches6CustomFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy8searches6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy8searches6CustomCFv + .4byte __dt__Q53scn4step5enemy8searches6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q53scn4step5enemy8searches6CustomFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy8searches6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23771,27 +23771,27 @@ __vt__Q53scn4step5enemy8searches6Custom: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5sheld6Custom __vt__Q53scn4step5enemy5sheld6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy5sheld6CustomCFv - .byte4 __dt__Q53scn4step5enemy5sheld6CustomFv - .byte4 onInit__Q53scn4step5enemy5sheld6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q53scn4step5enemy5sheld6CustomFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy5sheld6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy5sheld6CustomCFv + .4byte __dt__Q53scn4step5enemy5sheld6CustomFv + .4byte onInit__Q53scn4step5enemy5sheld6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q53scn4step5enemy5sheld6CustomFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy5sheld6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23799,21 +23799,21 @@ __vt__Q53scn4step5enemy5sheld6Custom: __vt__Q53scn4step5enemy6shotzo6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy6shotzo6CustomCFv - .byte4 __dt__Q53scn4step5enemy6shotzo6CustomFv - .byte4 onInit__Q53scn4step5enemy6shotzo6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q53scn4step5enemy6shotzo6CustomFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy6shotzo6CustomCFv + .4byte __dt__Q53scn4step5enemy6shotzo6CustomFv + .4byte onInit__Q53scn4step5enemy6shotzo6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q53scn4step5enemy6shotzo6CustomFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23821,21 +23821,21 @@ __vt__Q53scn4step5enemy6shotzo6Custom: __vt__Q53scn4step5enemy9sirkibble6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy9sirkibble6CustomCFv - .byte4 __dt__Q53scn4step5enemy9sirkibble6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy9sirkibble6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q53scn4step5enemy9sirkibble6CustomFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy9sirkibble6CustomCFv + .4byte __dt__Q53scn4step5enemy9sirkibble6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy9sirkibble6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q53scn4step5enemy9sirkibble6CustomFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23843,21 +23843,21 @@ __vt__Q53scn4step5enemy9sirkibble6Custom: __vt__Q53scn4step5enemy11sisterbound6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy11sisterbound6CustomCFv - .byte4 __dt__Q53scn4step5enemy11sisterbound6CustomFv - .byte4 onInit__Q53scn4step5enemy11sisterbound6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy11sisterbound6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy11sisterbound6CustomCFv + .4byte __dt__Q53scn4step5enemy11sisterbound6CustomFv + .4byte onInit__Q53scn4step5enemy11sisterbound6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy11sisterbound6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23865,21 +23865,21 @@ __vt__Q53scn4step5enemy11sisterbound6Custom: __vt__Q53scn4step5enemy5snowl6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy5snowl6CustomCFv - .byte4 __dt__Q53scn4step5enemy5snowl6CustomFv - .byte4 onInit__Q53scn4step5enemy5snowl6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy5snowl6CustomCFv + .4byte __dt__Q53scn4step5enemy5snowl6CustomFv + .4byte onInit__Q53scn4step5enemy5snowl6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23887,21 +23887,21 @@ __vt__Q53scn4step5enemy5snowl6Custom: __vt__Q53scn4step5enemy6sodory6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy6sodory6CustomCFv - .byte4 __dt__Q53scn4step5enemy6sodory6CustomFv - .byte4 onInit__Q53scn4step5enemy6sodory6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy6sodory6CustomFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy6sodory6CustomCFv + .4byte __dt__Q53scn4step5enemy6sodory6CustomFv + .4byte onInit__Q53scn4step5enemy6sodory6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy6sodory6CustomFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23909,21 +23909,21 @@ __vt__Q53scn4step5enemy6sodory6Custom: __vt__Q53scn4step5enemy6sparky6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy6sparky6CustomCFv - .byte4 __dt__Q53scn4step5enemy6sparky6CustomFv - .byte4 onInit__Q53scn4step5enemy6sparky6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy6sparky6CustomCFv + .4byte __dt__Q53scn4step5enemy6sparky6CustomFv + .4byte onInit__Q53scn4step5enemy6sparky6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23931,21 +23931,21 @@ __vt__Q53scn4step5enemy6sparky6Custom: __vt__Q53scn4step5enemy10stareffect6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy10stareffect6CustomCFv - .byte4 __dt__Q53scn4step5enemy10stareffect6CustomFv - .byte4 onInit__Q53scn4step5enemy10stareffect6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy10stareffect6CustomCFv + .4byte __dt__Q53scn4step5enemy10stareffect6CustomFv + .4byte onInit__Q53scn4step5enemy10stareffect6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23953,21 +23953,21 @@ __vt__Q53scn4step5enemy10stareffect6Custom: __vt__Q53scn4step5enemy3sun6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy3sun6CustomCFv - .byte4 __dt__Q53scn4step5enemy3sun6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q53scn4step5enemy3sun6CustomFv - .byte4 onOutWater__Q53scn4step5enemy3sun6CustomFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy3sun6CustomCFv + .4byte __dt__Q53scn4step5enemy3sun6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q53scn4step5enemy3sun6CustomFv + .4byte onOutWater__Q53scn4step5enemy3sun6CustomFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23975,21 +23975,21 @@ __vt__Q53scn4step5enemy3sun6Custom: __vt__Q53scn4step5enemy9tsukikage6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy9tsukikage6CustomCFv - .byte4 __dt__Q53scn4step5enemy9tsukikage6CustomFv - .byte4 onInit__Q53scn4step5enemy9tsukikage6CustomFv - .byte4 onHitPointIsZero__Q53scn4step5enemy9tsukikage6CustomFv - .byte4 onVacuumReceive__Q53scn4step5enemy9tsukikage6CustomFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q53scn4step5enemy9tsukikage6CustomFv - .byte4 onInWater__Q53scn4step5enemy9tsukikage6CustomFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy9tsukikage6CustomCFv + .4byte __dt__Q53scn4step5enemy9tsukikage6CustomFv + .4byte onInit__Q53scn4step5enemy9tsukikage6CustomFv + .4byte onHitPointIsZero__Q53scn4step5enemy9tsukikage6CustomFv + .4byte onVacuumReceive__Q53scn4step5enemy9tsukikage6CustomFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q53scn4step5enemy9tsukikage6CustomFv + .4byte onInWater__Q53scn4step5enemy9tsukikage6CustomFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23997,21 +23997,21 @@ __vt__Q53scn4step5enemy9tsukikage6Custom: __vt__Q53scn4step5enemy9waddledoo6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy9waddledoo6CustomCFv - .byte4 __dt__Q53scn4step5enemy9waddledoo6CustomFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy9waddledoo6CustomCFv + .4byte __dt__Q53scn4step5enemy9waddledoo6CustomFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -24019,27 +24019,27 @@ __vt__Q53scn4step5enemy9waddledoo6Custom: __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateAppear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11whispyapple6Custom __vt__Q53scn4step5enemy11whispyapple6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy11whispyapple6CustomCFv - .byte4 __dt__Q53scn4step5enemy11whispyapple6CustomFv - .byte4 onInit__Q53scn4step5enemy11whispyapple6CustomFv - .byte4 onHitPointIsZero__Q53scn4step5enemy11whispyapple6CustomFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q53scn4step5enemy11whispyapple6CustomFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q53scn4step5enemy11whispyapple6CustomFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy11whispyapple6CustomCFv + .4byte __dt__Q53scn4step5enemy11whispyapple6CustomFv + .4byte onInit__Q53scn4step5enemy11whispyapple6CustomFv + .4byte onHitPointIsZero__Q53scn4step5enemy11whispyapple6CustomFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q53scn4step5enemy11whispyapple6CustomFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q53scn4step5enemy11whispyapple6CustomFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -24047,21 +24047,21 @@ __vt__Q53scn4step5enemy11whispyapple6Custom: __vt__Q53scn4step5enemy15zankibblecutter6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step5enemy15zankibblecutter6CustomCFv - .byte4 __dt__Q53scn4step5enemy15zankibblecutter6CustomFv - .byte4 onInit__Q53scn4step5enemy15zankibblecutter6CustomFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q53scn4step5enemy15zankibblecutter6CustomFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q53scn4step5enemy15zankibblecutter6CustomFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step5enemy15zankibblecutter6CustomCFv + .4byte __dt__Q53scn4step5enemy15zankibblecutter6CustomFv + .4byte onInit__Q53scn4step5enemy15zankibblecutter6CustomFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q53scn4step5enemy15zankibblecutter6CustomFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q53scn4step5enemy15zankibblecutter6CustomFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -24069,53 +24069,53 @@ __vt__Q53scn4step5enemy15zankibblecutter6Custom: __vt__Q53scn4step4hero5spark6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step4hero5spark6CustomCFv - .byte4 __dt__Q53scn4step4hero5spark6CustomFv + .4byte GetRuntimeTypeInfo__Q53scn4step4hero5spark6CustomCFv + .4byte __dt__Q53scn4step4hero5spark6CustomFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7parasol6Custom __vt__Q53scn4step4hero7parasol6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step4hero7parasol6CustomCFv - .byte4 __dt__Q53scn4step4hero7parasol6CustomFv + .4byte GetRuntimeTypeInfo__Q53scn4step4hero7parasol6CustomCFv + .4byte __dt__Q53scn4step4hero7parasol6CustomFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter6Custom __vt__Q53scn4step4hero7fighter6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step4hero7fighter6CustomCFv - .byte4 __dt__Q53scn4step4hero7fighter6CustomFv + .4byte GetRuntimeTypeInfo__Q53scn4step4hero7fighter6CustomCFv + .4byte __dt__Q53scn4step4hero7fighter6CustomFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon11starshotlv16Custom __vt__Q53scn4step6weapon11starshotlv16Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step6weapon11starshotlv16CustomCFv - .byte4 __dt__Q53scn4step6weapon11starshotlv16CustomFv - .byte4 onInit__Q53scn4step6weapon11starshotlv16CustomFv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step6weapon11starshotlv16CustomCFv + .4byte __dt__Q53scn4step6weapon11starshotlv16CustomFv + .4byte onInit__Q53scn4step6weapon11starshotlv16CustomFv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -24123,17 +24123,17 @@ __vt__Q53scn4step6weapon11starshotlv16Custom: __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7rollexp9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7rollexp9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7rollexp9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7rollexp9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7rollexp9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon7rollexp6Custom __vt__Q53scn4step6weapon7rollexp6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step6weapon7rollexp6CustomCFv - .byte4 __dt__Q53scn4step6weapon7rollexp6CustomFv - .byte4 onInit__Q53scn4step6weapon7rollexp6CustomFv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step6weapon7rollexp6CustomCFv + .4byte __dt__Q53scn4step6weapon7rollexp6CustomFv + .4byte onInit__Q53scn4step6weapon7rollexp6CustomFv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -24141,17 +24141,17 @@ __vt__Q53scn4step6weapon7rollexp6Custom: __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13gigatzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13gigatzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13gigatzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13gigatzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13gigatzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon13gigatzobullet6Custom __vt__Q53scn4step6weapon13gigatzobullet6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step6weapon13gigatzobullet6CustomCFv - .byte4 __dt__Q53scn4step6weapon13gigatzobullet6CustomFv - .byte4 onInit__Q53scn4step6weapon13gigatzobullet6CustomFv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step6weapon13gigatzobullet6CustomCFv + .4byte __dt__Q53scn4step6weapon13gigatzobullet6CustomFv + .4byte onInit__Q53scn4step6weapon13gigatzobullet6CustomFv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -24159,17 +24159,17 @@ __vt__Q53scn4step6weapon13gigatzobullet6Custom: __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10comothread9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10comothread9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10comothread9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10comothread9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10comothread9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon10comothread6Custom __vt__Q53scn4step6weapon10comothread6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step6weapon10comothread6CustomCFv - .byte4 __dt__Q53scn4step6weapon10comothread6CustomFv - .byte4 onInit__Q53scn4step6weapon10comothread6CustomFv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step6weapon10comothread6CustomCFv + .4byte __dt__Q53scn4step6weapon10comothread6CustomFv + .4byte onInit__Q53scn4step6weapon10comothread6CustomFv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -24177,17 +24177,17 @@ __vt__Q53scn4step6weapon10comothread6Custom: __vt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot9StateMain$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot9StateMain$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1Fv - .byte4 create__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot9StateMain$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1Fv + .4byte __dt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot9StateMain$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1Fv + .4byte create__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot9StateMain$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1Fv .global __vt__Q53scn4step6weapon16fighterhadoushot6Custom __vt__Q53scn4step6weapon16fighterhadoushot6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step6weapon16fighterhadoushot6CustomCFv - .byte4 __dt__Q53scn4step6weapon16fighterhadoushot6CustomFv - .byte4 onInit__Q53scn4step6weapon16fighterhadoushot6CustomFv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step6weapon16fighterhadoushot6CustomCFv + .4byte __dt__Q53scn4step6weapon16fighterhadoushot6CustomFv + .4byte onInit__Q53scn4step6weapon16fighterhadoushot6CustomFv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -24209,17 +24209,17 @@ $$256603: __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon13vacuumedblock6Custom __vt__Q53scn4step6weapon13vacuumedblock6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step6weapon13vacuumedblock6CustomCFv - .byte4 __dt__Q53scn4step6weapon13vacuumedblock6CustomFv - .byte4 onInit__Q53scn4step6weapon13vacuumedblock6CustomFv - .byte4 onDead__Q53scn4step6weapon13vacuumedblock6CustomFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step6weapon13vacuumedblock6CustomCFv + .4byte __dt__Q53scn4step6weapon13vacuumedblock6CustomFv + .4byte onInit__Q53scn4step6weapon13vacuumedblock6CustomFv + .4byte onDead__Q53scn4step6weapon13vacuumedblock6CustomFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -24227,17 +24227,17 @@ __vt__Q53scn4step6weapon13vacuumedblock6Custom: __vt__Q24util116StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon26challengemastersummonlight9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util116StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon26challengemastersummonlight9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util116StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon26challengemastersummonlight9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util116StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon26challengemastersummonlight9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util116StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon26challengemastersummonlight9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon26challengemastersummonlight6Custom __vt__Q53scn4step6weapon26challengemastersummonlight6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step6weapon26challengemastersummonlight6CustomCFv - .byte4 __dt__Q53scn4step6weapon26challengemastersummonlight6CustomFv - .byte4 onInit__Q53scn4step6weapon26challengemastersummonlight6CustomFv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q53scn4step6weapon26challengemastersummonlight6CustomCFv + .4byte __dt__Q53scn4step6weapon26challengemastersummonlight6CustomFv + .4byte onInit__Q53scn4step6weapon26challengemastersummonlight6CustomFv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -24245,23 +24245,23 @@ __vt__Q53scn4step6weapon26challengemastersummonlight6Custom: __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot10StateReady$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot10StateReady$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot10StateReady$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot10StateReady$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot10StateReady$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateWait$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateWait$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateWait$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateWait$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateWait$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateWait$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon19challengemastershot6Custom __vt__Q53scn4step6weapon19challengemastershot6Custom: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q53scn4step6weapon19challengemastershot6CustomCFv - .byte4 __dt__Q53scn4step6weapon19challengemastershot6CustomFv - .byte4 onInit__Q53scn4step6weapon19challengemastershot6CustomFv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q53scn4step6weapon19challengemastershot6CustomFv + .4byte GetRuntimeTypeInfo__Q53scn4step6weapon19challengemastershot6CustomCFv + .4byte __dt__Q53scn4step6weapon19challengemastershot6CustomFv + .4byte onInit__Q53scn4step6weapon19challengemastershot6CustomFv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q53scn4step6weapon19challengemastershot6CustomFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/CustomBase.s b/asm/src/CustomBase.s index 09682d0b..fe60a23c 100644 --- a/asm/src/CustomBase.s +++ b/asm/src/CustomBase.s @@ -430,8 +430,8 @@ lbl_803D37C4: __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util28StateFactory$$0Q24util6IState$$1 __vt__Q24util28StateFactory$$0Q24util6IState$$1: .4byte 0 @@ -442,25 +442,25 @@ __vt__Q24util28StateFactory$$0Q24util6IState$$1: __vt__Q43scn4step4boss10CustomBase: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step4boss10CustomBaseCFv - .byte4 __dt__Q43scn4step4boss10CustomBaseFv - .byte4 onInit__Q43scn4step4boss10CustomBaseFv - .byte4 onAppear__Q43scn4step4boss10CustomBaseFv - .byte4 onStart__Q43scn4step4boss10CustomBaseFv - .byte4 onDamage__Q43scn4step4boss10CustomBaseFv - .byte4 onDead__Q43scn4step4boss10CustomBaseFv - .byte4 onStateChange__Q43scn4step4boss10CustomBaseFv - .byte4 onScriptRequested__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopStart__Q43scn4step4boss10CustomBaseFv - .byte4 onHitStopEnd__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopStarted__Q43scn4step4boss10CustomBaseFv - .byte4 onObjStopFinished__Q43scn4step4boss10CustomBaseFv - .byte4 onProcAnim__Q43scn4step4boss10CustomBaseFv - .byte4 onProcMove__Q43scn4step4boss10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step4boss10CustomBaseFv - .byte4 onProcObjCollReact__Q43scn4step4boss10CustomBaseFv - .byte4 onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv - .byte4 getFirstOffs__Q43scn4step4boss10CustomBaseCFv + .4byte GetRuntimeTypeInfo__Q43scn4step4boss10CustomBaseCFv + .4byte __dt__Q43scn4step4boss10CustomBaseFv + .4byte onInit__Q43scn4step4boss10CustomBaseFv + .4byte onAppear__Q43scn4step4boss10CustomBaseFv + .4byte onStart__Q43scn4step4boss10CustomBaseFv + .4byte onDamage__Q43scn4step4boss10CustomBaseFv + .4byte onDead__Q43scn4step4boss10CustomBaseFv + .4byte onStateChange__Q43scn4step4boss10CustomBaseFv + .4byte onScriptRequested__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopStart__Q43scn4step4boss10CustomBaseFv + .4byte onHitStopEnd__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopStarted__Q43scn4step4boss10CustomBaseFv + .4byte onObjStopFinished__Q43scn4step4boss10CustomBaseFv + .4byte onProcAnim__Q43scn4step4boss10CustomBaseFv + .4byte onProcMove__Q43scn4step4boss10CustomBaseFv + .4byte onProcFixPos__Q43scn4step4boss10CustomBaseFv + .4byte onProcObjCollReact__Q43scn4step4boss10CustomBaseFv + .4byte onUpdateUseGPU__Q43scn4step4boss10CustomBaseFv + .4byte getFirstOffs__Q43scn4step4boss10CustomBaseCFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -468,27 +468,27 @@ __vt__Q43scn4step4boss10CustomBase: __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadInWater$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadInWater$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadInWater$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadInWater$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadInWater$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q43scn4step5enemy10CustomBase __vt__Q43scn4step5enemy10CustomBase: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step5enemy10CustomBaseCFv - .byte4 __dt__Q43scn4step5enemy10CustomBaseFv - .byte4 onInit__Q43scn4step5enemy10CustomBaseFv - .byte4 onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumReceive__Q43scn4step5enemy10CustomBaseFv - .byte4 onVacuumResist__Q43scn4step5enemy10CustomBaseFv - .byte4 onDamaged__Q43scn4step5enemy10CustomBaseFv - .byte4 onInWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onOutWater__Q43scn4step5enemy10CustomBaseFv - .byte4 onRecover__Q43scn4step5enemy10CustomBaseFv - .byte4 onCaptured__Q43scn4step5enemy10CustomBaseFv - .byte4 onDead__Q43scn4step5enemy10CustomBaseFv - .byte4 onProcFixPos__Q43scn4step5enemy10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv - .byte4 setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step5enemy10CustomBaseCFv + .4byte __dt__Q43scn4step5enemy10CustomBaseFv + .4byte onInit__Q43scn4step5enemy10CustomBaseFv + .4byte onHitPointIsZero__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumReceive__Q43scn4step5enemy10CustomBaseFv + .4byte onVacuumResist__Q43scn4step5enemy10CustomBaseFv + .4byte onDamaged__Q43scn4step5enemy10CustomBaseFv + .4byte onInWater__Q43scn4step5enemy10CustomBaseFv + .4byte onOutWater__Q43scn4step5enemy10CustomBaseFv + .4byte onRecover__Q43scn4step5enemy10CustomBaseFv + .4byte onCaptured__Q43scn4step5enemy10CustomBaseFv + .4byte onDead__Q43scn4step5enemy10CustomBaseFv + .4byte onProcFixPos__Q43scn4step5enemy10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step5enemy10CustomBaseFv + .4byte setupSuperEnemyEffect__Q43scn4step5enemy10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -496,11 +496,11 @@ __vt__Q43scn4step5enemy10CustomBase: __vt__Q43scn4step6weapon10CustomBase: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon10CustomBaseFv - .byte4 onInit__Q43scn4step6weapon10CustomBaseFv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon10CustomBaseFv + .4byte onInit__Q43scn4step6weapon10CustomBaseFv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/CustomFactory.s b/asm/src/CustomFactory.s index 25f6f13c..a6efb6a2 100644 --- a/asm/src/CustomFactory.s +++ b/asm/src/CustomFactory.s @@ -6259,632 +6259,632 @@ $$264044: __vt__Q43scn4step6weapon50CustomSimple$$0Q53scn4step6weapon7airball9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon50CustomSimple$$0Q53scn4step6weapon7airball9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon50CustomSimple$$0Q53scn4step6weapon7airball9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon50CustomSimple$$0Q53scn4step6weapon7airball9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon50CustomSimple$$0Q53scn4step6weapon7airball9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11waterpistol9StateMain$$1 __vt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11waterpistol9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11waterpistol9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11waterpistol9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11waterpistol9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11waterpistol9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9swordbeam9StateMain$$1 __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9swordbeam9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9swordbeam9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9swordbeam9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9swordbeam9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9swordbeam9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15cutterfinalwave9StateMain$$1 __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15cutterfinalwave9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15cutterfinalwave9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15cutterfinalwave9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15cutterfinalwave9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15cutterfinalwave9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17fireburningbullet9StateMain$$1 __vt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17fireburningbullet9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17fireburningbullet9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17fireburningbullet9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17fireburningbullet9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17fireburningbullet9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispyairball9StateMain$$1 __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispyairball9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispyairball9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispyairball9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispyairball9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispyairball9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15sirkibblecutter9StateMain$$1 __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15sirkibblecutter9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15sirkibblecutter9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15sirkibblecutter9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15sirkibblecutter9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15sirkibblecutter9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12shotzobullet9StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12shotzobullet9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12shotzobullet9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12shotzobullet9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12shotzobullet9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12shotzobullet9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12leafanpollen9StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12leafanpollen9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12leafanpollen9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12leafanpollen9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12leafanpollen9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12leafanpollen9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv19StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv19StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv19StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv19StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv19StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv19StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv29StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv29StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv29StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv29StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv29StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv29StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv39StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv39StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv39StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv39StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv39StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv39StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18watergalboroswater9StateMain$$1 __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18watergalboroswater9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18watergalboroswater9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18watergalboroswater9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18watergalboroswater9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18watergalboroswater9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10spearspear9StateMain$$1 __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10spearspear9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10spearspear9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10spearspear9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10spearspear9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10spearspear9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12hammerhammer9StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12hammerhammer9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12hammerhammer9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12hammerhammer9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12hammerhammer9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12hammerhammer9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8wingshot9StateMain$$1 __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8wingshot9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8wingshot9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8wingshot9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8wingshot9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8wingshot9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13wingshockwave9StateMain$$1 __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13wingshockwave9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13wingshockwave9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13wingshockwave9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13wingshockwave9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13wingshockwave9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16fightersmashshot9StateMain$$1 __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16fightersmashshot9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16fightersmashshot9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16fightersmashshot9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16fightersmashshot9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16fightersmashshot9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15fighterkickshot9StateMain$$1 __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15fighterkickshot9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15fighterkickshot9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15fighterkickshot9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15fighterkickshot9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15fighterkickshot9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon58CustomSimple$$0Q53scn4step6weapon14gigantedgeshot9StateMain$$1 __vt__Q43scn4step6weapon58CustomSimple$$0Q53scn4step6weapon14gigantedgeshot9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon58CustomSimple$$0Q53scn4step6weapon14gigantedgeshot9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon58CustomSimple$$0Q53scn4step6weapon14gigantedgeshot9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon58CustomSimple$$0Q53scn4step6weapon14gigantedgeshot9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon58CustomSimple$$0Q53scn4step6weapon14gigantedgeshot9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16enemywaterbullet9StateMain$$1 __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16enemywaterbullet9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16enemywaterbullet9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16enemywaterbullet9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16enemywaterbullet9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16enemywaterbullet9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon64CustomSimple$$0Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$1 __vt__Q43scn4step6weapon64CustomSimple$$0Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon64CustomSimple$$0Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon64CustomSimple$$0Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon64CustomSimple$$0Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon64CustomSimple$$0Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16kingsdoowaveshot9StateMain$$1 __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16kingsdoowaveshot9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16kingsdoowaveshot9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16kingsdoowaveshot9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16kingsdoowaveshot9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16kingsdoowaveshot9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13owgulffeather9StateMain$$1 __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13owgulffeather9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13owgulffeather9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13owgulffeather9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13owgulffeather9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13owgulffeather9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9foleyleaf9StateMain$$1 __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9foleyleaf9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9foleyleaf9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9foleyleaf9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9foleyleaf9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9foleyleaf9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10bowbyarrow9StateMain$$1 __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10bowbyarrow9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10bowbyarrow9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10bowbyarrow9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10bowbyarrow9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10bowbyarrow9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12jucklecutter9StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12jucklecutter9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12jucklecutter9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12jucklecutter9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12jucklecutter9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12jucklecutter9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17tsukikageshuriken9StateMain$$1 __vt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17tsukikageshuriken9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17tsukikageshuriken9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17tsukikageshuriken9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17tsukikageshuriken9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17tsukikageshuriken9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15knucklejoehadou9StateMain$$1 __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15knucklejoehadou9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15knucklejoehadou9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15knucklejoehadou9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15knucklejoehadou9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15knucklejoehadou9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9snowlball9StateMain$$1 __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9snowlball9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9snowlball9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9snowlball9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9snowlball9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9snowlball9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10floweffect9StateMain$$1 __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10floweffect9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10floweffect9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10floweffect9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10floweffect9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10floweffect9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispytornado9StateMain$$1 __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispytornado9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispytornado9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispytornado9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispytornado9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispytornado9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10whispyroot9StateMain$$1 __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10whispyroot9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10whispyroot9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10whispyroot9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10whispyroot9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10whispyroot9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationairball9StateMain$$1 __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationairball9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationairball9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationairball9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationairball9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationairball9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon63CustomSimple$$0Q53scn4step6weapon19combinationmetabeam9StateMain$$1 __vt__Q43scn4step6weapon63CustomSimple$$0Q53scn4step6weapon19combinationmetabeam9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon63CustomSimple$$0Q53scn4step6weapon19combinationmetabeam9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon63CustomSimple$$0Q53scn4step6weapon19combinationmetabeam9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon63CustomSimple$$0Q53scn4step6weapon19combinationmetabeam9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon63CustomSimple$$0Q53scn4step6weapon19combinationmetabeam9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon67CustomSimple$$0Q53scn4step6weapon23combinationdededebomber9StateMain$$1 __vt__Q43scn4step6weapon67CustomSimple$$0Q53scn4step6weapon23combinationdededebomber9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon67CustomSimple$$0Q53scn4step6weapon23combinationdededebomber9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon67CustomSimple$$0Q53scn4step6weapon23combinationdededebomber9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon67CustomSimple$$0Q53scn4step6weapon23combinationdededebomber9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon67CustomSimple$$0Q53scn4step6weapon23combinationdededebomber9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationdeeshot9StateMain$$1 __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationdeeshot9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationdeeshot9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationdeeshot9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationdeeshot9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationdeeshot9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8metabeam9StateMain$$1 __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8metabeam9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8metabeam9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8metabeam9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8metabeam9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8metabeam9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13metashockwave9StateMain$$1 __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13metashockwave9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13metashockwave9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13metashockwave9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13metashockwave9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13metashockwave9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12dededehammer9StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12dededehammer9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12dededehammer9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12dededehammer9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12dededehammer9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12dededehammer9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8deespear9StateMain$$1 __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8deespear9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8deespear9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8deespear9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8deespear9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8deespear9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11hotheadfire9StateMain$$1 __vt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11hotheadfire9StateMain$$1: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv - .byte4 __dt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11hotheadfire9StateMain$$1Fv - .byte4 onInit__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11hotheadfire9StateMain$$1Fv - .byte4 onDead__Q43scn4step6weapon10CustomBaseFv - .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv + .4byte GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .4byte __dt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11hotheadfire9StateMain$$1Fv + .4byte onInit__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11hotheadfire9StateMain$$1Fv + .4byte onDead__Q43scn4step6weapon10CustomBaseFv + .4byte reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11hotheadfire9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11hotheadfire9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11hotheadfire9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11hotheadfire9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11hotheadfire9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11hotheadfire9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13metashockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13metashockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13metashockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13metashockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13metashockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13metashockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8metabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8metabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8metabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8metabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8metabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8metabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationdeeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationdeeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationdeeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationdeeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationdeeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationdeeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util113StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util113StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util113StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util113StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util113StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util113StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19combinationmetabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19combinationmetabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19combinationmetabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19combinationmetabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19combinationmetabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19combinationmetabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10whispyroot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10whispyroot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10whispyroot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10whispyroot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10whispyroot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10whispyroot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispytornado9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispytornado9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispytornado9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispytornado9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispytornado9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispytornado9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10floweffect9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10floweffect9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10floweffect9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10floweffect9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10floweffect9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10floweffect9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9snowlball9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9snowlball9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9snowlball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9snowlball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9snowlball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9snowlball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15knucklejoehadou9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15knucklejoehadou9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15knucklejoehadou9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15knucklejoehadou9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15knucklejoehadou9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15knucklejoehadou9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17tsukikageshuriken9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17tsukikageshuriken9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17tsukikageshuriken9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17tsukikageshuriken9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17tsukikageshuriken9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17tsukikageshuriken9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12jucklecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12jucklecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12jucklecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12jucklecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12jucklecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12jucklecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10bowbyarrow9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10bowbyarrow9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10bowbyarrow9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10bowbyarrow9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10bowbyarrow9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10bowbyarrow9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9foleyleaf9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9foleyleaf9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9foleyleaf9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9foleyleaf9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9foleyleaf9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9foleyleaf9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13owgulffeather9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13owgulffeather9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13owgulffeather9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13owgulffeather9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13owgulffeather9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13owgulffeather9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16kingsdoowaveshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16kingsdoowaveshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16kingsdoowaveshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16kingsdoowaveshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16kingsdoowaveshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16kingsdoowaveshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16enemywaterbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16enemywaterbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16enemywaterbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16enemywaterbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16enemywaterbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16enemywaterbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon14gigantedgeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon14gigantedgeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon14gigantedgeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon14gigantedgeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon14gigantedgeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon14gigantedgeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13wingshockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13wingshockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13wingshockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13wingshockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13wingshockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13wingshockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8wingshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8wingshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8wingshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8wingshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8wingshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8wingshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18watergalboroswater9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18watergalboroswater9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18watergalboroswater9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18watergalboroswater9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18watergalboroswater9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18watergalboroswater9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12leafanpollen9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12leafanpollen9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12leafanpollen9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12leafanpollen9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12leafanpollen9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12leafanpollen9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12shotzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12shotzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12shotzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12shotzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12shotzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12shotzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15sirkibblecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15sirkibblecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15sirkibblecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15sirkibblecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15sirkibblecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15sirkibblecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispyairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispyairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispyairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispyairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispyairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispyairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17fireburningbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17fireburningbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17fireburningbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17fireburningbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17fireburningbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17fireburningbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15cutterfinalwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15cutterfinalwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15cutterfinalwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15cutterfinalwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15cutterfinalwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15cutterfinalwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9swordbeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9swordbeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9swordbeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9swordbeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9swordbeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9swordbeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11waterpistol9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11waterpistol9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11waterpistol9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11waterpistol9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11waterpistol9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11waterpistol9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7airball9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7airball9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7airball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7airball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7airball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7airball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q53scn4step4boss7bonkers6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/CutRopeStep.s b/asm/src/CutRopeStep.s index 9a313be1..c8ccb8f4 100644 --- a/asm/src/CutRopeStep.s +++ b/asm/src/CutRopeStep.s @@ -2033,28 +2033,28 @@ $$259480: .4byte 0 .global $$256446 $$256446: - .byte4 $$256444 + .4byte $$256444 .global lbl_80562834 lbl_80562834: - .byte4 $$256445 + .4byte $$256445 .global $$256458 $$256458: - .byte4 $$256456 + .4byte $$256456 .global lbl_8056283C lbl_8056283C: - .byte4 $$256457 + .4byte $$256457 .global $$256474 $$256474: - .byte4 $$256472 + .4byte $$256472 .global lbl_80562844 lbl_80562844: - .byte4 $$256473 + .4byte $$256473 .global $$256486 $$256486: - .byte4 $$256484 + .4byte $$256484 .global lbl_8056284C lbl_8056284C: - .byte4 $$256485 + .4byte $$256485 .global $$259707 $$259707: .4byte 0x3F000000 diff --git a/asm/src/DamageFieldReact.s b/asm/src/DamageFieldReact.s index 650330ab..17891e0f 100644 --- a/asm/src/DamageFieldReact.s +++ b/asm/src/DamageFieldReact.s @@ -742,14 +742,14 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage14Stat __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage14StateFireBlock$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage14StateFireBlock$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage14StateFireBlock$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage14StateFireBlock$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage14StateFireBlock$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateSpine$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateSpine$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateSpine$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateSpine$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateSpine$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateSpine$$4PQ43scn4step4hero4Hero$$1Fv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256861 diff --git a/asm/src/Dead.s b/asm/src/Dead.s index c9398a8e..6c413ec5 100644 --- a/asm/src/Dead.s +++ b/asm/src/Dead.s @@ -362,11 +362,11 @@ __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9State __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$4f$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$4f$$1Fv - .byte4 create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$4f$$1Fv + .4byte __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$4f$$1Fv + .4byte create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$4f$$1Fv .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$1Fv diff --git a/asm/src/Dedede.s b/asm/src/Dedede.s index b409056a..fcffab3e 100644 --- a/asm/src/Dedede.s +++ b/asm/src/Dedede.s @@ -84,53 +84,53 @@ Script__Q53scn4step4hero9modeldesc6DededeFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20 $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000D - .byte4 $$248728 + .4byte $$248728 .4byte 0x0000000D - .byte4 $$248729 + .4byte $$248729 .4byte 0x0000000D - .byte4 $$248730 + .4byte $$248730 .4byte 0x0000000D - .byte4 $$248731 + .4byte $$248731 .4byte 0x0000000D - .byte4 $$248732 + .4byte $$248732 .4byte 0x0000000D - .byte4 $$248733 + .4byte $$248733 .4byte 0x0000000D - .byte4 $$248734 + .4byte $$248734 .4byte 0x0000000D - .byte4 $$248735 + .4byte $$248735 .4byte 0x0000000D - .byte4 $$248736 + .4byte $$248736 .4byte 0x0000000D - .byte4 $$248737 + .4byte $$248737 .4byte 0x0000000D - .byte4 $$248738 + .4byte $$248738 .4byte 0x0000000D - .byte4 $$248739 + .4byte $$248739 .4byte 0x0000000D - .byte4 $$248740 + .4byte $$248740 .4byte 0x0000000D - .byte4 $$248741 + .4byte $$248741 .4byte 0x0000000D - .byte4 $$248742 + .4byte $$248742 .4byte 0x0000000D - .byte4 $$248743 + .4byte $$248743 .4byte 0x0000000D - .byte4 $$248744 + .4byte $$248744 .4byte 0x0000000D - .byte4 $$248745 + .4byte $$248745 .4byte 0x0000000D - .byte4 $$248746 + .4byte $$248746 .4byte 0x0000000D - .byte4 $$248747 + .4byte $$248747 .4byte 0x0000000D - .byte4 $$248748 + .4byte $$248748 .4byte 0x0000000D - .byte4 $$248749 + .4byte $$248749 .4byte 0x0000000D - .byte4 $$248750 + .4byte $$248750 .4byte 0x0000000D .4byte 0 .4byte 0 @@ -144,15 +144,15 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248751 + .4byte $$248751 .4byte 0x0000000D - .byte4 $$248752 + .4byte $$248752 .4byte 0x0000000D - .byte4 $$248753 + .4byte $$248753 .4byte 0x0000000D - .byte4 $$248754 + .4byte $$248754 .4byte 0x0000000D - .byte4 $$248755 + .4byte $$248755 .4byte 0x0000000D .4byte 0 .4byte 0 @@ -174,7 +174,7 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248751 + .4byte $$248751 .4byte 0x0000000D .4byte 0 .4byte 0 @@ -186,21 +186,21 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248756 + .4byte $$248756 .4byte 0x0000000D - .byte4 $$248757 + .4byte $$248757 .4byte 0x0000000D - .byte4 $$248758 + .4byte $$248758 .4byte 0x0000000D - .byte4 $$248759 + .4byte $$248759 .4byte 0x0000000D - .byte4 $$248760 + .4byte $$248760 .4byte 0x0000000D - .byte4 $$248761 + .4byte $$248761 .4byte 0x0000000D - .byte4 $$248752 + .4byte $$248752 .4byte 0x0000000D - .byte4 $$248762 + .4byte $$248762 .4byte 0x0000000D .4byte 0 .4byte 0 @@ -224,25 +224,25 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248763 + .4byte $$248763 .4byte 0x0000000D - .byte4 $$248764 + .4byte $$248764 .4byte 0x0000000D - .byte4 $$248763 + .4byte $$248763 .4byte 0x0000000D - .byte4 $$248764 + .4byte $$248764 .4byte 0x0000000D - .byte4 $$248765 + .4byte $$248765 .4byte 0x0000000D - .byte4 $$248766 + .4byte $$248766 .4byte 0x0000000D - .byte4 $$248767 + .4byte $$248767 .4byte 0x0000000D - .byte4 $$248768 + .4byte $$248768 .4byte 0x0000000D - .byte4 $$248769 + .4byte $$248769 .4byte 0x0000000D - .byte4 $$248770 + .4byte $$248770 .4byte 0x0000000D .4byte 0 .4byte 0 @@ -256,115 +256,115 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248771 + .4byte $$248771 .4byte 0x0000000D - .byte4 $$248772 + .4byte $$248772 .4byte 0x0000000D - .byte4 $$248773 + .4byte $$248773 .4byte 0x0000000D - .byte4 $$248774 + .4byte $$248774 .4byte 0x0000000D - .byte4 $$248775 + .4byte $$248775 .4byte 0x0000000D - .byte4 $$248776 + .4byte $$248776 .4byte 0x0000000D - .byte4 $$248777 + .4byte $$248777 .4byte 0x0000000D - .byte4 $$248778 + .4byte $$248778 .4byte 0x0000000D - .byte4 $$248779 + .4byte $$248779 .4byte 0x0000000D - .byte4 $$248780 + .4byte $$248780 .4byte 0x0000000D - .byte4 $$248781 + .4byte $$248781 .4byte 0x0000000D - .byte4 $$248782 + .4byte $$248782 .4byte 0x0000000D - .byte4 $$248783 + .4byte $$248783 .4byte 0x0000000D - .byte4 $$248784 + .4byte $$248784 .4byte 0x0000000D .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000D - .byte4 $$248732 + .4byte $$248732 .4byte 0x0000000D - .byte4 $$248785 + .4byte $$248785 .4byte 0x0000000D .4byte 0 .4byte 0 - .byte4 $$248786 + .4byte $$248786 .4byte 0x0000000D .4byte 0 .4byte 0 - .byte4 $$248787 + .4byte $$248787 .4byte 0x0000000D - .byte4 $$248788 + .4byte $$248788 .4byte 0x0000000D .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248789 + .4byte $$248789 .4byte 0x0000000D - .byte4 $$248790 + .4byte $$248790 .4byte 0x0000000D - .byte4 $$248791 + .4byte $$248791 .4byte 0x0000000D - .byte4 $$248735 + .4byte $$248735 .4byte 0x0000000D - .byte4 $$248792 + .4byte $$248792 .4byte 0x0000000D - .byte4 $$248793 + .4byte $$248793 .4byte 0x0000000D - .byte4 $$248794 + .4byte $$248794 .4byte 0x0000000D - .byte4 $$248795 + .4byte $$248795 .4byte 0x0000000D - .byte4 $$248796 + .4byte $$248796 .4byte 0x0000000D - .byte4 $$248797 + .4byte $$248797 .4byte 0x0000000D - .byte4 $$248798 + .4byte $$248798 .4byte 0x0000000D - .byte4 $$248799 + .4byte $$248799 .4byte 0x0000000D - .byte4 $$248800 + .4byte $$248800 .4byte 0x0000000D - .byte4 $$248801 + .4byte $$248801 .4byte 0x0000000D - .byte4 $$248802 + .4byte $$248802 .4byte 0x0000000D - .byte4 $$248803 + .4byte $$248803 .4byte 0x0000000D - .byte4 $$248804 + .4byte $$248804 .4byte 0x0000000D - .byte4 $$248805 + .4byte $$248805 .4byte 0x0000000D - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000D - .byte4 $$248806 + .4byte $$248806 .4byte 0x0000000D - .byte4 $$248807 + .4byte $$248807 .4byte 0x0000000D - .byte4 $$248808 + .4byte $$248808 .4byte 0x0000000D - .byte4 $$248809 + .4byte $$248809 .4byte 0x0000000D - .byte4 $$248810 + .4byte $$248810 .4byte 0x0000000D - .byte4 $$248811 + .4byte $$248811 .4byte 0x0000000D - .byte4 $$248812 + .4byte $$248812 .4byte 0x0000000D - .byte4 $$248813 + .4byte $$248813 .4byte 0x0000000D - .byte4 $$248814 + .4byte $$248814 .4byte 0x0000000D - .byte4 $$248815 + .4byte $$248815 .4byte 0x0000000D .4byte 0 .4byte 0 @@ -804,59 +804,59 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248816 + .4byte $$248816 .4byte 0x0000000D - .byte4 $$248817 + .4byte $$248817 .4byte 0x0000000D - .byte4 $$248818 + .4byte $$248818 .4byte 0x0000000D - .byte4 $$248819 + .4byte $$248819 .4byte 0x0000000D - .byte4 $$248820 + .4byte $$248820 .4byte 0x0000000D - .byte4 $$248821 + .4byte $$248821 .4byte 0x0000000D - .byte4 $$248822 + .4byte $$248822 .4byte 0x0000000D - .byte4 $$248823 + .4byte $$248823 .4byte 0x0000000D - .byte4 $$248824 + .4byte $$248824 .4byte 0x0000000D - .byte4 $$248825 + .4byte $$248825 .4byte 0x0000000D - .byte4 $$248826 + .4byte $$248826 .4byte 0x0000000D - .byte4 $$248827 + .4byte $$248827 .4byte 0x0000000D - .byte4 $$248828 + .4byte $$248828 .4byte 0x0000000D - .byte4 $$248829 + .4byte $$248829 .4byte 0x0000000D - .byte4 $$248830 + .4byte $$248830 .4byte 0x0000000D - .byte4 $$248831 + .4byte $$248831 .4byte 0x0000000D - .byte4 $$248832 + .4byte $$248832 .4byte 0x0000000D - .byte4 $$248833 + .4byte $$248833 .4byte 0x0000000D - .byte4 $$248834 + .4byte $$248834 .4byte 0x0000000D - .byte4 $$248835 + .4byte $$248835 .4byte 0x0000000D - .byte4 $$248836 + .4byte $$248836 .4byte 0x0000000D - .byte4 $$248837 + .4byte $$248837 .4byte 0x0000000D - .byte4 $$248838 + .4byte $$248838 .4byte 0x0000000D - .byte4 $$248839 + .4byte $$248839 .4byte 0x0000000D - .byte4 $$248840 + .4byte $$248840 .4byte 0x0000000D - .byte4 $$248841 + .4byte $$248841 .4byte 0x0000000D - .byte4 $$248842 + .4byte $$248842 .4byte 0x0000000D .4byte 0 .4byte 0 @@ -938,39 +938,39 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248843 + .4byte $$248843 .4byte 0x0000000D - .byte4 $$248844 + .4byte $$248844 .4byte 0x0000000D - .byte4 $$248845 + .4byte $$248845 .4byte 0x0000000D - .byte4 $$248846 + .4byte $$248846 .4byte 0x0000000D - .byte4 $$248847 + .4byte $$248847 .4byte 0x0000000D - .byte4 $$248848 + .4byte $$248848 .4byte 0x0000000D - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000D - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000D - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000D - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000D - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000D - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000D - .byte4 $$248849 + .4byte $$248849 .4byte 0x0000000D - .byte4 $$248850 + .4byte $$248850 .4byte 0x0000000D - .byte4 $$248851 + .4byte $$248851 .4byte 0x0000000D - .byte4 $$248852 + .4byte $$248852 .4byte 0x0000000D - .byte4 $$248853 + .4byte $$248853 .4byte 0x0000000D .4byte 0 .4byte 0 @@ -1347,36 +1347,36 @@ $$248881: .asciz "HammerheadJ" .global $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc6DededeFv$$2NAMES$$20 $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc6DededeFv$$2NAMES$$20: - .byte4 $$248864 - .byte4 $$248865 - .byte4 $$248866 - .byte4 $$248867 - .byte4 $$248868 - .byte4 $$248869 - .byte4 $$248867 - .byte4 $$248867 - .byte4 $$248870 - .byte4 $$248871 - .byte4 $$248872 - .byte4 $$248865 - .byte4 $$248873 - .byte4 $$248874 - .byte4 $$248866 - .byte4 $$248875 - .byte4 $$248865 - .byte4 $$248876 - .byte4 $$248877 - .byte4 $$248878 - .byte4 $$248879 - .byte4 $$248880 - .byte4 $$248881 - .byte4 $$248864 - .byte4 $$248882 - .byte4 $$248882 - .byte4 $$248882 - .byte4 $$248882 - .byte4 $$248882 - .byte4 $$248882 + .4byte $$248864 + .4byte $$248865 + .4byte $$248866 + .4byte $$248867 + .4byte $$248868 + .4byte $$248869 + .4byte $$248867 + .4byte $$248867 + .4byte $$248870 + .4byte $$248871 + .4byte $$248872 + .4byte $$248865 + .4byte $$248873 + .4byte $$248874 + .4byte $$248866 + .4byte $$248875 + .4byte $$248865 + .4byte $$248876 + .4byte $$248877 + .4byte $$248878 + .4byte $$248879 + .4byte $$248880 + .4byte $$248881 + .4byte $$248864 + .4byte $$248882 + .4byte $$248882 + .4byte $$248882 + .4byte $$248882 + .4byte $$248882 + .4byte $$248882 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248727 diff --git a/asm/src/Dee.s b/asm/src/Dee.s index 80599aac..2d5fa9a1 100644 --- a/asm/src/Dee.s +++ b/asm/src/Dee.s @@ -304,41 +304,41 @@ lbl_8035C0B8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2ENTRIES$$20 $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2ENTRIES$$20: - .byte4 $$249527 + .4byte $$249527 .4byte 0x0000000E - .byte4 $$249528 + .4byte $$249528 .4byte 0x0000000E - .byte4 $$249529 + .4byte $$249529 .4byte 0x0000000E - .byte4 $$249530 + .4byte $$249530 .4byte 0x0000000E - .byte4 $$249531 + .4byte $$249531 .4byte 0x0000000E - .byte4 $$249532 + .4byte $$249532 .4byte 0x0000000E - .byte4 $$249533 + .4byte $$249533 .4byte 0x0000000E - .byte4 $$249534 + .4byte $$249534 .4byte 0x0000000E - .byte4 $$249535 + .4byte $$249535 .4byte 0x0000000E - .byte4 $$249536 + .4byte $$249536 .4byte 0x0000000E - .byte4 $$249537 + .4byte $$249537 .4byte 0x0000000E - .byte4 $$249538 + .4byte $$249538 .4byte 0x0000000E - .byte4 $$249539 + .4byte $$249539 .4byte 0x0000000E - .byte4 $$249540 + .4byte $$249540 .4byte 0x0000000E - .byte4 $$249541 + .4byte $$249541 .4byte 0x0000000E - .byte4 $$249542 + .4byte $$249542 .4byte 0x0000000E - .byte4 $$249543 + .4byte $$249543 .4byte 0x0000000E - .byte4 $$249544 + .4byte $$249544 .4byte 0x0000000E .4byte 0 .4byte 0 @@ -364,15 +364,15 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249545 + .4byte $$249545 .4byte 0x0000000E - .byte4 $$249546 + .4byte $$249546 .4byte 0x0000000E - .byte4 $$249547 + .4byte $$249547 .4byte 0x0000000E - .byte4 $$249548 + .4byte $$249548 .4byte 0x0000000E - .byte4 $$249549 + .4byte $$249549 .4byte 0x0000000E .4byte 0 .4byte 0 @@ -406,21 +406,21 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249550 + .4byte $$249550 .4byte 0x0000000E - .byte4 $$249551 + .4byte $$249551 .4byte 0x0000000E - .byte4 $$249552 + .4byte $$249552 .4byte 0x0000000E - .byte4 $$249553 + .4byte $$249553 .4byte 0x0000000E - .byte4 $$249554 + .4byte $$249554 .4byte 0x0000000E - .byte4 $$249555 + .4byte $$249555 .4byte 0x0000000E - .byte4 $$249556 + .4byte $$249556 .4byte 0x0000000E - .byte4 $$249557 + .4byte $$249557 .4byte 0x0000000E .4byte 0 .4byte 0 @@ -444,25 +444,25 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249558 + .4byte $$249558 .4byte 0x0000000E - .byte4 $$249559 + .4byte $$249559 .4byte 0x0000000E - .byte4 $$249560 + .4byte $$249560 .4byte 0x0000000E - .byte4 $$249561 + .4byte $$249561 .4byte 0x0000000E - .byte4 $$249562 + .4byte $$249562 .4byte 0x0000000E - .byte4 $$249563 + .4byte $$249563 .4byte 0x0000000E - .byte4 $$249564 + .4byte $$249564 .4byte 0x0000000E - .byte4 $$249565 + .4byte $$249565 .4byte 0x0000000E - .byte4 $$249566 + .4byte $$249566 .4byte 0x0000000E - .byte4 $$249567 + .4byte $$249567 .4byte 0x0000000E .4byte 0 .4byte 0 @@ -476,115 +476,115 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249568 + .4byte $$249568 .4byte 0x0000000E - .byte4 $$249569 + .4byte $$249569 .4byte 0x0000000E - .byte4 $$249570 + .4byte $$249570 .4byte 0x0000000E - .byte4 $$249571 + .4byte $$249571 .4byte 0x0000000E - .byte4 $$249572 + .4byte $$249572 .4byte 0x0000000E - .byte4 $$249573 + .4byte $$249573 .4byte 0x0000000E - .byte4 $$249574 + .4byte $$249574 .4byte 0x0000000E - .byte4 $$249575 + .4byte $$249575 .4byte 0x0000000E - .byte4 $$249576 + .4byte $$249576 .4byte 0x0000000E - .byte4 $$249577 + .4byte $$249577 .4byte 0x0000000E - .byte4 $$249578 + .4byte $$249578 .4byte 0x0000000E - .byte4 $$249579 + .4byte $$249579 .4byte 0x0000000E - .byte4 $$249580 + .4byte $$249580 .4byte 0x0000000E - .byte4 $$249581 + .4byte $$249581 .4byte 0x0000000E .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249527 + .4byte $$249527 .4byte 0x0000000E - .byte4 $$249532 + .4byte $$249532 .4byte 0x0000000E - .byte4 $$249582 + .4byte $$249582 .4byte 0x0000000E .4byte 0 .4byte 0 - .byte4 $$249583 + .4byte $$249583 .4byte 0x0000000E .4byte 0 .4byte 0 - .byte4 $$249584 + .4byte $$249584 .4byte 0x0000000E - .byte4 $$249585 + .4byte $$249585 .4byte 0x0000000E .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249586 + .4byte $$249586 .4byte 0x0000000E - .byte4 $$249587 + .4byte $$249587 .4byte 0x0000000E - .byte4 $$249588 + .4byte $$249588 .4byte 0x0000000E - .byte4 $$249535 + .4byte $$249535 .4byte 0x0000000E - .byte4 $$249589 + .4byte $$249589 .4byte 0x0000000E - .byte4 $$249590 + .4byte $$249590 .4byte 0x0000000E - .byte4 $$249591 + .4byte $$249591 .4byte 0x0000000E - .byte4 $$249592 + .4byte $$249592 .4byte 0x0000000E - .byte4 $$249593 + .4byte $$249593 .4byte 0x0000000E - .byte4 $$249594 + .4byte $$249594 .4byte 0x0000000E - .byte4 $$249595 + .4byte $$249595 .4byte 0x0000000E - .byte4 $$249596 + .4byte $$249596 .4byte 0x0000000E - .byte4 $$249596 + .4byte $$249596 .4byte 0x0000000E - .byte4 $$249596 + .4byte $$249596 .4byte 0x0000000E - .byte4 $$249597 + .4byte $$249597 .4byte 0x0000000E - .byte4 $$249598 + .4byte $$249598 .4byte 0x0000000E - .byte4 $$249599 + .4byte $$249599 .4byte 0x0000000E .4byte 0 .4byte 0 - .byte4 $$249527 + .4byte $$249527 .4byte 0x0000000E - .byte4 $$249600 + .4byte $$249600 .4byte 0x0000000E - .byte4 $$249547 + .4byte $$249547 .4byte 0x0000000E - .byte4 $$249527 + .4byte $$249527 .4byte 0x0000000E - .byte4 $$249601 + .4byte $$249601 .4byte 0x0000000E - .byte4 $$249602 + .4byte $$249602 .4byte 0x0000000E - .byte4 $$249603 + .4byte $$249603 .4byte 0x0000000E - .byte4 $$249604 + .4byte $$249604 .4byte 0x0000000E - .byte4 $$249605 + .4byte $$249605 .4byte 0x0000000E - .byte4 $$249606 + .4byte $$249606 .4byte 0x0000000E - .byte4 $$249607 + .4byte $$249607 .4byte 0x0000000E .4byte 0 .4byte 0 @@ -1078,119 +1078,119 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249608 + .4byte $$249608 .4byte 0x0000000E - .byte4 $$249609 + .4byte $$249609 .4byte 0x0000000E - .byte4 $$249610 + .4byte $$249610 .4byte 0x0000000E - .byte4 $$249611 + .4byte $$249611 .4byte 0x0000000E - .byte4 $$249612 + .4byte $$249612 .4byte 0x0000000E - .byte4 $$249613 + .4byte $$249613 .4byte 0x0000000E - .byte4 $$249614 + .4byte $$249614 .4byte 0x0000000E - .byte4 $$249615 + .4byte $$249615 .4byte 0x0000000E - .byte4 $$249616 + .4byte $$249616 .4byte 0x0000000E - .byte4 $$249617 + .4byte $$249617 .4byte 0x0000000E - .byte4 $$249618 + .4byte $$249618 .4byte 0x0000000E - .byte4 $$249619 + .4byte $$249619 .4byte 0x0000000E - .byte4 $$249620 + .4byte $$249620 .4byte 0x0000000E - .byte4 $$249621 + .4byte $$249621 .4byte 0x0000000E - .byte4 $$249622 + .4byte $$249622 .4byte 0x0000000E - .byte4 $$249623 + .4byte $$249623 .4byte 0x0000000E - .byte4 $$249624 + .4byte $$249624 .4byte 0x0000000E - .byte4 $$249625 + .4byte $$249625 .4byte 0x0000000E - .byte4 $$249626 + .4byte $$249626 .4byte 0x0000000E - .byte4 $$249627 + .4byte $$249627 .4byte 0x0000000E - .byte4 $$249628 + .4byte $$249628 .4byte 0x0000000E - .byte4 $$249629 + .4byte $$249629 .4byte 0x0000000E - .byte4 $$249630 + .4byte $$249630 .4byte 0x0000000E - .byte4 $$249631 + .4byte $$249631 .4byte 0x0000000E - .byte4 $$249632 + .4byte $$249632 .4byte 0x0000000E - .byte4 $$249633 + .4byte $$249633 .4byte 0x0000000E - .byte4 $$249634 + .4byte $$249634 .4byte 0x0000000E - .byte4 $$249635 + .4byte $$249635 .4byte 0x0000000E - .byte4 $$249636 + .4byte $$249636 .4byte 0x0000000E - .byte4 $$249637 + .4byte $$249637 .4byte 0x0000000E - .byte4 $$249638 + .4byte $$249638 .4byte 0x0000000E - .byte4 $$249639 + .4byte $$249639 .4byte 0x0000000E - .byte4 $$249640 + .4byte $$249640 .4byte 0x0000000E - .byte4 $$249641 + .4byte $$249641 .4byte 0x0000000E - .byte4 $$249642 + .4byte $$249642 .4byte 0x0000000E - .byte4 $$249643 + .4byte $$249643 .4byte 0x0000000E - .byte4 $$249644 + .4byte $$249644 .4byte 0x0000000E - .byte4 $$249645 + .4byte $$249645 .4byte 0x0000000E - .byte4 $$249646 + .4byte $$249646 .4byte 0x0000000E - .byte4 $$249647 + .4byte $$249647 .4byte 0x0000000E - .byte4 $$249648 + .4byte $$249648 .4byte 0x0000000E - .byte4 $$249649 + .4byte $$249649 .4byte 0x0000000E - .byte4 $$249650 + .4byte $$249650 .4byte 0x0000000E - .byte4 $$249651 + .4byte $$249651 .4byte 0x0000000E - .byte4 $$249652 + .4byte $$249652 .4byte 0x0000000E - .byte4 $$249653 + .4byte $$249653 .4byte 0x0000000E - .byte4 $$249527 + .4byte $$249527 .4byte 0x0000000E - .byte4 $$249527 + .4byte $$249527 .4byte 0x0000000E - .byte4 $$249527 + .4byte $$249527 .4byte 0x0000000E - .byte4 $$249527 + .4byte $$249527 .4byte 0x0000000E - .byte4 $$249527 + .4byte $$249527 .4byte 0x0000000E - .byte4 $$249527 + .4byte $$249527 .4byte 0x0000000E - .byte4 $$249654 + .4byte $$249654 .4byte 0x0000000E - .byte4 $$249655 + .4byte $$249655 .4byte 0x0000000E - .byte4 $$249656 + .4byte $$249656 .4byte 0x0000000E - .byte4 $$249657 + .4byte $$249657 .4byte 0x0000000E - .byte4 $$249658 + .4byte $$249658 .4byte 0x0000000E .4byte 0 .4byte 0 @@ -1582,36 +1582,36 @@ $$249677: .4byte 0 .global $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc3DeeFv$$2NAMES$$20 $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc3DeeFv$$2NAMES$$20: - .byte4 $$249669 - .byte4 $$249670 - .byte4 $$249671 - .byte4 $$249672 - .byte4 $$249673 - .byte4 $$249674 - .byte4 $$249675 - .byte4 $$249675 - .byte4 $$249676 - .byte4 $$249677 - .byte4 $$249675 - .byte4 $$249670 - .byte4 $$249678 - .byte4 $$249679 - .byte4 $$249680 - .byte4 $$249675 - .byte4 $$249675 - .byte4 $$249681 - .byte4 $$249682 - .byte4 $$249673 - .byte4 $$249683 - .byte4 $$249669 - .byte4 $$249669 - .byte4 $$249684 - .byte4 $$249685 - .byte4 $$249685 - .byte4 $$249685 - .byte4 $$249685 - .byte4 $$249685 - .byte4 $$249685 + .4byte $$249669 + .4byte $$249670 + .4byte $$249671 + .4byte $$249672 + .4byte $$249673 + .4byte $$249674 + .4byte $$249675 + .4byte $$249675 + .4byte $$249676 + .4byte $$249677 + .4byte $$249675 + .4byte $$249670 + .4byte $$249678 + .4byte $$249679 + .4byte $$249680 + .4byte $$249675 + .4byte $$249675 + .4byte $$249681 + .4byte $$249682 + .4byte $$249673 + .4byte $$249683 + .4byte $$249669 + .4byte $$249669 + .4byte $$249684 + .4byte $$249685 + .4byte $$249685 + .4byte $$249685 + .4byte $$249685 + .4byte $$249685 + .4byte $$249685 .global $$250026 $$250026: .asciz "Ribbon1DJ" diff --git a/asm/src/Delete.s b/asm/src/Delete.s index 9450b284..3aa46a8f 100644 --- a/asm/src/Delete.s +++ b/asm/src/Delete.s @@ -139,15 +139,15 @@ $$252004: __vt__Q33scn19challengefileselect6Delete: .4byte 0 .4byte 0 - .byte4 __dt__Q33scn19challengefileselect6DeleteFv - .byte4 updateFrame__Q33scn19challengefileselect6DeleteFv - .byte4 appear__Q33scn19challengefileselect6DeleteFv - .byte4 focus__Q33scn19challengefileselect6DeleteFv - .byte4 unfocus__Q33scn19challengefileselect6DeleteFv - .byte4 decide__Q33scn19challengefileselect6DeleteFv - .byte4 isAnimEnd__Q33scn19challengefileselect6DeleteCFv - .byte4 kind__Q33scn19challengefileselect6DeleteCFv - .byte4 cursorPane__Q33scn19challengefileselect6DeleteFv + .4byte __dt__Q33scn19challengefileselect6DeleteFv + .4byte updateFrame__Q33scn19challengefileselect6DeleteFv + .4byte appear__Q33scn19challengefileselect6DeleteFv + .4byte focus__Q33scn19challengefileselect6DeleteFv + .4byte unfocus__Q33scn19challengefileselect6DeleteFv + .4byte decide__Q33scn19challengefileselect6DeleteFv + .4byte isAnimEnd__Q33scn19challengefileselect6DeleteCFv + .4byte kind__Q33scn19challengefileselect6DeleteCFv + .4byte cursorPane__Q33scn19challengefileselect6DeleteFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251964 diff --git a/asm/src/Demo.s b/asm/src/Demo.s index cd8a0093..8829cc19 100644 --- a/asm/src/Demo.s +++ b/asm/src/Demo.s @@ -132,14 +132,14 @@ unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv: __vt__Q53scn4step7gimmick11areamapdemo4Demo: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick11areamapdemo4DemoFv - .byte4 registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root - .byte4 procAnim__Q53scn4step7gimmick11areamapdemo4DemoFv + .4byte __dt__Q53scn4step7gimmick11areamapdemo4DemoFv + .4byte registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root + .4byte procAnim__Q53scn4step7gimmick11areamapdemo4DemoFv .4byte 0 .4byte 0 - .byte4 startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo4DemoFv - .byte4 isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo4DemoCFv - .byte4 unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv + .4byte startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo4DemoFv + .4byte isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo4DemoCFv + .4byte unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252595 diff --git a/asm/src/DemoAllStageClear.s b/asm/src/DemoAllStageClear.s index 2b8301b0..9667a410 100644 --- a/asm/src/DemoAllStageClear.s +++ b/asm/src/DemoAllStageClear.s @@ -272,14 +272,14 @@ $$257907: __vt__Q53scn4step7gimmick11areamapdemo17DemoAllStageClear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick11areamapdemo17DemoAllStageClearFv - .byte4 registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root - .byte4 procAnim__Q53scn4step7gimmick11areamapdemo4DemoFv - .byte4 start__Q53scn4step7gimmick11areamapdemo17DemoAllStageClearFv - .byte4 end__Q53scn4step7gimmick11areamapdemo17DemoAllStageClearFv - .byte4 startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo4DemoFv - .byte4 isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo4DemoCFv - .byte4 unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv + .4byte __dt__Q53scn4step7gimmick11areamapdemo17DemoAllStageClearFv + .4byte registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root + .4byte procAnim__Q53scn4step7gimmick11areamapdemo4DemoFv + .4byte start__Q53scn4step7gimmick11areamapdemo17DemoAllStageClearFv + .4byte end__Q53scn4step7gimmick11areamapdemo17DemoAllStageClearFv + .4byte startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo4DemoFv + .4byte isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo4DemoCFv + .4byte unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257905 diff --git a/asm/src/DemoAppearWarpStar.s b/asm/src/DemoAppearWarpStar.s index a1442d2f..a28c14c9 100644 --- a/asm/src/DemoAppearWarpStar.s +++ b/asm/src/DemoAppearWarpStar.s @@ -288,14 +288,14 @@ $$256147: __vt__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStar: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFv - .byte4 registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root - .byte4 procAnim__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFv - .byte4 start__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFv - .byte4 end__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFv - .byte4 startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFv - .byte4 isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarCFv - .byte4 unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv + .4byte __dt__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFv + .4byte registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root + .4byte procAnim__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFv + .4byte start__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFv + .4byte end__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFv + .4byte startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFv + .4byte isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarCFv + .4byte unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256125 diff --git a/asm/src/DemoChangeGrade.s b/asm/src/DemoChangeGrade.s index d82b7e16..f9444764 100644 --- a/asm/src/DemoChangeGrade.s +++ b/asm/src/DemoChangeGrade.s @@ -699,12 +699,12 @@ $$257298: .4byte 0 .global t_TrophyResFileName__29$$2unnamed$$2DemoChangeGrade_cpp$$2 t_TrophyResFileName__29$$2unnamed$$2DemoChangeGrade_cpp$$2: - .byte4 $$257293 - .byte4 $$257294 - .byte4 $$257295 - .byte4 $$257296 - .byte4 $$257297 - .byte4 $$257298 + .4byte $$257293 + .4byte $$257294 + .4byte $$257295 + .4byte $$257296 + .4byte $$257297 + .4byte $$257298 .global $$258717 $$258717: .asciz "challengefileselect/Trophyanime" @@ -720,14 +720,14 @@ $$258879: __vt__Q53scn4step7gimmick11areamapdemo15DemoChangeGrade: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFv - .byte4 registerToRoot__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFRQ23g3d4Root - .byte4 procAnim__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFv - .byte4 start__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFv - .byte4 end__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFv - .byte4 startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo4DemoFv - .byte4 isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo4DemoCFv - .byte4 unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv + .4byte __dt__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFv + .4byte registerToRoot__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFRQ23g3d4Root + .4byte procAnim__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFv + .4byte start__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFv + .4byte end__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFv + .4byte startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo4DemoFv + .4byte isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo4DemoCFv + .4byte unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257293 diff --git a/asm/src/DemoFirstLvIn.s b/asm/src/DemoFirstLvIn.s index ca2bba94..e08d9806 100644 --- a/asm/src/DemoFirstLvIn.s +++ b/asm/src/DemoFirstLvIn.s @@ -337,14 +337,14 @@ $$255389: __vt__Q53scn4step7gimmick11areamapdemo13DemoFirstLvIn: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv - .byte4 registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root - .byte4 procAnim__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv - .byte4 start__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv - .byte4 end__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv - .byte4 startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv - .byte4 isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInCFv - .byte4 unsetZoomAll__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv + .4byte __dt__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv + .4byte registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root + .4byte procAnim__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv + .4byte start__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv + .4byte end__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv + .4byte startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv + .4byte isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInCFv + .4byte unsetZoomAll__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255356 diff --git a/asm/src/DemoFirstPlay.s b/asm/src/DemoFirstPlay.s index e972714f..2d56e5c3 100644 --- a/asm/src/DemoFirstPlay.s +++ b/asm/src/DemoFirstPlay.s @@ -328,14 +328,14 @@ $$255320: __vt__Q53scn4step7gimmick11areamapdemo13DemoFirstPlay: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayFv - .byte4 registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root - .byte4 procAnim__Q53scn4step7gimmick11areamapdemo4DemoFv - .byte4 start__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayFv - .byte4 end__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayFv - .byte4 startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayFv - .byte4 isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayCFv - .byte4 unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv + .4byte __dt__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayFv + .4byte registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root + .4byte procAnim__Q53scn4step7gimmick11areamapdemo4DemoFv + .4byte start__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayFv + .4byte end__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayFv + .4byte startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayFv + .4byte isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayCFv + .4byte unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255319 diff --git a/asm/src/DemoUnlockMaster.s b/asm/src/DemoUnlockMaster.s index 972e35cc..fd0743a6 100644 --- a/asm/src/DemoUnlockMaster.s +++ b/asm/src/DemoUnlockMaster.s @@ -313,14 +313,14 @@ $$255141: __vt__Q53scn4step7gimmick11areamapdemo16DemoUnlockMaster: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFv - .byte4 registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root - .byte4 procAnim__Q53scn4step7gimmick11areamapdemo4DemoFv - .byte4 start__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFv - .byte4 end__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFv - .byte4 startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFv - .byte4 isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterCFv - .byte4 unsetZoomAll__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFv + .4byte __dt__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFv + .4byte registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root + .4byte procAnim__Q53scn4step7gimmick11areamapdemo4DemoFv + .4byte start__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFv + .4byte end__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFv + .4byte startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFv + .4byte isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterCFv + .4byte unsetZoomAll__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255199 diff --git a/asm/src/DemoUnlockMasterEx.s b/asm/src/DemoUnlockMasterEx.s index 3280c878..460e0c02 100644 --- a/asm/src/DemoUnlockMasterEx.s +++ b/asm/src/DemoUnlockMasterEx.s @@ -142,14 +142,14 @@ $$254711: __vt__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterEx: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExFv - .byte4 registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root - .byte4 procAnim__Q53scn4step7gimmick11areamapdemo4DemoFv - .byte4 start__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExFv - .byte4 end__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExFv - .byte4 startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExFv - .byte4 isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExCFv - .byte4 unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv + .4byte __dt__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExFv + .4byte registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root + .4byte procAnim__Q53scn4step7gimmick11areamapdemo4DemoFv + .4byte start__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExFv + .4byte end__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExFv + .4byte startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExFv + .4byte isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExCFv + .4byte unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254729 diff --git a/asm/src/Detail.s b/asm/src/Detail.s index 5a168a3e..1d1fb709 100644 --- a/asm/src/Detail.s +++ b/asm/src/Detail.s @@ -3610,9 +3610,9 @@ canRemove__Q43scn7history6detail6DetailFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$252852 $$252852: - .byte4 $$252849 - .byte4 $$252850 - .byte4 $$252851 + .4byte $$252849 + .4byte $$252850 + .4byte $$252851 .global $$252854 $$252854: .4byte 0x00000008 @@ -3870,10 +3870,10 @@ $$259188: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252847 $$252847: - .byte4 $$252845 + .4byte $$252845 .global lbl_80560174 lbl_80560174: - .byte4 $$252846 + .4byte $$252846 .global $$252906 $$252906: .4byte 0xFFFFFFFF diff --git a/asm/src/Direction3.s b/asm/src/Direction3.s index 795239f6..3563d684 100644 --- a/asm/src/Direction3.s +++ b/asm/src/Direction3.s @@ -443,7 +443,7 @@ __sinit_$$3Direction3_cpp: /* 8019E58C 0019A3CC 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3Direction3_cpp + .4byte __sinit_$$3Direction3_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255184 diff --git a/asm/src/DisableIcon.s b/asm/src/DisableIcon.s index e047582b..ce07ef27 100644 --- a/asm/src/DisableIcon.s +++ b/asm/src/DisableIcon.s @@ -170,7 +170,7 @@ __sinit_$$3DisableIcon_cpp: /* 8019C38C 001981CC 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3DisableIcon_cpp + .4byte __sinit_$$3DisableIcon_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250030 diff --git a/asm/src/DvdControl.s b/asm/src/DvdControl.s index bf0dbd1b..a4574ee9 100644 --- a/asm/src/DvdControl.s +++ b/asm/src/DvdControl.s @@ -491,7 +491,7 @@ __sinit_$$3DvdControl_cpp: /* 801CE5C0 001CA400 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3DvdControl_cpp + .4byte __sinit_$$3DvdControl_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249342 @@ -504,13 +504,13 @@ $$249343: .balign 4 .global dvdControlBlock dvdControlBlock: - .byte4 Open__FPvPCv - .byte4 GetStatus__FPvPv - .byte4 Close__FPvPv - .byte4 GetSize__FPvPv - .byte4 Tell__FPvPv - .byte4 Seek__FPvPvUl - .byte4 Read__FPvPvPUcUl + .4byte Open__FPvPCv + .4byte GetStatus__FPvPv + .4byte Close__FPvPv + .4byte GetSize__FPvPv + .4byte Tell__FPvPv + .4byte Seek__FPvPvUl + .4byte Read__FPvPvPUcUl .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/DvdWatch_ENG.s b/asm/src/DvdWatch_ENG.s index 5899ce6a..6e72d4e0 100644 --- a/asm/src/DvdWatch_ENG.s +++ b/asm/src/DvdWatch_ENG.s @@ -3,11 +3,11 @@ .section .rodata, "wa" # 0x80406560 - 0x80421040 .global ERROR_MSG_ENG__Q23app8DvdWatch ERROR_MSG_ENG__Q23app8DvdWatch: - .byte4 $$248836 - .byte4 $$248837 - .byte4 $$248837 - .byte4 $$248838 - .byte4 $$248839 + .4byte $$248836 + .4byte $$248837 + .4byte $$248837 + .4byte $$248838 + .4byte $$248839 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/src/EasyRender3D.s b/asm/src/EasyRender3D.s index a8c05eaf..9c2dba83 100644 --- a/asm/src/EasyRender3D.s +++ b/asm/src/EasyRender3D.s @@ -596,7 +596,7 @@ __sinit_$$3EasyRender3D_cpp: /* 80195850 00191690 4B FF F7 D4 */ b __ct__Q33hel4math8Matrix34Fv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3EasyRender3D_cpp + .4byte __sinit_$$3EasyRender3D_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251446 diff --git a/asm/src/EffectLocatorModelDesc.s b/asm/src/EffectLocatorModelDesc.s index a3a94e3e..7765fe72 100644 --- a/asm/src/EffectLocatorModelDesc.s +++ b/asm/src/EffectLocatorModelDesc.s @@ -64,7 +64,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q43scn4step6weapon36$$2unnamed$$2EffectLocatorModelDesc_cpp$$2 T_NODE_NAMES__Q43scn4step6weapon36$$2unnamed$$2EffectLocatorModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/Enemy.s b/asm/src/Enemy.s index 91e0a35c..efc5f8fe 100644 --- a/asm/src/Enemy.s +++ b/asm/src/Enemy.s @@ -4201,25 +4201,25 @@ __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common21St __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common21StateMasterSummonWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common21StateMasterSummonWait$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common21StateMasterSummonWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common21StateMasterSummonWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common21StateMasterSummonWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common22StateRoomGuarderAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common22StateRoomGuarderAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common22StateRoomGuarderAppear$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common22StateRoomGuarderAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common22StateRoomGuarderAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common22StateRoomGuarderAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util42StateChanger$$0Q43scn4step5enemy6IState$$4256$$1 __vt__Q24util42StateChanger$$0Q43scn4step5enemy6IState$$4256$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util42StateChanger$$0Q43scn4step5enemy6IState$$4256$$1Fv + .4byte __dt__Q24util42StateChanger$$0Q43scn4step5enemy6IState$$4256$$1Fv .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: .asciz "NW4R:Pointer must not be NULL (p)" diff --git a/asm/src/EnemyCtrl.s b/asm/src/EnemyCtrl.s index aacb751f..d00db4b7 100644 --- a/asm/src/EnemyCtrl.s +++ b/asm/src/EnemyCtrl.s @@ -890,26 +890,26 @@ T_OBVERSE_TABLE__Q53scn4step4boss6whispy23$$2unnamed$$2EnemyCtrl_cpp$$2: __vt__Q24util133StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter13StateStraight$$4PQ43scn4step5enemy5Enemy$$4Q43scn4step4boss8Accessor$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util133StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter13StateStraight$$4PQ43scn4step5enemy5Enemy$$4Q43scn4step4boss8Accessor$$1Fv - .byte4 create__Q24util133StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter13StateStraight$$4PQ43scn4step5enemy5Enemy$$4Q43scn4step4boss8Accessor$$1Fv + .4byte __dt__Q24util133StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter13StateStraight$$4PQ43scn4step5enemy5Enemy$$4Q43scn4step4boss8Accessor$$1Fv + .4byte create__Q24util133StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter13StateStraight$$4PQ43scn4step5enemy5Enemy$$4Q43scn4step4boss8Accessor$$1Fv .global __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter11StateCircle$$4PQ43scn4step5enemy5Enemy$$4b$$1 __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter11StateCircle$$4PQ43scn4step5enemy5Enemy$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter11StateCircle$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv - .byte4 create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter11StateCircle$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv + .4byte __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter11StateCircle$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv + .4byte create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter11StateCircle$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter15StateBackCircle$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter15StateBackCircle$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter15StateBackCircle$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter15StateBackCircle$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter15StateBackCircle$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter15StateBackCircle$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter10StateSlant$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter10StateSlant$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter10StateSlant$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter10StateSlant$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter10StateSlant$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter10StateSlant$$4PQ43scn4step5enemy5Enemy$$1Fv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252522 diff --git a/asm/src/EnemySummonCtrl.s b/asm/src/EnemySummonCtrl.s index 61a2921e..121563af 100644 --- a/asm/src/EnemySummonCtrl.s +++ b/asm/src/EnemySummonCtrl.s @@ -832,8 +832,8 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17St __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateMasterSummon$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateMasterSummon$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateMasterSummon$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateMasterSummon$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateMasterSummon$$4PQ43scn4step5enemy5Enemy$$1Fv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259024 diff --git a/asm/src/Exception.s b/asm/src/Exception.s index 13877043..5b62ef8b 100644 --- a/asm/src/Exception.s +++ b/asm/src/Exception.s @@ -683,23 +683,23 @@ $$248860: .balign 4 .global CPU_EXP_NAME__23$$2unnamed$$2Exception_cpp$$2 CPU_EXP_NAME__23$$2unnamed$$2Exception_cpp$$2: - .byte4 $$248845 - .byte4 $$248846 - .byte4 $$248847 - .byte4 $$248848 - .byte4 $$248849 - .byte4 $$248850 - .byte4 $$248851 - .byte4 $$248852 - .byte4 $$248853 - .byte4 $$248854 - .byte4 $$248855 - .byte4 $$248856 - .byte4 $$248857 - .byte4 $$248858 - .byte4 $$248859 - .byte4 $$248860 - .byte4 $$248852 + .4byte $$248845 + .4byte $$248846 + .4byte $$248847 + .4byte $$248848 + .4byte $$248849 + .4byte $$248850 + .4byte $$248851 + .4byte $$248852 + .4byte $$248853 + .4byte $$248854 + .4byte $$248855 + .4byte $$248856 + .4byte $$248857 + .4byte $$248858 + .4byte $$248859 + .4byte $$248860 + .4byte $$248852 .global $$249260 $$249260: .asciz "******** EXCEPTION OCCURRED! ********\n" diff --git a/asm/src/ExplainButton.s b/asm/src/ExplainButton.s index a315a63a..cfc83391 100644 --- a/asm/src/ExplainButton.s +++ b/asm/src/ExplainButton.s @@ -378,18 +378,18 @@ $$251587: .asciz "AbilitySelect_Smash" .global ButtonMsgTbl__Q53scn4step4info5lvmap27$$2unnamed$$2ExplainButton_cpp$$2 ButtonMsgTbl__Q53scn4step4info5lvmap27$$2unnamed$$2ExplainButton_cpp$$2: - .byte4 $$251576 - .byte4 $$251577 - .byte4 $$251578 - .byte4 $$251579 - .byte4 $$251580 - .byte4 $$251581 - .byte4 $$251582 - .byte4 $$251583 - .byte4 $$251584 - .byte4 $$251585 - .byte4 $$251586 - .byte4 $$251587 + .4byte $$251576 + .4byte $$251577 + .4byte $$251578 + .4byte $$251579 + .4byte $$251580 + .4byte $$251581 + .4byte $$251582 + .4byte $$251583 + .4byte $$251584 + .4byte $$251585 + .4byte $$251586 + .4byte $$251587 .global $$251590 $$251590: .asciz "ParasolN" @@ -404,14 +404,14 @@ ButtonIconTbl__Q53scn4step4info5lvmap27$$2unnamed$$2ExplainButton_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$251589 - .byte4 $$251590 - .byte4 $$251591 - .byte4 $$251592 - .byte4 $$251593 - .byte4 $$251594 - .byte4 $$251595 - .byte4 $$251596 + .4byte $$251589 + .4byte $$251590 + .4byte $$251591 + .4byte $$251592 + .4byte $$251593 + .4byte $$251594 + .4byte $$251595 + .4byte $$251596 .global $$252410 $$252410: .asciz "ButtonActionBase" diff --git a/asm/src/ExplainConsole.s b/asm/src/ExplainConsole.s index 6fbd3e8d..f3cf4790 100644 --- a/asm/src/ExplainConsole.s +++ b/asm/src/ExplainConsole.s @@ -986,71 +986,71 @@ lbl_803BCF40: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global cdDataTbl__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 cdDataTbl__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: - .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdMaster__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdMaster__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000002 - .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdMaster__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdMaster__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000002 - .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdMaster__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdMaster__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000002 - .byte4 bIdMaster__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdMaster__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000002 - .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdTraining1__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdTraining1__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdTraining2__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdTraining2__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdTraining3__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdTraining3__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000002 .global cdDataTblG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 cdDataTblG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: - .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .byte4 bIdMasterG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdMasterG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .byte4 bIdMasterG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdMasterG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .byte4 bIdMasterG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdMasterG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdMasterG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdMasterG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .byte4 bIdTraining1__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdTraining1__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdTraining2__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdTraining2__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .byte4 bIdTraining3__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 + .4byte bIdTraining3__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000002 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/src/ExplainUtil.s b/asm/src/ExplainUtil.s index fc69e8f6..0d647dc1 100644 --- a/asm/src/ExplainUtil.s +++ b/asm/src/ExplainUtil.s @@ -191,120 +191,120 @@ MedalToGrade__Q53scn4step4info5lvmap11ExplainUtilFQ33scn4step18ChallengeMedalKin .section .rodata, "wa" # 0x80406560 - 0x80421040 .global explainDataTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2 explainDataTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2: - .byte4 $$248733 - .byte4 $$248734 - .byte4 $$248735 - .byte4 $$248736 - .byte4 $$248736 - .byte4 $$248737 - .byte4 $$248738 - .byte4 $$248739 - .byte4 $$248740 - .byte4 $$248740 - .byte4 $$248741 - .byte4 $$248742 - .byte4 $$248743 - .byte4 $$248744 - .byte4 $$248744 - .byte4 $$248745 - .byte4 $$248746 - .byte4 $$248747 - .byte4 $$248748 - .byte4 $$248748 - .byte4 $$248749 - .byte4 $$248750 - .byte4 $$248751 - .byte4 $$248752 - .byte4 $$248752 - .byte4 $$248753 - .byte4 $$248754 - .byte4 $$248755 - .byte4 $$248756 - .byte4 $$248756 - .byte4 $$248757 - .byte4 $$248758 - .byte4 $$248759 - .byte4 $$248760 - .byte4 $$248760 - .byte4 $$248745 - .byte4 $$248746 - .byte4 $$248761 - .byte4 $$248762 - .byte4 $$248762 - .byte4 $$248763 - .byte4 $$248764 - .byte4 $$248765 - .byte4 $$248766 - .byte4 $$248766 - .byte4 $$248767 - .byte4 $$248768 - .byte4 $$248769 - .byte4 $$248770 - .byte4 $$248770 - .byte4 $$248745 - .byte4 $$248746 - .byte4 $$248771 - .byte4 $$248772 - .byte4 $$248772 - .byte4 $$248745 - .byte4 $$248746 - .byte4 $$248773 - .byte4 $$248772 - .byte4 $$248774 - .byte4 $$248763 - .byte4 $$248764 - .byte4 $$248765 - .byte4 $$248766 - .byte4 $$248775 - .byte4 $$248776 - .byte4 $$248777 - .byte4 $$248778 - .byte4 $$248779 - .byte4 $$248779 - .byte4 $$248776 - .byte4 $$248777 - .byte4 $$248780 - .byte4 $$248781 - .byte4 $$248781 - .byte4 $$248776 - .byte4 $$248777 - .byte4 $$248782 - .byte4 $$248783 - .byte4 $$248783 + .4byte $$248733 + .4byte $$248734 + .4byte $$248735 + .4byte $$248736 + .4byte $$248736 + .4byte $$248737 + .4byte $$248738 + .4byte $$248739 + .4byte $$248740 + .4byte $$248740 + .4byte $$248741 + .4byte $$248742 + .4byte $$248743 + .4byte $$248744 + .4byte $$248744 + .4byte $$248745 + .4byte $$248746 + .4byte $$248747 + .4byte $$248748 + .4byte $$248748 + .4byte $$248749 + .4byte $$248750 + .4byte $$248751 + .4byte $$248752 + .4byte $$248752 + .4byte $$248753 + .4byte $$248754 + .4byte $$248755 + .4byte $$248756 + .4byte $$248756 + .4byte $$248757 + .4byte $$248758 + .4byte $$248759 + .4byte $$248760 + .4byte $$248760 + .4byte $$248745 + .4byte $$248746 + .4byte $$248761 + .4byte $$248762 + .4byte $$248762 + .4byte $$248763 + .4byte $$248764 + .4byte $$248765 + .4byte $$248766 + .4byte $$248766 + .4byte $$248767 + .4byte $$248768 + .4byte $$248769 + .4byte $$248770 + .4byte $$248770 + .4byte $$248745 + .4byte $$248746 + .4byte $$248771 + .4byte $$248772 + .4byte $$248772 + .4byte $$248745 + .4byte $$248746 + .4byte $$248773 + .4byte $$248772 + .4byte $$248774 + .4byte $$248763 + .4byte $$248764 + .4byte $$248765 + .4byte $$248766 + .4byte $$248775 + .4byte $$248776 + .4byte $$248777 + .4byte $$248778 + .4byte $$248779 + .4byte $$248779 + .4byte $$248776 + .4byte $$248777 + .4byte $$248780 + .4byte $$248781 + .4byte $$248781 + .4byte $$248776 + .4byte $$248777 + .4byte $$248782 + .4byte $$248783 + .4byte $$248783 .global explainPathTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2 explainPathTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2: - .byte4 $$248794 - .byte4 $$248794 - .byte4 $$248794 - .byte4 $$248794 - .byte4 $$248794 - .byte4 $$248794 - .byte4 $$248795 - .byte4 $$248794 - .byte4 $$248796 - .byte4 $$248796 - .byte4 $$248796 - .byte4 $$248796 - .byte4 $$248796 - .byte4 $$248796 - .byte4 $$248795 - .byte4 $$248796 - .byte4 $$248797 - .byte4 $$248797 - .byte4 $$248797 - .byte4 $$248797 - .byte4 $$248795 - .byte4 $$248797 - .byte4 $$248795 - .byte4 $$248797 - .byte4 $$248797 - .byte4 $$248797 - .byte4 $$248795 - .byte4 $$248794 - .byte4 $$248795 - .byte4 $$248796 - .byte4 $$248795 - .byte4 $$248797 + .4byte $$248794 + .4byte $$248794 + .4byte $$248794 + .4byte $$248794 + .4byte $$248794 + .4byte $$248794 + .4byte $$248795 + .4byte $$248794 + .4byte $$248796 + .4byte $$248796 + .4byte $$248796 + .4byte $$248796 + .4byte $$248796 + .4byte $$248796 + .4byte $$248795 + .4byte $$248796 + .4byte $$248797 + .4byte $$248797 + .4byte $$248797 + .4byte $$248797 + .4byte $$248795 + .4byte $$248797 + .4byte $$248795 + .4byte $$248797 + .4byte $$248797 + .4byte $$248797 + .4byte $$248795 + .4byte $$248794 + .4byte $$248795 + .4byte $$248796 + .4byte $$248795 + .4byte $$248797 .global medalToGradeTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2 medalToGradeTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2: .4byte 0 @@ -478,11 +478,11 @@ $$248811: .balign 4 .global medalNameTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2 medalNameTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2: - .byte4 $$248808 - .byte4 $$248808 - .byte4 $$248809 - .byte4 $$248810 - .byte4 $$248811 + .4byte $$248808 + .4byte $$248808 + .4byte $$248809 + .4byte $$248810 + .4byte $$248811 .global $$249054 $$249054: .asciz "step/challengeship/%s" @@ -549,4 +549,4 @@ $$248797: .4byte 0x4C763300 .global explainCommonPath__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2 explainCommonPath__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2: - .byte4 $$248807 + .4byte $$248807 diff --git a/asm/src/Explanation.s b/asm/src/Explanation.s index b8ca79ad..202c7545 100644 --- a/asm/src/Explanation.s +++ b/asm/src/Explanation.s @@ -488,48 +488,48 @@ t_ItemInfoTable__25$$2unnamed$$2Explanation_cpp$$2: .4byte 0 .4byte 0 .4byte 0x0000000F - .byte4 $$251882 + .4byte $$251882 .4byte 0 .4byte 0x00000001 .4byte 0x0000000F - .byte4 $$251883 + .4byte $$251883 .4byte 0 .4byte 0x00000002 .4byte 0x0000000F - .byte4 $$251884 + .4byte $$251884 .4byte 0x00000001 .4byte 0x00000003 .4byte 0x0000000F - .byte4 $$251885 + .4byte $$251885 .4byte 0x00000001 .4byte 0x00000003 .4byte 0x0000000F - .byte4 $$251886 + .4byte $$251886 .4byte 0x00000001 .4byte 0x00000005 .4byte 0x0000000F - .byte4 $$251887 + .4byte $$251887 .4byte 0x00000001 .4byte 0x00000004 .4byte 0x0000000F - .byte4 $$251888 + .4byte $$251888 .4byte 0x00000001 .4byte 0x00000005 .4byte 0x0000000F - .byte4 $$251889 + .4byte $$251889 .4byte 0x00000001 .4byte 0x00000006 .4byte 0x0000000F - .byte4 $$251890 + .4byte $$251890 .global $$252218 $$252218: - .byte4 $$252211 - .byte4 $$252212 - .byte4 $$252213 - .byte4 $$252214 - .byte4 $$252215 - .byte4 $$252216 - .byte4 $$252217 + .4byte $$252211 + .4byte $$252212 + .4byte $$252213 + .4byte $$252214 + .4byte $$252215 + .4byte $$252216 + .4byte $$252217 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/src/FDGManager.s b/asm/src/FDGManager.s index feb00cbe..b0e7ed7c 100644 --- a/asm/src/FDGManager.s +++ b/asm/src/FDGManager.s @@ -390,7 +390,7 @@ $$249254: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_FILE_PATH__Q24file24$$2unnamed$$2FDGManager_cpp$$2 T_FILE_PATH__Q24file24$$2unnamed$$2FDGManager_cpp$$2: - .byte4 $$249254 + .4byte $$249254 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/Fighter.s b/asm/src/Fighter.s index dace94da..3983e94e 100644 --- a/asm/src/Fighter.s +++ b/asm/src/Fighter.s @@ -515,27 +515,27 @@ $$256344: __vt__Q53scn4step4hero7fighter7Fighter: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter7FighterFv - .byte4 setup__Q53scn4step4hero7fighter7FighterFv - .byte4 tryToChangeStateOnCarry__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeStateOnInterval__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeStateOnDamage__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeState__Q53scn4step4hero7fighter7FighterFv - .byte4 onStateEndCleanUp__Q43scn4step4hero11AbilityBaseFv - .byte4 onGetEventItem__Q43scn4step4hero11AbilityBaseFv - .byte4 onGimmickReactChangeState__Q43scn4step4hero11AbilityBaseFv - .byte4 onStartClearDanceExternal__Q43scn4step4hero11AbilityBaseFv - .byte4 onEnterWarpLowper__Q43scn4step4hero11AbilityBaseFv - .byte4 onShowHero__Q43scn4step4hero11AbilityBaseFv - .byte4 onHideHero__Q43scn4step4hero11AbilityBaseFv - .byte4 onDead__Q43scn4step4hero11AbilityBaseFv - .byte4 onCaptured__Q43scn4step4hero11AbilityBaseFv - .byte4 onVacuumed__Q43scn4step4hero11AbilityBaseFv - .byte4 onStartDemo__Q43scn4step4hero11AbilityBaseFv - .byte4 procAnim__Q53scn4step4hero7fighter7FighterFv - .byte4 procMove__Q43scn4step4hero11AbilityBaseFv - .byte4 procObjCollReact__Q43scn4step4hero11AbilityBaseFv - .byte4 isDepleted__Q43scn4step4hero11AbilityBaseCFv + .4byte __dt__Q53scn4step4hero7fighter7FighterFv + .4byte setup__Q53scn4step4hero7fighter7FighterFv + .4byte tryToChangeStateOnCarry__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeStateOnInterval__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeStateOnDamage__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeState__Q53scn4step4hero7fighter7FighterFv + .4byte onStateEndCleanUp__Q43scn4step4hero11AbilityBaseFv + .4byte onGetEventItem__Q43scn4step4hero11AbilityBaseFv + .4byte onGimmickReactChangeState__Q43scn4step4hero11AbilityBaseFv + .4byte onStartClearDanceExternal__Q43scn4step4hero11AbilityBaseFv + .4byte onEnterWarpLowper__Q43scn4step4hero11AbilityBaseFv + .4byte onShowHero__Q43scn4step4hero11AbilityBaseFv + .4byte onHideHero__Q43scn4step4hero11AbilityBaseFv + .4byte onDead__Q43scn4step4hero11AbilityBaseFv + .4byte onCaptured__Q43scn4step4hero11AbilityBaseFv + .4byte onVacuumed__Q43scn4step4hero11AbilityBaseFv + .4byte onStartDemo__Q43scn4step4hero11AbilityBaseFv + .4byte procAnim__Q53scn4step4hero7fighter7FighterFv + .4byte procMove__Q43scn4step4hero11AbilityBaseFv + .4byte procObjCollReact__Q43scn4step4hero11AbilityBaseFv + .4byte isDepleted__Q43scn4step4hero11AbilityBaseCFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 @@ -548,8 +548,8 @@ $$249542: .asciz "HatBigM" .global $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc7FighterFv$$2names$$21 $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc7FighterFv$$2names$$21: - .byte4 $$249541 - .byte4 $$249542 + .4byte $$249541 + .4byte $$249542 .global $$249857 $$249857: .asciz "LBand1S" diff --git a/asm/src/File.s b/asm/src/File.s index f9647ed6..51e0aa4b 100644 --- a/asm/src/File.s +++ b/asm/src/File.s @@ -564,12 +564,12 @@ lbl_801E4194: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$252047 $$252047: - .byte4 $$252042 - .byte4 $$252043 - .byte4 $$252044 - .byte4 $$252045 - .byte4 $$252046 - .byte4 $$252046 + .4byte $$252042 + .4byte $$252043 + .4byte $$252044 + .4byte $$252045 + .4byte $$252046 + .4byte $$252046 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252743 @@ -620,15 +620,15 @@ $$252898: __vt__Q33scn19challengefileselect4File: .4byte 0 .4byte 0 - .byte4 __dt__Q33scn19challengefileselect4FileFv - .byte4 updateFrame__Q33scn19challengefileselect4FileFv - .byte4 appear__Q33scn19challengefileselect4FileFv - .byte4 focus__Q33scn19challengefileselect4FileFv - .byte4 unfocus__Q33scn19challengefileselect4FileFv - .byte4 decide__Q33scn19challengefileselect4FileFv - .byte4 isAnimEnd__Q33scn19challengefileselect4FileCFv - .byte4 kind__Q33scn19challengefileselect4FileCFv - .byte4 cursorPane__Q33scn19challengefileselect4FileFv + .4byte __dt__Q33scn19challengefileselect4FileFv + .4byte updateFrame__Q33scn19challengefileselect4FileFv + .4byte appear__Q33scn19challengefileselect4FileFv + .4byte focus__Q33scn19challengefileselect4FileFv + .4byte unfocus__Q33scn19challengefileselect4FileFv + .4byte decide__Q33scn19challengefileselect4FileFv + .4byte isAnimEnd__Q33scn19challengefileselect4FileCFv + .4byte kind__Q33scn19challengefileselect4FileCFv + .4byte cursorPane__Q33scn19challengefileselect4FileFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/FontKindUtil.s b/asm/src/FontKindUtil.s index caf3a4fb..daefb3f7 100644 --- a/asm/src/FontKindUtil.s +++ b/asm/src/FontKindUtil.s @@ -62,24 +62,24 @@ Name__Q24font12FontKindUtilFQ24font8FontKind: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_FONT_CONTEXT_TABLE__Q24font26$$2unnamed$$2FontKindUtil_cpp$$2 T_FONT_CONTEXT_TABLE__Q24font26$$2unnamed$$2FontKindUtil_cpp$$2: - .byte4 $$248723 - .byte4 $$248724 - .byte4 $$248723 - .byte4 $$248725 - .byte4 $$248723 - .byte4 $$248726 - .byte4 $$248723 - .byte4 $$248727 - .byte4 $$248723 - .byte4 $$248728 - .byte4 $$248723 - .byte4 $$248729 - .byte4 $$248723 - .byte4 $$248730 - .byte4 $$248723 - .byte4 $$248731 - .byte4 $$248723 - .byte4 $$248732 + .4byte $$248723 + .4byte $$248724 + .4byte $$248723 + .4byte $$248725 + .4byte $$248723 + .4byte $$248726 + .4byte $$248723 + .4byte $$248727 + .4byte $$248723 + .4byte $$248728 + .4byte $$248723 + .4byte $$248729 + .4byte $$248723 + .4byte $$248730 + .4byte $$248723 + .4byte $$248731 + .4byte $$248723 + .4byte $$248732 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248724 diff --git a/asm/src/FoodTableKindUtil.s b/asm/src/FoodTableKindUtil.s index 9b5c268f..a1bf02ce 100644 --- a/asm/src/FoodTableKindUtil.s +++ b/asm/src/FoodTableKindUtil.s @@ -82,18 +82,18 @@ T_TABLE_LV7__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2: .global T_TABLES__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 T_TABLES__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2: .4byte 0x00000005 - .byte4 T_TABLE_STANDARD__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 + .4byte T_TABLE_STANDARD__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 .4byte 0x00000005 - .byte4 T_TABLE_LV1__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 + .4byte T_TABLE_LV1__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 .4byte 0x00000005 - .byte4 T_TABLE_LV2__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 + .4byte T_TABLE_LV2__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 .4byte 0x00000005 - .byte4 T_TABLE_LV3__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 + .4byte T_TABLE_LV3__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 .4byte 0x00000005 - .byte4 T_TABLE_LV4__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 + .4byte T_TABLE_LV4__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 .4byte 0x00000005 - .byte4 T_TABLE_LV5__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 + .4byte T_TABLE_LV5__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 .4byte 0x00000005 - .byte4 T_TABLE_LV6__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 + .4byte T_TABLE_LV6__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 .4byte 0x00000005 - .byte4 T_TABLE_LV7__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 + .4byte T_TABLE_LV7__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 diff --git a/asm/src/FramePanel.s b/asm/src/FramePanel.s index b67ed8f4..636f5014 100644 --- a/asm/src/FramePanel.s +++ b/asm/src/FramePanel.s @@ -625,7 +625,7 @@ $$252851: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_MOVE_NODE__Q25pause24$$2unnamed$$2FramePanel_cpp$$2 T_MOVE_NODE__Q25pause24$$2unnamed$$2FramePanel_cpp$$2: - .byte4 $$251724 + .4byte $$251724 .global T_FIX_NODE__Q25pause24$$2unnamed$$2FramePanel_cpp$$2 T_FIX_NODE__Q25pause24$$2unnamed$$2FramePanel_cpp$$2: - .byte4 $$251725 + .4byte $$251725 diff --git a/asm/src/G3DAutoReqAnimCallback.s b/asm/src/G3DAutoReqAnimCallback.s index bb96076f..f8bf8e81 100644 --- a/asm/src/G3DAutoReqAnimCallback.s +++ b/asm/src/G3DAutoReqAnimCallback.s @@ -90,5 +90,5 @@ request__Q36effect6detail22G3DAutoReqAnimCallbackFRCQ23g3d18AutoReqAnimReqInfo: __vt__Q36effect6detail22G3DAutoReqAnimCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q36effect6detail22G3DAutoReqAnimCallbackFv - .byte4 request__Q36effect6detail22G3DAutoReqAnimCallbackFRCQ23g3d18AutoReqAnimReqInfo + .4byte __dt__Q36effect6detail22G3DAutoReqAnimCallbackFv + .4byte request__Q36effect6detail22G3DAutoReqAnimCallbackFRCQ23g3d18AutoReqAnimReqInfo diff --git a/asm/src/GearModel.s b/asm/src/GearModel.s index e42ab722..9abd7f4d 100644 --- a/asm/src/GearModel.s +++ b/asm/src/GearModel.s @@ -201,5 +201,5 @@ lbl_8019A88C: __vt__Q24gobj9GearModel: .4byte 0 .4byte 0 - .byte4 __dt__Q24gobj9GearModelFv - .byte4 g3dModel__Q24gobj9GearModelFv + .4byte __dt__Q24gobj9GearModelFv + .4byte g3dModel__Q24gobj9GearModelFv diff --git a/asm/src/GenerateFromObj.s b/asm/src/GenerateFromObj.s index e29592c0..bdf22a6c 100644 --- a/asm/src/GenerateFromObj.s +++ b/asm/src/GenerateFromObj.s @@ -354,15 +354,15 @@ T_ODDS_ENEMY_3__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2: .global T_ODDSTABLE_ENEMY_1__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 T_ODDSTABLE_ENEMY_1__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2: .4byte 0x00000011 - .byte4 T_ODDS_ENEMY_1__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 + .4byte T_ODDS_ENEMY_1__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 .global T_ODDSTABLE_ENEMY_2__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 T_ODDSTABLE_ENEMY_2__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2: .4byte 0x0000000D - .byte4 T_ODDS_ENEMY_2__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 + .4byte T_ODDS_ENEMY_2__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 .global T_ODDSTABLE_ENEMY_3__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 T_ODDSTABLE_ENEMY_3__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2: .4byte 0x00000005 - .byte4 T_ODDS_ENEMY_3__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 + .4byte T_ODDS_ENEMY_3__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 .global $$254118 $$254118: .4byte 0x3E99999A diff --git a/asm/src/Ghost.s b/asm/src/Ghost.s index 523a30f8..92e6d0dd 100644 --- a/asm/src/Ghost.s +++ b/asm/src/Ghost.s @@ -611,7 +611,7 @@ __sinit_$$3Ghost_cpp: /* 8030FB98 0030B9D8 4B DA E5 28 */ b __ct__Q34nw4r4math4VEC3Ffff .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3Ghost_cpp + .4byte __sinit_$$3Ghost_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254434 diff --git a/asm/src/HEL__Math__Vector2.s b/asm/src/HEL__Math__Vector2.s index aa335d10..3f4c8bdb 100644 --- a/asm/src/HEL__Math__Vector2.s +++ b/asm/src/HEL__Math__Vector2.s @@ -839,72 +839,72 @@ $$254046: $$254048: .4byte 0 .4byte 0xFFFFFFFF - .byte4 toVector3XOY__Q33hel4math7Vector2CFv + .4byte toVector3XOY__Q33hel4math7Vector2CFv .global $$254109 $$254109: .4byte 0 .4byte 0xFFFFFFFF - .byte4 toVector3__Q33hel4math7Vector2CFv + .4byte toVector3__Q33hel4math7Vector2CFv .global $$254114 $$254114: .4byte 0 .4byte 0xFFFFFFFF - .byte4 __dv__Q33hel4math7Vector2CFf + .4byte __dv__Q33hel4math7Vector2CFf .global $$254145 $$254145: .4byte 0 .4byte 0xFFFFFFFF - .byte4 __ml__Q33hel4math7Vector2CFf + .4byte __ml__Q33hel4math7Vector2CFf .global $$254153 $$254153: .4byte 0 .4byte 0xFFFFFFFF - .byte4 __mi__Q33hel4math7Vector2CFRCQ33hel4math7Vector2 + .4byte __mi__Q33hel4math7Vector2CFRCQ33hel4math7Vector2 .global $$254175 $$254175: .4byte 0 .4byte 0xFFFFFFFF - .byte4 __pl__Q33hel4math7Vector2CFRCQ33hel4math7Vector2 + .4byte __pl__Q33hel4math7Vector2CFRCQ33hel4math7Vector2 .global $$254187 $$254187: .4byte 0 .4byte 0xFFFFFFFF - .byte4 __adv__Q33hel4math7Vector2Ff + .4byte __adv__Q33hel4math7Vector2Ff .global $$254195 $$254195: .4byte 0 .4byte 0xFFFFFFFF - .byte4 __amu__Q33hel4math7Vector2Ff + .4byte __amu__Q33hel4math7Vector2Ff .global $$254200 $$254200: .4byte 0 .4byte 0xFFFFFFFF - .byte4 __ami__Q33hel4math7Vector2FRCQ33hel4math7Vector2 + .4byte __ami__Q33hel4math7Vector2FRCQ33hel4math7Vector2 .global $$254208 $$254208: .4byte 0 .4byte 0xFFFFFFFF - .byte4 __apl__Q33hel4math7Vector2FRCQ33hel4math7Vector2 + .4byte __apl__Q33hel4math7Vector2FRCQ33hel4math7Vector2 .global $$254213 $$254213: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isZero__Q33hel4math7Vector2CFv + .4byte isZero__Q33hel4math7Vector2CFv .global $$254239 $$254239: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isZeroStrict__Q33hel4math7Vector2CFv + .4byte isZeroStrict__Q33hel4math7Vector2CFv .global $$254244 $$254244: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isZeroLoose__Q33hel4math7Vector2CFf + .4byte isZeroLoose__Q33hel4math7Vector2CFf .global $$254265 $$254265: .4byte 0 .4byte 0xFFFFFFFF - .byte4 set__Q33hel4math7Vector2Fff + .4byte set__Q33hel4math7Vector2Fff .asciz "Assertion failed.\n" .balign 4 .asciz "MintFuncProxy.hpp" diff --git a/asm/src/HEL__Math__Vector3.s b/asm/src/HEL__Math__Vector3.s index 2341a573..4787c8e8 100644 --- a/asm/src/HEL__Math__Vector3.s +++ b/asm/src/HEL__Math__Vector3.s @@ -1403,92 +1403,92 @@ $$254558: $$254663: .4byte 0 .4byte 0xFFFFFFFF - .byte4 getZY__Q33hel4math7Vector3CFv + .4byte getZY__Q33hel4math7Vector3CFv .global $$254702 $$254702: .4byte 0 .4byte 0xFFFFFFFF - .byte4 getZX__Q33hel4math7Vector3CFv + .4byte getZX__Q33hel4math7Vector3CFv .global $$254710 $$254710: .4byte 0 .4byte 0xFFFFFFFF - .byte4 getYZ__Q33hel4math7Vector3CFv + .4byte getYZ__Q33hel4math7Vector3CFv .global $$254718 $$254718: .4byte 0 .4byte 0xFFFFFFFF - .byte4 getYX__Q33hel4math7Vector3CFv + .4byte getYX__Q33hel4math7Vector3CFv .global $$254726 $$254726: .4byte 0 .4byte 0xFFFFFFFF - .byte4 getXZ__Q33hel4math7Vector3CFv + .4byte getXZ__Q33hel4math7Vector3CFv .global $$254734 $$254734: .4byte 0 .4byte 0xFFFFFFFF - .byte4 getXY__Q33hel4math7Vector3CFv + .4byte getXY__Q33hel4math7Vector3CFv .global $$254742 $$254742: .4byte 0 .4byte 0xFFFFFFFF - .byte4 __dv__Q33hel4math7Vector3CFf + .4byte __dv__Q33hel4math7Vector3CFf .global $$254772 $$254772: .4byte 0 .4byte 0xFFFFFFFF - .byte4 __ml__Q33hel4math7Vector3CFf + .4byte __ml__Q33hel4math7Vector3CFf .global $$254782 $$254782: .4byte 0 .4byte 0xFFFFFFFF - .byte4 __mi__Q33hel4math7Vector3CFRCQ33hel4math7Vector3 + .4byte __mi__Q33hel4math7Vector3CFRCQ33hel4math7Vector3 .global $$254806 $$254806: .4byte 0 .4byte 0xFFFFFFFF - .byte4 __pl__Q33hel4math7Vector3CFRCQ33hel4math7Vector3 + .4byte __pl__Q33hel4math7Vector3CFRCQ33hel4math7Vector3 .global $$254820 $$254820: .4byte 0 .4byte 0xFFFFFFFF - .byte4 __adv__Q33hel4math7Vector3Ff + .4byte __adv__Q33hel4math7Vector3Ff .global $$254828 $$254828: .4byte 0 .4byte 0xFFFFFFFF - .byte4 __amu__Q33hel4math7Vector3Ff + .4byte __amu__Q33hel4math7Vector3Ff .global $$254833 $$254833: .4byte 0 .4byte 0xFFFFFFFF - .byte4 __ami__Q33hel4math7Vector3FRCQ33hel4math7Vector3 + .4byte __ami__Q33hel4math7Vector3FRCQ33hel4math7Vector3 .global $$254841 $$254841: .4byte 0 .4byte 0xFFFFFFFF - .byte4 __apl__Q33hel4math7Vector3FRCQ33hel4math7Vector3 + .4byte __apl__Q33hel4math7Vector3FRCQ33hel4math7Vector3 .global $$254846 $$254846: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isZero__Q33hel4math7Vector3CFv + .4byte isZero__Q33hel4math7Vector3CFv .global $$254875 $$254875: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isZeroStrict__Q33hel4math7Vector3CFv + .4byte isZeroStrict__Q33hel4math7Vector3CFv .global $$254880 $$254880: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isZeroLoose__Q33hel4math7Vector3CFf + .4byte isZeroLoose__Q33hel4math7Vector3CFf .global $$254904 $$254904: .4byte 0 .4byte 0xFFFFFFFF - .byte4 set__Q33hel4math7Vector3Ffff + .4byte set__Q33hel4math7Vector3Ffff .asciz "Assertion failed.\n" .balign 4 .asciz "MintFuncProxy.hpp" diff --git a/asm/src/HIDErrorMenu.s b/asm/src/HIDErrorMenu.s index aade390a..cf6ba79f 100644 --- a/asm/src/HIDErrorMenu.s +++ b/asm/src/HIDErrorMenu.s @@ -1940,9 +1940,9 @@ $$252181: .asciz "DisconnectTitle" .global ON_CANCEL_WINDOW_TEXT_MAIN__Q23app26$$2unnamed$$2HIDErrorMenu_cpp$$2 ON_CANCEL_WINDOW_TEXT_MAIN__Q23app26$$2unnamed$$2HIDErrorMenu_cpp$$2: - .byte4 $$252181 - .byte4 $$252181 - .byte4 $$252181 + .4byte $$252181 + .4byte $$252181 + .4byte $$252181 .global $$252182 $$252182: .asciz "DisconnectTitleSubWithCancel" @@ -1953,9 +1953,9 @@ $$252183: .balign 4 .global ON_CANCEL_WINDOW_TEXT_SUB__Q23app26$$2unnamed$$2HIDErrorMenu_cpp$$2 ON_CANCEL_WINDOW_TEXT_SUB__Q23app26$$2unnamed$$2HIDErrorMenu_cpp$$2: - .byte4 $$252181 - .byte4 $$252182 - .byte4 $$252183 + .4byte $$252181 + .4byte $$252182 + .4byte $$252183 .global $$252184 $$252184: .asciz "DisconnectContinue" @@ -1966,9 +1966,9 @@ $$252185: .balign 4 .global ON_CANCEL_WINDOW_TEXT_CONFIRM__Q23app26$$2unnamed$$2HIDErrorMenu_cpp$$2 ON_CANCEL_WINDOW_TEXT_CONFIRM__Q23app26$$2unnamed$$2HIDErrorMenu_cpp$$2: - .byte4 $$252184 - .byte4 $$252184 - .byte4 $$252185 + .4byte $$252184 + .4byte $$252184 + .4byte $$252185 .global $$254504 $$254504: .asciz "ErrorMenu" diff --git a/asm/src/HIDManager.s b/asm/src/HIDManager.s index 091d8d35..6eee0843 100644 --- a/asm/src/HIDManager.s +++ b/asm/src/HIDManager.s @@ -1107,7 +1107,7 @@ __sinit_$$3HIDManager_cpp: /* 801A3838 0019F678 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3HIDManager_cpp + .4byte __sinit_$$3HIDManager_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_wpadInfoArray__24$$2unnamed$$2HIDManager_cpp$$2 diff --git a/asm/src/Hammer.s b/asm/src/Hammer.s index a0b080ae..c2b7c857 100644 --- a/asm/src/Hammer.s +++ b/asm/src/Hammer.s @@ -61,37 +61,37 @@ HammerAnim__Q53scn4step4hero9modeldesc6HammerFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2HammerAnim__Q53scn4step4hero9modeldesc6HammerFv$$2entries$$21 $$2LOCAL$$2HammerAnim__Q53scn4step4hero9modeldesc6HammerFv$$2entries$$21: - .byte4 $$248744 + .4byte $$248744 .4byte 0 - .byte4 $$248745 + .4byte $$248745 .4byte 0 - .byte4 $$248746 + .4byte $$248746 .4byte 0 - .byte4 $$248747 + .4byte $$248747 .4byte 0 - .byte4 $$248748 + .4byte $$248748 .4byte 0 - .byte4 $$248749 + .4byte $$248749 .4byte 0 - .byte4 $$248750 + .4byte $$248750 .4byte 0 - .byte4 $$248751 + .4byte $$248751 .4byte 0 - .byte4 $$248752 + .4byte $$248752 .4byte 0 - .byte4 $$248753 + .4byte $$248753 .4byte 0 - .byte4 $$248754 + .4byte $$248754 .4byte 0 - .byte4 $$248755 + .4byte $$248755 .4byte 0 - .byte4 $$248756 + .4byte $$248756 .4byte 0 - .byte4 $$248757 + .4byte $$248757 .4byte 0 - .byte4 $$248758 + .4byte $$248758 .4byte 0 - .byte4 $$248759 + .4byte $$248759 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -103,9 +103,9 @@ $$248737: .asciz "HammerheadJ" .global $$2LOCAL$$2HammerModel__Q53scn4step4hero9modeldesc6HammerFv$$2names$$21 $$2LOCAL$$2HammerModel__Q53scn4step4hero9modeldesc6HammerFv$$2names$$21: - .byte4 $$248735 - .byte4 $$248736 - .byte4 $$248737 + .4byte $$248735 + .4byte $$248736 + .4byte $$248737 .4byte 0 .global $$248745 $$248745: diff --git a/asm/src/HeapCompaction.s b/asm/src/HeapCompaction.s index 685ddf64..748dcc1c 100644 --- a/asm/src/HeapCompaction.s +++ b/asm/src/HeapCompaction.s @@ -1074,30 +1074,30 @@ $$24$$2__dt__Q23mem14HeapCompactionFv: __vt__Q23mem14HeapCompaction: .4byte 0 .4byte 0 - .byte4 __dt__Q23mem14HeapCompactionFv - .byte4 heapName__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 fragmentBlockCount__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 usedBlockCount__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 totalHeapSize__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 usedHeapSize__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 startAddress__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 endAddress__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 drawUsedBlocks__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer - .byte4 drawFragmentBlocks__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer + .4byte __dt__Q23mem14HeapCompactionFv + .4byte heapName__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte fragmentBlockCount__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte usedBlockCount__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte totalHeapSize__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte usedHeapSize__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte startAddress__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte endAddress__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte drawUsedBlocks__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer + .4byte drawFragmentBlocks__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer .4byte 0 .4byte 0 - .byte4 $$24$$2__dt__Q23mem14HeapCompactionFv - .byte4 $$24$$2allocatorAlloc__Q23mem14HeapCompactionFUll - .byte4 $$24$$2allocatorFree__Q23mem14HeapCompactionFPv - .byte4 allocatorAlloc__Q23mem14HeapCompactionFUll - .byte4 allocatorFree__Q23mem14HeapCompactionFPv + .4byte $$24$$2__dt__Q23mem14HeapCompactionFv + .4byte $$24$$2allocatorAlloc__Q23mem14HeapCompactionFUll + .4byte $$24$$2allocatorFree__Q23mem14HeapCompactionFPv + .4byte allocatorAlloc__Q23mem14HeapCompactionFUll + .4byte allocatorFree__Q23mem14HeapCompactionFPv .global __vt__Q33mem14HeapCompaction22AllocFromTailAllocator __vt__Q33mem14HeapCompaction22AllocFromTailAllocator: .4byte 0 .4byte 0 - .byte4 __dt__Q33mem14HeapCompaction22AllocFromTailAllocatorFv - .byte4 allocatorAlloc__Q33mem14HeapCompaction22AllocFromTailAllocatorFUll - .byte4 allocatorFree__Q33mem14HeapCompaction22AllocFromTailAllocatorFPv + .4byte __dt__Q33mem14HeapCompaction22AllocFromTailAllocatorFv + .4byte allocatorAlloc__Q33mem14HeapCompaction22AllocFromTailAllocatorFUll + .4byte allocatorFree__Q33mem14HeapCompaction22AllocFromTailAllocatorFPv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249358 diff --git a/asm/src/HeapExp.s b/asm/src/HeapExp.s index 0a52487d..f2e51fc9 100644 --- a/asm/src/HeapExp.s +++ b/asm/src/HeapExp.s @@ -298,17 +298,17 @@ allocatorFree__Q33mem7HeapExp22AllocFromTailAllocatorFPv: __vt__Q23mem7HeapExp: .4byte 0 .4byte 0 - .byte4 __dt__Q23mem7HeapExpFv - .byte4 allocatorAlloc__Q23mem7HeapExpFUll - .byte4 allocatorFree__Q23mem7HeapExpFPv - .byte4 heapName__Q23mem7HeapExpCFv - .byte4 heapMemBlock__Q23mem7HeapExpCFv - .byte4 heapUsingBlockCount__Q23mem7HeapExpCFv - .byte4 heapDump__Q23mem7HeapExpCFv + .4byte __dt__Q23mem7HeapExpFv + .4byte allocatorAlloc__Q23mem7HeapExpFUll + .4byte allocatorFree__Q23mem7HeapExpFPv + .4byte heapName__Q23mem7HeapExpCFv + .4byte heapMemBlock__Q23mem7HeapExpCFv + .4byte heapUsingBlockCount__Q23mem7HeapExpCFv + .4byte heapDump__Q23mem7HeapExpCFv .global __vt__Q33mem7HeapExp22AllocFromTailAllocator __vt__Q33mem7HeapExp22AllocFromTailAllocator: .4byte 0 .4byte 0 - .byte4 __dt__Q33mem7HeapExp22AllocFromTailAllocatorFv - .byte4 allocatorAlloc__Q33mem7HeapExp22AllocFromTailAllocatorFUll - .byte4 allocatorFree__Q33mem7HeapExp22AllocFromTailAllocatorFPv + .4byte __dt__Q33mem7HeapExp22AllocFromTailAllocatorFv + .4byte allocatorAlloc__Q33mem7HeapExp22AllocFromTailAllocatorFUll + .4byte allocatorFree__Q33mem7HeapExp22AllocFromTailAllocatorFPv diff --git a/asm/src/HeapMapUserRepos.s b/asm/src/HeapMapUserRepos.s index b9b9be61..e77fee4e 100644 --- a/asm/src/HeapMapUserRepos.s +++ b/asm/src/HeapMapUserRepos.s @@ -155,7 +155,7 @@ __dt__Q33hel6common55MutableArray$$0PQ44nrel6devkit7heapmap12IHeapMapUser$$4512$ /* 801BEEB4 001BACF4 4B FB 6C B4 */ b __dt__Q23scn6ISceneFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3HeapMapUserRepos_cpp + .4byte __sinit_$$3HeapMapUserRepos_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$248741 diff --git a/asm/src/HeapUnit.s b/asm/src/HeapUnit.s index 12e94479..68779899 100644 --- a/asm/src/HeapUnit.s +++ b/asm/src/HeapUnit.s @@ -246,11 +246,11 @@ heapDump__Q23mem8HeapUnitCFv: __vt__Q23mem8HeapUnit: .4byte 0 .4byte 0 - .byte4 __dt__Q23mem8HeapUnitFv - .byte4 allocatorAlloc__Q23mem8HeapUnitFUll - .byte4 allocatorFree__Q23mem8HeapUnitFPv - .byte4 heapName__Q23mem8HeapUnitCFv - .byte4 heapMemBlock__Q23mem8HeapUnitCFv - .byte4 heapUsingBlockCount__Q23mem8HeapUnitCFv - .byte4 heapDump__Q23mem8HeapUnitCFv + .4byte __dt__Q23mem8HeapUnitFv + .4byte allocatorAlloc__Q23mem8HeapUnitFUll + .4byte allocatorFree__Q23mem8HeapUnitFPv + .4byte heapName__Q23mem8HeapUnitCFv + .4byte heapMemBlock__Q23mem8HeapUnitCFv + .4byte heapUsingBlockCount__Q23mem8HeapUnitCFv + .4byte heapDump__Q23mem8HeapUnitCFv .4byte 0 diff --git a/asm/src/Hero.s b/asm/src/Hero.s index f844d157..5d83a63c 100644 --- a/asm/src/Hero.s +++ b/asm/src/Hero.s @@ -8888,115 +8888,115 @@ $$287026: __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StatePiggyback$$4PQ43scn4step4hero4Hero$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StatePiggyback$$4PQ43scn4step4hero4Hero$$4b$$1Fv - .byte4 create__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StatePiggyback$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StatePiggyback$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte create__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StatePiggyback$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateAnyWhereIn$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateAnyWhereIn$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateAnyWhereIn$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateAnyWhereIn$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateAnyWhereIn$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateAnyWhereIn$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util99StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick13StateWarpStar$$4PQ43scn4step4hero4Hero$$4b$$4i$$1 __vt__Q24util99StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick13StateWarpStar$$4PQ43scn4step4hero4Hero$$4b$$4i$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick13StateWarpStar$$4PQ43scn4step4hero4Hero$$4b$$4i$$1Fv - .byte4 create__Q24util99StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick13StateWarpStar$$4PQ43scn4step4hero4Hero$$4b$$4i$$1Fv + .4byte __dt__Q24util99StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick13StateWarpStar$$4PQ43scn4step4hero4Hero$$4b$$4i$$1Fv + .4byte create__Q24util99StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick13StateWarpStar$$4PQ43scn4step4hero4Hero$$4b$$4i$$1Fv .global __vt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick15StateWarpStarIn$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1 __vt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick15StateWarpStarIn$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick15StateWarpStarIn$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1Fv - .byte4 create__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick15StateWarpStarIn$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1Fv + .4byte __dt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick15StateWarpStarIn$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1Fv + .4byte create__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick15StateWarpStarIn$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1Fv .global __vt__Q24util125StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateReturnWarpLowper$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4b$$1 __vt__Q24util125StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateReturnWarpLowper$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util125StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateReturnWarpLowper$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4b$$1Fv - .byte4 create__Q24util125StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateReturnWarpLowper$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4b$$1Fv + .4byte __dt__Q24util125StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateReturnWarpLowper$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4b$$1Fv + .4byte create__Q24util125StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateReturnWarpLowper$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4b$$1Fv .global __vt__Q24util121StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick19StateLeaveLvMapDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1 __vt__Q24util121StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick19StateLeaveLvMapDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util121StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick19StateLeaveLvMapDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv - .byte4 create__Q24util121StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick19StateLeaveLvMapDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv + .4byte __dt__Q24util121StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick19StateLeaveLvMapDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv + .4byte create__Q24util121StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick19StateLeaveLvMapDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv .global __vt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateLeaveChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1 __vt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateLeaveChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateLeaveChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv - .byte4 create__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateLeaveChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv + .4byte __dt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateLeaveChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv + .4byte create__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateLeaveChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChallengeIn$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChallengeIn$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChallengeIn$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChallengeIn$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChallengeIn$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChallengeIn$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateShipRepairDemo$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateShipRepairDemo$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateShipRepairDemo$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateShipRepairDemo$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateShipRepairDemo$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateShipRepairDemo$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common25StateShipRepairDemoFollow$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common25StateShipRepairDemoFollow$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common25StateShipRepairDemoFollow$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common25StateShipRepairDemoFollow$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common25StateShipRepairDemoFollow$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common25StateShipRepairDemoFollow$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common24StateShipRepairDemoAfter$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common24StateShipRepairDemoAfter$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common24StateShipRepairDemoAfter$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common24StateShipRepairDemoAfter$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common24StateShipRepairDemoAfter$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common24StateShipRepairDemoAfter$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common30StateShipRepairDemoAfterFollow$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common30StateShipRepairDemoAfterFollow$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common30StateShipRepairDemoAfterFollow$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common30StateShipRepairDemoAfterFollow$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common30StateShipRepairDemoAfterFollow$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common30StateShipRepairDemoAfterFollow$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateLeaveSubgameDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1 __vt__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateLeaveSubgameDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateLeaveSubgameDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv - .byte4 create__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateLeaveSubgameDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv + .4byte __dt__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateLeaveSubgameDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv + .4byte create__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateLeaveSubgameDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateFirstDemo$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateFirstDemo$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateFirstDemo$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateFirstDemo$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateFirstDemo$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateFirstDemo$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateInit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateInit$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateInit$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateInit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateInit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateInit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util112StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1 __vt__Q24util112StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util112StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv - .byte4 create__Q24util112StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv + .4byte __dt__Q24util112StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv + .4byte create__Q24util112StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv .global __vt__Q24util41StateChanger$$0Q43scn4step4hero6IState$$4256$$1 __vt__Q24util41StateChanger$$0Q43scn4step4hero6IState$$4256$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util41StateChanger$$0Q43scn4step4hero6IState$$4256$$1Fv + .4byte __dt__Q24util41StateChanger$$0Q43scn4step4hero6IState$$4256$$1Fv .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: .asciz "NW4R:Pointer must not be NULL (p)" diff --git a/asm/src/HeroPanelController.s b/asm/src/HeroPanelController.s index 5bc3b12f..5ab8ceb7 100644 --- a/asm/src/HeroPanelController.s +++ b/asm/src/HeroPanelController.s @@ -335,7 +335,7 @@ __sinit_$$3HeroPanelController_cpp: /* 803A9378 003A51B8 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3HeroPanelController_cpp + .4byte __sinit_$$3HeroPanelController_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252387 diff --git a/asm/src/HeroStatusIcon.s b/asm/src/HeroStatusIcon.s index 30a9087c..6d51a814 100644 --- a/asm/src/HeroStatusIcon.s +++ b/asm/src/HeroStatusIcon.s @@ -694,27 +694,27 @@ $$251681: .global T_ABILITY_KIND_TO_PATH__Q43scn4step4info28$$2unnamed$$2HeroStatusIcon_cpp$$2 T_ABILITY_KIND_TO_PATH__Q43scn4step4info28$$2unnamed$$2HeroStatusIcon_cpp$$2: .4byte 0 - .byte4 $$251661 - .byte4 $$251662 - .byte4 $$251663 - .byte4 $$251664 - .byte4 $$251665 - .byte4 $$251666 - .byte4 $$251667 - .byte4 $$251668 - .byte4 $$251669 - .byte4 $$251670 - .byte4 $$251671 - .byte4 $$251672 - .byte4 $$251673 - .byte4 $$251674 - .byte4 $$251675 - .byte4 $$251676 - .byte4 $$251677 - .byte4 $$251678 - .byte4 $$251679 - .byte4 $$251680 - .byte4 $$251681 + .4byte $$251661 + .4byte $$251662 + .4byte $$251663 + .4byte $$251664 + .4byte $$251665 + .4byte $$251666 + .4byte $$251667 + .4byte $$251668 + .4byte $$251669 + .4byte $$251670 + .4byte $$251671 + .4byte $$251672 + .4byte $$251673 + .4byte $$251674 + .4byte $$251675 + .4byte $$251676 + .4byte $$251677 + .4byte $$251678 + .4byte $$251679 + .4byte $$251680 + .4byte $$251681 .4byte 0 .4byte 0 .4byte 0 @@ -765,7 +765,7 @@ $$253211: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_ARC_PATH__Q43scn4step4info28$$2unnamed$$2HeroStatusIcon_cpp$$2 T_ARC_PATH__Q43scn4step4info28$$2unnamed$$2HeroStatusIcon_cpp$$2: - .byte4 $$251660 + .4byte $$251660 .global $$253023 $$253023: .asciz "IconN" diff --git a/asm/src/HidKindUtil.s b/asm/src/HidKindUtil.s index a5e7366f..3972c75d 100644 --- a/asm/src/HidKindUtil.s +++ b/asm/src/HidKindUtil.s @@ -224,60 +224,60 @@ $$248779: .global T_SCRIPT_PATH__Q43scn4step4hero25$$2unnamed$$2HidKindUtil_cpp$$2 T_SCRIPT_PATH__Q43scn4step4hero25$$2unnamed$$2HidKindUtil_cpp$$2: .4byte 0 - .byte4 $$248723 - .byte4 $$248724 - .byte4 $$248725 - .byte4 $$248726 - .byte4 $$248727 - .byte4 $$248728 - .byte4 $$248729 - .byte4 $$248730 - .byte4 $$248731 - .byte4 $$248732 - .byte4 $$248733 - .byte4 $$248734 - .byte4 $$248735 - .byte4 $$248736 - .byte4 $$248737 - .byte4 $$248738 - .byte4 $$248739 - .byte4 $$248740 - .byte4 $$248741 - .byte4 $$248742 - .byte4 $$248743 - .byte4 $$248744 - .byte4 $$248745 - .byte4 $$248746 - .byte4 $$248747 - .byte4 $$248748 - .byte4 $$248749 - .byte4 $$248750 - .byte4 $$248751 - .byte4 $$248752 - .byte4 $$248753 - .byte4 $$248754 - .byte4 $$248755 - .byte4 $$248756 - .byte4 $$248757 - .byte4 $$248758 - .byte4 $$248759 - .byte4 $$248760 - .byte4 $$248761 - .byte4 $$248762 - .byte4 $$248763 - .byte4 $$248764 - .byte4 $$248765 - .byte4 $$248766 - .byte4 $$248767 - .byte4 $$248768 - .byte4 $$248769 - .byte4 $$248770 - .byte4 $$248771 - .byte4 $$248772 - .byte4 $$248773 - .byte4 $$248774 - .byte4 $$248775 - .byte4 $$248776 - .byte4 $$248777 - .byte4 $$248778 - .byte4 $$248779 + .4byte $$248723 + .4byte $$248724 + .4byte $$248725 + .4byte $$248726 + .4byte $$248727 + .4byte $$248728 + .4byte $$248729 + .4byte $$248730 + .4byte $$248731 + .4byte $$248732 + .4byte $$248733 + .4byte $$248734 + .4byte $$248735 + .4byte $$248736 + .4byte $$248737 + .4byte $$248738 + .4byte $$248739 + .4byte $$248740 + .4byte $$248741 + .4byte $$248742 + .4byte $$248743 + .4byte $$248744 + .4byte $$248745 + .4byte $$248746 + .4byte $$248747 + .4byte $$248748 + .4byte $$248749 + .4byte $$248750 + .4byte $$248751 + .4byte $$248752 + .4byte $$248753 + .4byte $$248754 + .4byte $$248755 + .4byte $$248756 + .4byte $$248757 + .4byte $$248758 + .4byte $$248759 + .4byte $$248760 + .4byte $$248761 + .4byte $$248762 + .4byte $$248763 + .4byte $$248764 + .4byte $$248765 + .4byte $$248766 + .4byte $$248767 + .4byte $$248768 + .4byte $$248769 + .4byte $$248770 + .4byte $$248771 + .4byte $$248772 + .4byte $$248773 + .4byte $$248774 + .4byte $$248775 + .4byte $$248776 + .4byte $$248777 + .4byte $$248778 + .4byte $$248779 diff --git a/asm/src/Hit.s b/asm/src/Hit.s index cb2fcb6b..0d100018 100644 --- a/asm/src/Hit.s +++ b/asm/src/Hit.s @@ -712,5 +712,5 @@ sortResult__Q25ocoll3HitFv: __vt__Q25ocoll3Hit: .4byte 0 .4byte 0 - .byte4 __dt__Q25ocoll3HitFv + .4byte __dt__Q25ocoll3HitFv .4byte 0 diff --git a/asm/src/HitStopCallback.s b/asm/src/HitStopCallback.s index 0a00914d..01f7be9b 100644 --- a/asm/src/HitStopCallback.s +++ b/asm/src/HitStopCallback.s @@ -262,9 +262,9 @@ onEnd__Q43scn4step6weapon15HitStopCallbackFv: __vt__Q43scn4step4boss15HitStopCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4boss15HitStopCallbackFv - .byte4 onStart__Q43scn4step4boss15HitStopCallbackFv - .byte4 onEnd__Q43scn4step4boss15HitStopCallbackFv + .4byte __dt__Q43scn4step4boss15HitStopCallbackFv + .4byte onStart__Q43scn4step4boss15HitStopCallbackFv + .4byte onEnd__Q43scn4step4boss15HitStopCallbackFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -272,9 +272,9 @@ __vt__Q43scn4step4boss15HitStopCallback: __vt__Q43scn4step5enemy15HitStopCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step5enemy15HitStopCallbackFv - .byte4 onStart__Q43scn4step5enemy15HitStopCallbackFv - .byte4 onEnd__Q43scn4step5enemy15HitStopCallbackFv + .4byte __dt__Q43scn4step5enemy15HitStopCallbackFv + .4byte onStart__Q43scn4step5enemy15HitStopCallbackFv + .4byte onEnd__Q43scn4step5enemy15HitStopCallbackFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -282,9 +282,9 @@ __vt__Q43scn4step5enemy15HitStopCallback: __vt__Q43scn4step4hero15HitStopCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4hero15HitStopCallbackFv - .byte4 onStart__Q43scn4step4hero15HitStopCallbackFv - .byte4 onEnd__Q43scn4step4hero15HitStopCallbackFv + .4byte __dt__Q43scn4step4hero15HitStopCallbackFv + .4byte onStart__Q43scn4step4hero15HitStopCallbackFv + .4byte onEnd__Q43scn4step4hero15HitStopCallbackFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -292,7 +292,7 @@ __vt__Q43scn4step4hero15HitStopCallback: __vt__Q43scn4step6weapon15HitStopCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step6weapon15HitStopCallbackFv - .byte4 onStart__Q43scn4step6weapon15HitStopCallbackFv - .byte4 onEnd__Q43scn4step6weapon15HitStopCallbackFv + .4byte __dt__Q43scn4step6weapon15HitStopCallbackFv + .4byte onStart__Q43scn4step6weapon15HitStopCallbackFv + .4byte onEnd__Q43scn4step6weapon15HitStopCallbackFv .4byte 0 diff --git a/asm/src/InactiveHero.s b/asm/src/InactiveHero.s index d0f33bc7..e26bafef 100644 --- a/asm/src/InactiveHero.s +++ b/asm/src/InactiveHero.s @@ -647,19 +647,19 @@ __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8inactive9St __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8inactive9StateInit$$4PQ43scn4step4hero12InactiveHero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8inactive9StateInit$$4PQ43scn4step4hero12InactiveHero$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8inactive9StateInit$$4PQ43scn4step4hero12InactiveHero$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8inactive9StateInit$$4PQ43scn4step4hero12InactiveHero$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8inactive9StateInit$$4PQ43scn4step4hero12InactiveHero$$1Fv .global __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero8inactive11StateSelect$$4PQ43scn4step4hero12InactiveHero$$4b$$1 __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero8inactive11StateSelect$$4PQ43scn4step4hero12InactiveHero$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero8inactive11StateSelect$$4PQ43scn4step4hero12InactiveHero$$4b$$1Fv - .byte4 create__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero8inactive11StateSelect$$4PQ43scn4step4hero12InactiveHero$$4b$$1Fv + .4byte __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero8inactive11StateSelect$$4PQ43scn4step4hero12InactiveHero$$4b$$1Fv + .4byte create__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero8inactive11StateSelect$$4PQ43scn4step4hero12InactiveHero$$4b$$1Fv .global __vt__Q24util50StateChanger$$0Q43scn4step4hero14IInactiveState$$4256$$1 __vt__Q24util50StateChanger$$0Q43scn4step4hero14IInactiveState$$4256$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util50StateChanger$$0Q43scn4step4hero14IInactiveState$$4256$$1Fv + .4byte __dt__Q24util50StateChanger$$0Q43scn4step4hero14IInactiveState$$4256$$1Fv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/InactiveStateBase.s b/asm/src/InactiveStateBase.s index 63a485ab..60f69280 100644 --- a/asm/src/InactiveStateBase.s +++ b/asm/src/InactiveStateBase.s @@ -45,5 +45,5 @@ lbl_80341870: __vt__Q43scn4step4hero17InactiveStateBase: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4hero17InactiveStateBaseFv - .byte4 proc__Q43scn4step4hero17InactiveStateBaseFv + .4byte __dt__Q43scn4step4hero17InactiveStateBaseFv + .4byte proc__Q43scn4step4hero17InactiveStateBaseFv diff --git a/asm/src/InactiveStateCallback.s b/asm/src/InactiveStateCallback.s index 69ee0aa9..1e54d2cd 100644 --- a/asm/src/InactiveStateCallback.s +++ b/asm/src/InactiveStateCallback.s @@ -18,5 +18,5 @@ onStateChanged__Q43scn4step4hero21InactiveStateCallbackFRCQ24util13IStateChanger __vt__Q43scn4step4hero21InactiveStateCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4hero21InactiveStateCallbackFv - .byte4 onStateChanged__Q43scn4step4hero21InactiveStateCallbackFRCQ24util13IStateChanger + .4byte __dt__Q43scn4step4hero21InactiveStateCallbackFv + .4byte onStateChanged__Q43scn4step4hero21InactiveStateCallbackFRCQ24util13IStateChanger diff --git a/asm/src/IndiviUtil.s b/asm/src/IndiviUtil.s index 70b096ab..623e5492 100644 --- a/asm/src/IndiviUtil.s +++ b/asm/src/IndiviUtil.s @@ -562,227 +562,227 @@ lbl_803D6590: /* 803D65A4 003D23E4 4E 80 04 20 */ bctr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3IndiviUtil_cpp + .4byte __sinit_$$3IndiviUtil_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_INDIVI_TABLE__Q43scn4step6weapon24$$2unnamed$$2IndiviUtil_cpp$$2 T_INDIVI_TABLE__Q43scn4step6weapon24$$2unnamed$$2IndiviUtil_cpp$$2: - .byte4 Create__Q53scn4step6weapon11starshotlv19ModelDescFv + .4byte Create__Q53scn4step6weapon11starshotlv19ModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon11starshotlv29ModelDescFv + .4byte Create__Q53scn4step6weapon11starshotlv29ModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon11starshotlv39ModelDescFv + .4byte Create__Q53scn4step6weapon11starshotlv39ModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon7airball9ModelDescFv + .4byte Create__Q53scn4step6weapon7airball9ModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon13whispyairball9ModelDescFv - .byte4 CreateEx__Q53scn4step6weapon13whispyairball9ModelDescFv - .byte4 Create__Q53scn4step6weapon10comothread9ModelDescFv + .4byte Create__Q53scn4step6weapon13whispyairball9ModelDescFv + .4byte CreateEx__Q53scn4step6weapon13whispyairball9ModelDescFv + .4byte Create__Q53scn4step6weapon10comothread9ModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon15sirkibblecutter9ModelDescFv + .4byte Create__Q53scn4step6weapon15sirkibblecutter9ModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon12shotzobullet9ModelDescFv + .4byte Create__Q53scn4step6weapon12shotzobullet9ModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon12leafanpollen9ModelDescFv + .4byte Create__Q53scn4step6weapon12leafanpollen9ModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon10spearspear9ModelDescFv + .4byte Create__Q53scn4step6weapon10spearspear9ModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon12hammerhammer9ModelDescFv + .4byte Create__Q53scn4step6weapon12hammerhammer9ModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon8wingshot9ModelDescFv + .4byte Create__Q53scn4step6weapon8wingshot9ModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon16enemywaterbullet9ModelDescFv + .4byte Create__Q53scn4step6weapon16enemywaterbullet9ModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon20enemywaterbulletwarp9ModelDescFv + .4byte Create__Q53scn4step6weapon20enemywaterbulletwarp9ModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon13gigatzobullet9ModelDescFv + .4byte Create__Q53scn4step6weapon13gigatzobullet9ModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon13owgulffeather9ModelDescFv + .4byte Create__Q53scn4step6weapon13owgulffeather9ModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon9foleyleaf9ModelDescFv + .4byte Create__Q53scn4step6weapon9foleyleaf9ModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon10bowbyarrow9ModelDescFv + .4byte Create__Q53scn4step6weapon10bowbyarrow9ModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon12jucklecutter9ModelDescFv + .4byte Create__Q53scn4step6weapon12jucklecutter9ModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon17tsukikageshuriken9ModelDescFv + .4byte Create__Q53scn4step6weapon17tsukikageshuriken9ModelDescFv .4byte 0 - .byte4 CreateVolt__Q53scn4step6weapon13gigatzobullet9ModelDescFv + .4byte CreateVolt__Q53scn4step6weapon13gigatzobullet9ModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 CreateCold__Q53scn4step6weapon13gigatzobullet9ModelDescFv + .4byte CreateCold__Q53scn4step6weapon13gigatzobullet9ModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon10whispyroot9ModelDescFv + .4byte Create__Q53scn4step6weapon10whispyroot9ModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon18combinationairball9ModelDescFv + .4byte Create__Q53scn4step6weapon18combinationairball9ModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon18combinationdeeshot9ModelDescFv + .4byte Create__Q53scn4step6weapon18combinationdeeshot9ModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon12dededehammer9ModelDescFv + .4byte Create__Q53scn4step6weapon12dededehammer9ModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon8deespear9ModelDescFv + .4byte Create__Q53scn4step6weapon8deespear9ModelDescFv .4byte 0 - .byte4 CreateStar__Q53scn4step6weapon13vacuumedblock9ModelDescFv + .4byte CreateStar__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .byte4 CreateHeavy1x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv + .4byte CreateHeavy1x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .byte4 CreateHeavy2x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv + .4byte CreateHeavy2x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .byte4 CreateHeavy3x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv + .4byte CreateHeavy3x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .byte4 CreateHeavy4x4__Q53scn4step6weapon13vacuumedblock9ModelDescFv + .4byte CreateHeavy4x4__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .byte4 CreateHeavyA1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv + .4byte CreateHeavyA1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .byte4 CreateHeavyB1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv + .4byte CreateHeavyB1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .byte4 CreateHeavy1x2x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv + .4byte CreateHeavy1x2x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .byte4 CreateHeavy1x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv + .4byte CreateHeavy1x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .byte4 CreateHeavy3x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv + .4byte CreateHeavy3x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .byte4 CreateHeavy2x4x4x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv + .4byte CreateHeavy2x4x4x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .byte4 CreateHeavy3x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv + .4byte CreateHeavy3x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .byte4 CreateHalcan__Q53scn4step6weapon10bowbyarrow9ModelDescFv + .4byte CreateHalcan__Q53scn4step6weapon10bowbyarrow9ModelDescFv .4byte 0 - .byte4 Create__Q53scn4step6weapon11hotheadfire9ModelDescFv + .4byte Create__Q53scn4step6weapon11hotheadfire9ModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv + .4byte Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2 T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: - .byte4 Create__Q53scn4step5enemy9sirkibble9ModelDescFv - .byte4 Create__Q53scn4step5enemy9sirkibble10CharaParamFv + .4byte Create__Q53scn4step5enemy9sirkibble9ModelDescFv + .4byte Create__Q53scn4step5enemy9sirkibble10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy10brontoburt9ModelDescFv - .byte4 Create__Q53scn4step5enemy10brontoburt10CharaParamFv + .4byte Create__Q53scn4step5enemy10brontoburt9ModelDescFv + .4byte Create__Q53scn4step5enemy10brontoburt10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy9waddledee9ModelDescFv - .byte4 Create__Q53scn4step5enemy9waddledee10CharaParamFv + .4byte Create__Q53scn4step5enemy9waddledee9ModelDescFv + .4byte Create__Q53scn4step5enemy9waddledee10CharaParamFv .4byte 0 - .byte4 CreateNormal__Q53scn4step5enemy11bladeknight9ModelDescFv - .byte4 Create__Q53scn4step5enemy11bladeknight10CharaParamFv + .4byte CreateNormal__Q53scn4step5enemy11bladeknight9ModelDescFv + .4byte Create__Q53scn4step5enemy11bladeknight10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy5cappy9ModelDescFv - .byte4 Create__Q53scn4step5enemy5cappy10CharaParamFv + .4byte Create__Q53scn4step5enemy5cappy9ModelDescFv + .4byte Create__Q53scn4step5enemy5cappy10CharaParamFv .4byte 0 - .byte4 CreateNormal__Q53scn4step5enemy7hothead9ModelDescFv - .byte4 Create__Q53scn4step5enemy7hothead10CharaParamFv + .4byte CreateNormal__Q53scn4step5enemy7hothead9ModelDescFv + .4byte Create__Q53scn4step5enemy7hothead10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy10knucklejoe9ModelDescFv - .byte4 Create__Q53scn4step5enemy10knucklejoe10CharaParamFv + .4byte Create__Q53scn4step5enemy10knucklejoe9ModelDescFv + .4byte Create__Q53scn4step5enemy10knucklejoe10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy9puppetdee9ModelDescFv - .byte4 Create__Q53scn4step5enemy9puppetdee10CharaParamFv + .4byte Create__Q53scn4step5enemy9puppetdee9ModelDescFv + .4byte Create__Q53scn4step5enemy9puppetdee10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy8armordee9ModelDescFv - .byte4 Create__Q53scn4step5enemy8armordee10CharaParamFv + .4byte Create__Q53scn4step5enemy8armordee9ModelDescFv + .4byte Create__Q53scn4step5enemy8armordee10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy4como9ModelDescFv - .byte4 Create__Q53scn4step5enemy4como10CharaParamFv + .4byte Create__Q53scn4step5enemy4como9ModelDescFv + .4byte Create__Q53scn4step5enemy4como10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy5gordo9ModelDescFv - .byte4 Create__Q53scn4step5enemy5gordo10CharaParamFv + .4byte Create__Q53scn4step5enemy5gordo9ModelDescFv + .4byte Create__Q53scn4step5enemy5gordo10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy6whippy9ModelDescFv - .byte4 Create__Q53scn4step5enemy6whippy10CharaParamFv + .4byte Create__Q53scn4step5enemy6whippy9ModelDescFv + .4byte Create__Q53scn4step5enemy6whippy10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy6shotzo9ModelDescFv - .byte4 Create__Q53scn4step5enemy6shotzo10CharaParamFv + .4byte Create__Q53scn4step5enemy6shotzo9ModelDescFv + .4byte Create__Q53scn4step5enemy6shotzo10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy6leafan9ModelDescFv - .byte4 Create__Q53scn4step5enemy6leafan10CharaParamFv + .4byte Create__Q53scn4step5enemy6leafan9ModelDescFv + .4byte Create__Q53scn4step5enemy6leafan10CharaParamFv .4byte 0 - .byte4 CreateNormal__Q53scn4step5enemy9waddledoo9ModelDescFv - .byte4 Create__Q53scn4step5enemy9waddledoo10CharaParamFv + .4byte CreateNormal__Q53scn4step5enemy9waddledoo9ModelDescFv + .4byte Create__Q53scn4step5enemy9waddledoo10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy6bouncy9ModelDescFv - .byte4 Create__Q53scn4step5enemy6bouncy10CharaParamFv + .4byte Create__Q53scn4step5enemy6bouncy9ModelDescFv + .4byte Create__Q53scn4step5enemy6bouncy10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy6sparky9ModelDescFv - .byte4 Create__Q53scn4step5enemy6sparky10CharaParamFv + .4byte Create__Q53scn4step5enemy6sparky9ModelDescFv + .4byte Create__Q53scn4step5enemy6sparky10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy8needlous9ModelDescFv - .byte4 Create__Q53scn4step5enemy8needlous10CharaParamFv + .4byte Create__Q53scn4step5enemy8needlous9ModelDescFv + .4byte Create__Q53scn4step5enemy8needlous10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy11broomhatter9ModelDescFv - .byte4 Create__Q53scn4step5enemy11broomhatter10CharaParamFv + .4byte Create__Q53scn4step5enemy11broomhatter9ModelDescFv + .4byte Create__Q53scn4step5enemy11broomhatter10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy6scarfy9ModelDescFv - .byte4 Create__Q53scn4step5enemy6scarfy10CharaParamFv + .4byte Create__Q53scn4step5enemy6scarfy9ModelDescFv + .4byte Create__Q53scn4step5enemy6scarfy10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy5nruff9ModelDescFv - .byte4 Create__Q53scn4step5enemy5nruff10CharaParamFv + .4byte Create__Q53scn4step5enemy5nruff9ModelDescFv + .4byte Create__Q53scn4step5enemy5nruff10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy6flamer9ModelDescFv - .byte4 Create__Q53scn4step5enemy6flamer10CharaParamFv + .4byte Create__Q53scn4step5enemy6flamer9ModelDescFv + .4byte Create__Q53scn4step5enemy6flamer10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy10watergalbo9ModelDescFv - .byte4 Create__Q53scn4step5enemy10watergalbo10CharaParamFv + .4byte Create__Q53scn4step5enemy10watergalbo9ModelDescFv + .4byte Create__Q53scn4step5enemy10watergalbo10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy5rocky9ModelDescFv - .byte4 Create__Q53scn4step5enemy5rocky10CharaParamFv + .4byte Create__Q53scn4step5enemy5rocky9ModelDescFv + .4byte Create__Q53scn4step5enemy5rocky10CharaParamFv .4byte 0 .4byte 0 .4byte 0 @@ -793,20 +793,20 @@ T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy10poppybrojr9ModelDescFv - .byte4 Create__Q53scn4step5enemy10poppybrojr10CharaParamFv + .4byte Create__Q53scn4step5enemy10poppybrojr9ModelDescFv + .4byte Create__Q53scn4step5enemy10poppybrojr10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy5noddy9ModelDescFv - .byte4 Create__Q53scn4step5enemy5noddy10CharaParamFv + .4byte Create__Q53scn4step5enemy5noddy9ModelDescFv + .4byte Create__Q53scn4step5enemy5noddy10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy8cerulean9ModelDescFv - .byte4 Create__Q53scn4step5enemy8cerulean10CharaParamFv + .4byte Create__Q53scn4step5enemy8cerulean9ModelDescFv + .4byte Create__Q53scn4step5enemy8cerulean10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy7blipper9ModelDescFv - .byte4 Create__Q53scn4step5enemy7blipper10CharaParamFv + .4byte Create__Q53scn4step5enemy7blipper9ModelDescFv + .4byte Create__Q53scn4step5enemy7blipper10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy7gigatzo9ModelDescFv - .byte4 Create__Q53scn4step5enemy7gigatzo10CharaParamFv + .4byte Create__Q53scn4step5enemy7gigatzo9ModelDescFv + .4byte Create__Q53scn4step5enemy7gigatzo10CharaParamFv .4byte 0 .4byte 0 .4byte 0 @@ -814,59 +814,59 @@ T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy11sisterbound9ModelDescFv - .byte4 Create__Q53scn4step5enemy11sisterbound10CharaParamFv + .4byte Create__Q53scn4step5enemy11sisterbound9ModelDescFv + .4byte Create__Q53scn4step5enemy11sisterbound10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy8rollball9ModelDescFv - .byte4 Create__Q53scn4step5enemy8rollball10CharaParamFv + .4byte Create__Q53scn4step5enemy8rollball9ModelDescFv + .4byte Create__Q53scn4step5enemy8rollball10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy7mumbies9ModelDescFv - .byte4 Create__Q53scn4step5enemy7mumbies10CharaParamFv + .4byte Create__Q53scn4step5enemy7mumbies9ModelDescFv + .4byte Create__Q53scn4step5enemy7mumbies10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy9waddledee9ModelDescFv - .byte4 Create__Q53scn4step5enemy10parasoldee10CharaParamFv + .4byte Create__Q53scn4step5enemy9waddledee9ModelDescFv + .4byte Create__Q53scn4step5enemy10parasoldee10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy4kabu9ModelDescFv - .byte4 Create__Q53scn4step5enemy4kabu10CharaParamFv + .4byte Create__Q53scn4step5enemy4kabu9ModelDescFv + .4byte Create__Q53scn4step5enemy4kabu10CharaParamFv .4byte 0 - .byte4 CreateNormal__Q53scn4step5enemy9waddledoo9ModelDescFv - .byte4 Create__Q53scn4step5enemy10parasoldoo10CharaParamFv + .4byte CreateNormal__Q53scn4step5enemy9waddledoo9ModelDescFv + .4byte Create__Q53scn4step5enemy10parasoldoo10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy5foley9ModelDescFv - .byte4 Create__Q53scn4step5enemy5foley10CharaParamFv + .4byte Create__Q53scn4step5enemy5foley9ModelDescFv + .4byte Create__Q53scn4step5enemy5foley10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy6juckle9ModelDescFv - .byte4 Create__Q53scn4step5enemy6juckle10CharaParamFv + .4byte Create__Q53scn4step5enemy6juckle9ModelDescFv + .4byte Create__Q53scn4step5enemy6juckle10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy5bowby9ModelDescFv - .byte4 Create__Q53scn4step5enemy5bowby10CharaParamFv + .4byte Create__Q53scn4step5enemy5bowby9ModelDescFv + .4byte Create__Q53scn4step5enemy5bowby10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy6owgulf9ModelDescFv - .byte4 Create__Q53scn4step5enemy6owgulf10CharaParamFv + .4byte Create__Q53scn4step5enemy6owgulf9ModelDescFv + .4byte Create__Q53scn4step5enemy6owgulf10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy6degout9ModelDescFv - .byte4 Create__Q53scn4step5enemy6degout10CharaParamFv + .4byte Create__Q53scn4step5enemy6degout9ModelDescFv + .4byte Create__Q53scn4step5enemy6degout10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy5sheld9ModelDescFv - .byte4 Create__Q53scn4step5enemy5sheld10CharaParamFv + .4byte Create__Q53scn4step5enemy5sheld9ModelDescFv + .4byte Create__Q53scn4step5enemy5sheld10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy6lanzer9ModelDescFv - .byte4 Create__Q53scn4step5enemy6lanzer10CharaParamFv + .4byte Create__Q53scn4step5enemy6lanzer9ModelDescFv + .4byte Create__Q53scn4step5enemy6lanzer10CharaParamFv .4byte 0 - .byte4 CreateNormal__Q53scn4step5enemy6chilly9ModelDescFv - .byte4 Create__Q53scn4step5enemy6chilly10CharaParamFv + .4byte CreateNormal__Q53scn4step5enemy6chilly9ModelDescFv + .4byte Create__Q53scn4step5enemy6chilly10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy9tsukikage9ModelDescFv - .byte4 Create__Q53scn4step5enemy9tsukikage10CharaParamFv + .4byte Create__Q53scn4step5enemy9tsukikage9ModelDescFv + .4byte Create__Q53scn4step5enemy9tsukikage10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy5gemra9ModelDescFv - .byte4 Create__Q53scn4step5enemy5gemra10CharaParamFv + .4byte Create__Q53scn4step5enemy5gemra9ModelDescFv + .4byte Create__Q53scn4step5enemy5gemra10CharaParamFv .4byte 0 .4byte 0 .4byte 0 @@ -874,8 +874,8 @@ T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 CreateVolt__Q53scn4step5enemy7gigatzo9ModelDescFv - .byte4 Create__Q53scn4step5enemy7gigatzo10CharaParamFv + .4byte CreateVolt__Q53scn4step5enemy7gigatzo9ModelDescFv + .4byte Create__Q53scn4step5enemy7gigatzo10CharaParamFv .4byte 0 .4byte 0 .4byte 0 @@ -889,17 +889,17 @@ T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy6pierce9ModelDescFv - .byte4 Create__Q53scn4step5enemy6pierce10CharaParamFv + .4byte Create__Q53scn4step5enemy6pierce9ModelDescFv + .4byte Create__Q53scn4step5enemy6pierce10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy8searches9ModelDescFv - .byte4 Create__Q53scn4step5enemy8searches10CharaParamFv + .4byte Create__Q53scn4step5enemy8searches9ModelDescFv + .4byte Create__Q53scn4step5enemy8searches10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy4elec9ModelDescFv - .byte4 Create__Q53scn4step5enemy4elec10CharaParamFv + .4byte Create__Q53scn4step5enemy4elec9ModelDescFv + .4byte Create__Q53scn4step5enemy4elec10CharaParamFv .4byte 0 .4byte 0 .4byte 0 @@ -907,23 +907,23 @@ T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy6sodory9ModelDescFv - .byte4 Create__Q53scn4step5enemy6sodory10CharaParamFv + .4byte Create__Q53scn4step5enemy6sodory9ModelDescFv + .4byte Create__Q53scn4step5enemy6sodory10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy5snowl9ModelDescFv - .byte4 Create__Q53scn4step5enemy5snowl10CharaParamFv + .4byte Create__Q53scn4step5enemy5snowl9ModelDescFv + .4byte Create__Q53scn4step5enemy5snowl10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 HalcandledeeCreate__Q53scn4step5enemy9waddledee9ModelDescFv - .byte4 Create__Q53scn4step5enemy9waddledee10CharaParamFv + .4byte HalcandledeeCreate__Q53scn4step5enemy9waddledee9ModelDescFv + .4byte Create__Q53scn4step5enemy9waddledee10CharaParamFv .4byte 0 - .byte4 CreateCold__Q53scn4step5enemy7gigatzo9ModelDescFv - .byte4 Create__Q53scn4step5enemy7gigatzo10CharaParamFv + .4byte CreateCold__Q53scn4step5enemy7gigatzo9ModelDescFv + .4byte Create__Q53scn4step5enemy7gigatzo10CharaParamFv .4byte 0 .4byte 0 .4byte 0 @@ -943,8 +943,8 @@ T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy9waddledee9ModelDescFv - .byte4 Create__Q53scn4step5enemy8toughdee10CharaParamFv + .4byte Create__Q53scn4step5enemy9waddledee9ModelDescFv + .4byte Create__Q53scn4step5enemy8toughdee10CharaParamFv .4byte 0 .4byte 0 .4byte 0 @@ -958,8 +958,8 @@ T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 HalcandleCreate__Q53scn4step5enemy10brontoburt9ModelDescFv - .byte4 Create__Q53scn4step5enemy10brontoburt10CharaParamFv + .4byte HalcandleCreate__Q53scn4step5enemy10brontoburt9ModelDescFv + .4byte Create__Q53scn4step5enemy10brontoburt10CharaParamFv .4byte 0 .4byte 0 .4byte 0 @@ -979,23 +979,23 @@ T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy7sandbag9ModelDescFv - .byte4 Create__Q53scn4step5enemy7sandbag10CharaParamFv + .4byte Create__Q53scn4step5enemy7sandbag9ModelDescFv + .4byte Create__Q53scn4step5enemy7sandbag10CharaParamFv .4byte 0 - .byte4 HalcandledeeCreate__Q53scn4step5enemy9waddledee9ModelDescFv - .byte4 Create__Q53scn4step5enemy10parasoldee10CharaParamFv + .4byte HalcandledeeCreate__Q53scn4step5enemy9waddledee9ModelDescFv + .4byte Create__Q53scn4step5enemy10parasoldee10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 HalcandleCreate__Q53scn4step5enemy5bowby9ModelDescFv - .byte4 Create__Q53scn4step5enemy5bowby10CharaParamFv + .4byte HalcandleCreate__Q53scn4step5enemy5bowby9ModelDescFv + .4byte Create__Q53scn4step5enemy5bowby10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy3sun9ModelDescFv - .byte4 Create__Q53scn4step5enemy3sun10CharaParamFv + .4byte Create__Q53scn4step5enemy3sun9ModelDescFv + .4byte Create__Q53scn4step5enemy3sun10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy3sun9ModelDescFv - .byte4 Create__Q53scn4step5enemy3sun10CharaParamFv + .4byte Create__Q53scn4step5enemy3sun9ModelDescFv + .4byte Create__Q53scn4step5enemy3sun10CharaParamFv .4byte 0 .4byte 0 .4byte 0 @@ -1003,17 +1003,17 @@ T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 CreateMaster__Q53scn4step5enemy8rollball9ModelDescFv - .byte4 Create__Q53scn4step5enemy8rollball10CharaParamFv + .4byte CreateMaster__Q53scn4step5enemy8rollball9ModelDescFv + .4byte Create__Q53scn4step5enemy8rollball10CharaParamFv .4byte 0 - .byte4 GoldCreate__Q53scn4step5enemy9waddledee9ModelDescFv - .byte4 CreateGold__Q53scn4step5enemy9waddledee10CharaParamFv + .4byte GoldCreate__Q53scn4step5enemy9waddledee9ModelDescFv + .4byte CreateGold__Q53scn4step5enemy9waddledee10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy10stareffect9ModelDescFv - .byte4 Create__Q53scn4step5enemy10stareffect10CharaParamFv + .4byte Create__Q53scn4step5enemy10stareffect9ModelDescFv + .4byte Create__Q53scn4step5enemy10stareffect10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy8cappyhat9ModelDescFv - .byte4 Create__Q53scn4step5enemy8cappyhat10CharaParamFv + .4byte Create__Q53scn4step5enemy8cappyhat9ModelDescFv + .4byte Create__Q53scn4step5enemy8cappyhat10CharaParamFv .4byte 0 .4byte 0 .4byte 0 @@ -1027,8 +1027,8 @@ T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy11whispyapple9ModelDescFv - .byte4 Create__Q53scn4step5enemy11whispyapple10CharaParamFv + .4byte Create__Q53scn4step5enemy11whispyapple9ModelDescFv + .4byte Create__Q53scn4step5enemy11whispyapple10CharaParamFv .4byte 0 .4byte 0 .4byte 0 @@ -1048,26 +1048,26 @@ T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy7parasol9ModelDescFv - .byte4 Create__Q53scn4step5enemy7parasol10CharaParamFv + .4byte Create__Q53scn4step5enemy7parasol9ModelDescFv + .4byte Create__Q53scn4step5enemy7parasol10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy8dubiorjr9ModelDescFv - .byte4 Create__Q53scn4step5enemy8dubiorjr10CharaParamFv - .byte4 CreateEx__Q53scn4step5enemy8dubiorjr9ModelDescFv - .byte4 Create__Q53scn4step5enemy14poppybrojrbomb9ModelDescFv - .byte4 Create__Q53scn4step5enemy14poppybrojrbomb10CharaParamFv + .4byte Create__Q53scn4step5enemy8dubiorjr9ModelDescFv + .4byte Create__Q53scn4step5enemy8dubiorjr10CharaParamFv + .4byte CreateEx__Q53scn4step5enemy8dubiorjr9ModelDescFv + .4byte Create__Q53scn4step5enemy14poppybrojrbomb9ModelDescFv + .4byte Create__Q53scn4step5enemy14poppybrojrbomb10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy15zankibblecutter9ModelDescFv - .byte4 Create__Q53scn4step5enemy15zankibblecutter10CharaParamFv + .4byte Create__Q53scn4step5enemy15zankibblecutter9ModelDescFv + .4byte Create__Q53scn4step5enemy15zankibblecutter10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy11bonkersbomb9ModelDescFv - .byte4 Create__Q53scn4step5enemy11bonkersbomb10CharaParamFv + .4byte Create__Q53scn4step5enemy11bonkersbomb9ModelDescFv + .4byte Create__Q53scn4step5enemy11bonkersbomb10CharaParamFv .4byte 0 - .byte4 Create__Q53scn4step5enemy11dubiorspark9ModelDescFv - .byte4 Create__Q53scn4step5enemy11dubiorspark10CharaParamFv + .4byte Create__Q53scn4step5enemy11dubiorspark9ModelDescFv + .4byte Create__Q53scn4step5enemy11dubiorspark10CharaParamFv .4byte 0 .4byte 0 .4byte 0 @@ -1117,8 +1117,8 @@ T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy9mbossdead9ModelDescFv - .byte4 Create__Q53scn4step5enemy9mbossdead10CharaParamFv + .4byte Create__Q53scn4step5enemy9mbossdead9ModelDescFv + .4byte Create__Q53scn4step5enemy9mbossdead10CharaParamFv .4byte 0 .4byte 0 .4byte 0 @@ -1147,8 +1147,8 @@ T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step5enemy5cappy9ModelDescFv - .byte4 CreateSkinned__Q53scn4step5enemy5cappy10CharaParamFv + .4byte Create__Q53scn4step5enemy5cappy9ModelDescFv + .4byte CreateSkinned__Q53scn4step5enemy5cappy10CharaParamFv .4byte 0 .4byte 0 @@ -1169,10 +1169,10 @@ $$252525: .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: - .byte4 Create__Q53scn4step5enemy9waddledee9ModelDescFv + .4byte Create__Q53scn4step5enemy9waddledee9ModelDescFv .global T_CHARA_PARAM_DESC_FUNC_DUMMY__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2 T_CHARA_PARAM_DESC_FUNC_DUMMY__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: - .byte4 Create__Q53scn4step5enemy6common9ParamBaseFv + .4byte Create__Q53scn4step5enemy6common9ParamBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252509 diff --git a/asm/src/InfoGameStatus.s b/asm/src/InfoGameStatus.s index 3f28619a..57239a5c 100644 --- a/asm/src/InfoGameStatus.s +++ b/asm/src/InfoGameStatus.s @@ -1250,7 +1250,7 @@ $$254566: $$254817: .4byte 0 .4byte 0xFFFFFFFF - .byte4 safeboolFunc__Q24util45PlacementNew$$0Q43scn4step4info13WarpStarPanel$$1CFv + .4byte safeboolFunc__Q24util45PlacementNew$$0Q43scn4step4info13WarpStarPanel$$1CFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" diff --git a/asm/src/Item.s b/asm/src/Item.s index fc1e7ee1..1017b88e 100644 --- a/asm/src/Item.s +++ b/asm/src/Item.s @@ -3206,55 +3206,55 @@ $$266928: __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateFall$$4PQ43scn4step4item4Item$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateFall$$4PQ43scn4step4item4Item$$1Fv - .byte4 create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateFall$$4PQ43scn4step4item4Item$$1Fv + .4byte __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateFall$$4PQ43scn4step4item4Item$$1Fv + .4byte create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateFall$$4PQ43scn4step4item4Item$$1Fv .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateBound$$4PQ43scn4step4item4Item$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateBound$$4PQ43scn4step4item4Item$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateBound$$4PQ43scn4step4item4Item$$1Fv - .byte4 create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateBound$$4PQ43scn4step4item4Item$$1Fv + .4byte __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateBound$$4PQ43scn4step4item4Item$$1Fv + .4byte create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateBound$$4PQ43scn4step4item4Item$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state17StateFallFeathery$$4PQ43scn4step4item4Item$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state17StateFallFeathery$$4PQ43scn4step4item4Item$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state17StateFallFeathery$$4PQ43scn4step4item4Item$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state17StateFallFeathery$$4PQ43scn4step4item4Item$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state17StateFallFeathery$$4PQ43scn4step4item4Item$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state17StateFallFeathery$$4PQ43scn4step4item4Item$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state19StatePreciousAppear$$4PQ43scn4step4item4Item$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state19StatePreciousAppear$$4PQ43scn4step4item4Item$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state19StatePreciousAppear$$4PQ43scn4step4item4Item$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state19StatePreciousAppear$$4PQ43scn4step4item4Item$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state19StatePreciousAppear$$4PQ43scn4step4item4Item$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state19StatePreciousAppear$$4PQ43scn4step4item4Item$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state13StateApproach$$4PQ43scn4step4item4Item$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state13StateApproach$$4PQ43scn4step4item4Item$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state13StateApproach$$4PQ43scn4step4item4Item$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state13StateApproach$$4PQ43scn4step4item4Item$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state13StateApproach$$4PQ43scn4step4item4Item$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state13StateApproach$$4PQ43scn4step4item4Item$$1Fv .global __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateRoah$$4PQ43scn4step4item4Item$$1 __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateRoah$$4PQ43scn4step4item4Item$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateRoah$$4PQ43scn4step4item4Item$$1Fv - .byte4 create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateRoah$$4PQ43scn4step4item4Item$$1Fv + .4byte __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateRoah$$4PQ43scn4step4item4Item$$1Fv + .4byte create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateRoah$$4PQ43scn4step4item4Item$$1Fv .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateFixed$$4PQ43scn4step4item4Item$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateFixed$$4PQ43scn4step4item4Item$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateFixed$$4PQ43scn4step4item4Item$$1Fv - .byte4 create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateFixed$$4PQ43scn4step4item4Item$$1Fv + .4byte __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateFixed$$4PQ43scn4step4item4Item$$1Fv + .4byte create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateFixed$$4PQ43scn4step4item4Item$$1Fv .global __vt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state11StateGather$$4PQ43scn4step4item4Item$$4Q33std3tr143reference_wrapper$$0Q43scn4step4item7Catcher$$1$$1 __vt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state11StateGather$$4PQ43scn4step4item4Item$$4Q33std3tr143reference_wrapper$$0Q43scn4step4item7Catcher$$1$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state11StateGather$$4PQ43scn4step4item4Item$$4Q33std3tr143reference_wrapper$$0Q43scn4step4item7Catcher$$1$$1Fv - .byte4 create__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state11StateGather$$4PQ43scn4step4item4Item$$4Q33std3tr143reference_wrapper$$0Q43scn4step4item7Catcher$$1$$1Fv + .4byte __dt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state11StateGather$$4PQ43scn4step4item4Item$$4Q33std3tr143reference_wrapper$$0Q43scn4step4item7Catcher$$1$$1Fv + .4byte create__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state11StateGather$$4PQ43scn4step4item4Item$$4Q33std3tr143reference_wrapper$$0Q43scn4step4item7Catcher$$1$$1Fv .global __vt__Q24util41StateChanger$$0Q43scn4step4item6IState$$4256$$1 __vt__Q24util41StateChanger$$0Q43scn4step4item6IState$$4256$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util41StateChanger$$0Q43scn4step4item6IState$$4256$$1Fv + .4byte __dt__Q24util41StateChanger$$0Q43scn4step4item6IState$$4256$$1Fv .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: .asciz "NW4R:Pointer must not be NULL (p)" @@ -3288,15 +3288,15 @@ $$252783: .balign 4 .global t_LayoutNameTable__18$$2unnamed$$2Item_cpp$$2 t_LayoutNameTable__18$$2unnamed$$2Item_cpp$$2: - .byte4 $$252776 - .byte4 $$252777 - .byte4 $$252778 - .byte4 $$252779 - .byte4 $$252780 - .byte4 $$252781 - .byte4 $$252782 - .byte4 $$252783 - .byte4 $$252784 + .4byte $$252776 + .4byte $$252777 + .4byte $$252778 + .4byte $$252779 + .4byte $$252780 + .4byte $$252781 + .4byte $$252782 + .4byte $$252783 + .4byte $$252784 .global $$252786 $$252786: .asciz "MenuMCBN" @@ -3371,24 +3371,24 @@ $$252803: .balign 4 .global t_ParentPaneNameTable__18$$2unnamed$$2Item_cpp$$2 t_ParentPaneNameTable__18$$2unnamed$$2Item_cpp$$2: - .byte4 $$252786 - .byte4 $$252787 - .byte4 $$252788 - .byte4 $$252789 - .byte4 $$252790 - .byte4 $$252791 - .byte4 $$252792 - .byte4 $$252793 - .byte4 $$252794 - .byte4 $$252795 - .byte4 $$252796 - .byte4 $$252797 - .byte4 $$252798 - .byte4 $$252799 - .byte4 $$252800 - .byte4 $$252801 - .byte4 $$252802 - .byte4 $$252803 + .4byte $$252786 + .4byte $$252787 + .4byte $$252788 + .4byte $$252789 + .4byte $$252790 + .4byte $$252791 + .4byte $$252792 + .4byte $$252793 + .4byte $$252794 + .4byte $$252795 + .4byte $$252796 + .4byte $$252797 + .4byte $$252798 + .4byte $$252799 + .4byte $$252800 + .4byte $$252801 + .4byte $$252802 + .4byte $$252803 .global $$253750 $$253750: .asciz "grandmenu/Main" diff --git a/asm/src/ItemCatcher.s b/asm/src/ItemCatcher.s index b058815e..3d975001 100644 --- a/asm/src/ItemCatcher.s +++ b/asm/src/ItemCatcher.s @@ -382,7 +382,7 @@ __sinit_$$3ItemCatcher_cpp: /* 80342C6C 0033EAAC 4B E5 C7 3C */ b set__Q33hel4math7Vector2Fff .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ItemCatcher_cpp + .4byte __sinit_$$3ItemCatcher_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254426 diff --git a/asm/src/ItemCollReact.s b/asm/src/ItemCollReact.s index 91b46727..b61d1f6b 100644 --- a/asm/src/ItemCollReact.s +++ b/asm/src/ItemCollReact.s @@ -524,14 +524,14 @@ $$258445: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick12StateItemGet$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick12StateItemGet$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick12StateItemGet$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick12StateItemGet$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick12StateItemGet$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateGetShipParts$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateGetShipParts$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateGetShipParts$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateGetShipParts$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateGetShipParts$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateGetShipParts$$4PQ43scn4step4hero4Hero$$1Fv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258474 diff --git a/asm/src/KindUtil.s b/asm/src/KindUtil.s index ac9f37b2..2b37d636 100644 --- a/asm/src/KindUtil.s +++ b/asm/src/KindUtil.s @@ -388,254 +388,254 @@ ToLevelIndex__Q43scn4step3map8KindUtilFQ43scn4step3map4Kind: T_INFOS__Q43scn4step3map22$$2unnamed$$2KindUtil_cpp$$2: .4byte 0 .4byte 0 - .byte4 $$249154 - .byte4 $$249155 - .byte4 $$249156 + .4byte $$249154 + .4byte $$249155 + .4byte $$249156 .4byte 0 .4byte 0 - .byte4 $$249154 - .byte4 $$249155 - .byte4 $$249157 + .4byte $$249154 + .4byte $$249155 + .4byte $$249157 .4byte 0 .4byte 0 - .byte4 $$249154 - .byte4 $$249155 - .byte4 $$249158 + .4byte $$249154 + .4byte $$249155 + .4byte $$249158 .4byte 0 .4byte 0 - .byte4 $$249154 - .byte4 $$249155 - .byte4 $$249159 + .4byte $$249154 + .4byte $$249155 + .4byte $$249159 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249160 - .byte4 $$249156 + .4byte $$249154 + .4byte $$249160 + .4byte $$249156 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249160 - .byte4 $$249157 + .4byte $$249154 + .4byte $$249160 + .4byte $$249157 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249160 - .byte4 $$249158 + .4byte $$249154 + .4byte $$249160 + .4byte $$249158 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249160 - .byte4 $$249159 + .4byte $$249154 + .4byte $$249160 + .4byte $$249159 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249160 - .byte4 $$249161 + .4byte $$249154 + .4byte $$249160 + .4byte $$249161 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249160 - .byte4 $$249162 + .4byte $$249154 + .4byte $$249160 + .4byte $$249162 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249160 - .byte4 $$249163 + .4byte $$249154 + .4byte $$249160 + .4byte $$249163 .4byte 0x00000001 .4byte 0 - .byte4 $$249154 - .byte4 $$249164 - .byte4 $$249156 + .4byte $$249154 + .4byte $$249164 + .4byte $$249156 .4byte 0x00000001 .4byte 0 - .byte4 $$249154 - .byte4 $$249164 - .byte4 $$249157 + .4byte $$249154 + .4byte $$249164 + .4byte $$249157 .4byte 0x00000001 .4byte 0 - .byte4 $$249154 - .byte4 $$249164 - .byte4 $$249158 + .4byte $$249154 + .4byte $$249164 + .4byte $$249158 .4byte 0x00000001 .4byte 0 - .byte4 $$249154 - .byte4 $$249164 - .byte4 $$249159 + .4byte $$249154 + .4byte $$249164 + .4byte $$249159 .4byte 0 .4byte 0 - .byte4 $$249154 - .byte4 $$249165 - .byte4 $$249156 + .4byte $$249154 + .4byte $$249165 + .4byte $$249156 .4byte 0 .4byte 0 - .byte4 $$249154 - .byte4 $$249165 - .byte4 $$249157 + .4byte $$249154 + .4byte $$249165 + .4byte $$249157 .4byte 0 .4byte 0 - .byte4 $$249154 - .byte4 $$249165 - .byte4 $$249158 + .4byte $$249154 + .4byte $$249165 + .4byte $$249158 .4byte 0 .4byte 0 - .byte4 $$249154 - .byte4 $$249165 - .byte4 $$249159 + .4byte $$249154 + .4byte $$249165 + .4byte $$249159 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249166 - .byte4 $$249156 + .4byte $$249154 + .4byte $$249166 + .4byte $$249156 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249166 - .byte4 $$249157 + .4byte $$249154 + .4byte $$249166 + .4byte $$249157 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249166 - .byte4 $$249158 + .4byte $$249154 + .4byte $$249166 + .4byte $$249158 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249166 - .byte4 $$249159 + .4byte $$249154 + .4byte $$249166 + .4byte $$249159 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249166 - .byte4 $$249161 + .4byte $$249154 + .4byte $$249166 + .4byte $$249161 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249166 - .byte4 $$249162 + .4byte $$249154 + .4byte $$249166 + .4byte $$249162 .4byte 0x00000001 .4byte 0 - .byte4 $$249154 - .byte4 $$249167 - .byte4 $$249156 + .4byte $$249154 + .4byte $$249167 + .4byte $$249156 .4byte 0x00000001 .4byte 0 - .byte4 $$249154 - .byte4 $$249168 - .byte4 $$249156 + .4byte $$249154 + .4byte $$249168 + .4byte $$249156 .4byte 0x00000001 .4byte 0 - .byte4 $$249154 - .byte4 $$249168 - .byte4 $$249157 + .4byte $$249154 + .4byte $$249168 + .4byte $$249157 .4byte 0x00000001 .4byte 0 - .byte4 $$249154 - .byte4 $$249168 - .byte4 $$249158 + .4byte $$249154 + .4byte $$249168 + .4byte $$249158 .4byte 0x00000001 .4byte 0 - .byte4 $$249154 - .byte4 $$249168 - .byte4 $$249159 + .4byte $$249154 + .4byte $$249168 + .4byte $$249159 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249169 - .byte4 $$249156 + .4byte $$249154 + .4byte $$249169 + .4byte $$249156 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249169 - .byte4 $$249157 + .4byte $$249154 + .4byte $$249169 + .4byte $$249157 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249169 - .byte4 $$249158 + .4byte $$249154 + .4byte $$249169 + .4byte $$249158 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249169 - .byte4 $$249159 + .4byte $$249154 + .4byte $$249169 + .4byte $$249159 .4byte 0 .4byte 0 - .byte4 $$249154 - .byte4 $$249170 - .byte4 $$249156 + .4byte $$249154 + .4byte $$249170 + .4byte $$249156 .4byte 0 .4byte 0 - .byte4 $$249154 - .byte4 $$249170 - .byte4 $$249157 + .4byte $$249154 + .4byte $$249170 + .4byte $$249157 .4byte 0 .4byte 0 - .byte4 $$249154 - .byte4 $$249170 - .byte4 $$249158 + .4byte $$249154 + .4byte $$249170 + .4byte $$249158 .4byte 0 .4byte 0 - .byte4 $$249154 - .byte4 $$249170 - .byte4 $$249159 + .4byte $$249154 + .4byte $$249170 + .4byte $$249159 .4byte 0 .4byte 0 - .byte4 $$249154 - .byte4 $$249171 - .byte4 $$249156 + .4byte $$249154 + .4byte $$249171 + .4byte $$249156 .4byte 0x00000001 .4byte 0 - .byte4 $$249154 - .byte4 $$249172 - .byte4 $$249156 + .4byte $$249154 + .4byte $$249172 + .4byte $$249156 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249173 - .byte4 $$249156 + .4byte $$249154 + .4byte $$249173 + .4byte $$249156 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249174 - .byte4 $$249156 + .4byte $$249154 + .4byte $$249174 + .4byte $$249156 .4byte 0 .4byte 0 - .byte4 $$249154 - .byte4 $$249175 - .byte4 $$249156 + .4byte $$249154 + .4byte $$249175 + .4byte $$249156 .4byte 0x00000001 .4byte 0 - .byte4 $$249154 - .byte4 $$249176 - .byte4 $$249156 + .4byte $$249154 + .4byte $$249176 + .4byte $$249156 .4byte 0x00000002 .4byte 0 - .byte4 $$249154 - .byte4 $$249177 - .byte4 $$249156 + .4byte $$249154 + .4byte $$249177 + .4byte $$249156 .4byte 0 .4byte 0 - .byte4 $$249178 - .byte4 $$249179 - .byte4 $$249180 + .4byte $$249178 + .4byte $$249179 + .4byte $$249180 .4byte 0x00000001 .4byte 0 - .byte4 $$249178 - .byte4 $$249179 - .byte4 $$249181 + .4byte $$249178 + .4byte $$249179 + .4byte $$249181 .4byte 0x00000002 .4byte 0 - .byte4 $$249178 - .byte4 $$249179 - .byte4 $$249182 + .4byte $$249178 + .4byte $$249179 + .4byte $$249182 .4byte 0 .4byte 0 - .byte4 $$249178 - .byte4 $$249183 - .byte4 $$249184 + .4byte $$249178 + .4byte $$249183 + .4byte $$249184 .4byte 0 .4byte 0 - .byte4 $$249178 - .byte4 $$249185 - .byte4 $$249186 + .4byte $$249178 + .4byte $$249185 + .4byte $$249186 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249154 diff --git a/asm/src/Kirby.s b/asm/src/Kirby.s index efc5db39..4fa17bc1 100644 --- a/asm/src/Kirby.s +++ b/asm/src/Kirby.s @@ -1828,632 +1828,632 @@ Script__Q53scn4step4hero9modeldesc5KirbyFv: /* 8035C778 003585B8 4B FF F4 34 */ b Script__Q53scn4step4hero9modeldesc6CommonFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3Kirby_cpp + .4byte __sinit_$$3Kirby_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc5KirbyFv$$2ENTRIES$$20 $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc5KirbyFv$$2ENTRIES$$20: - .byte4 $$248727 + .4byte $$248727 .4byte 0 - .byte4 $$248728 + .4byte $$248728 .4byte 0 - .byte4 $$248729 + .4byte $$248729 .4byte 0 - .byte4 $$248730 + .4byte $$248730 .4byte 0 - .byte4 $$248731 + .4byte $$248731 .4byte 0 - .byte4 $$248732 + .4byte $$248732 .4byte 0 - .byte4 $$248733 + .4byte $$248733 .4byte 0 - .byte4 $$248734 + .4byte $$248734 .4byte 0 - .byte4 $$248735 + .4byte $$248735 .4byte 0 - .byte4 $$248736 + .4byte $$248736 .4byte 0 - .byte4 $$248737 + .4byte $$248737 .4byte 0 - .byte4 $$248738 + .4byte $$248738 .4byte 0 - .byte4 $$248739 + .4byte $$248739 .4byte 0 - .byte4 $$248740 + .4byte $$248740 .4byte 0 - .byte4 $$248741 + .4byte $$248741 .4byte 0 - .byte4 $$248742 + .4byte $$248742 .4byte 0 - .byte4 $$248743 + .4byte $$248743 .4byte 0 - .byte4 $$248744 + .4byte $$248744 .4byte 0 - .byte4 $$248745 + .4byte $$248745 .4byte 0 - .byte4 $$248746 + .4byte $$248746 .4byte 0 - .byte4 $$248747 + .4byte $$248747 .4byte 0 - .byte4 $$248748 + .4byte $$248748 .4byte 0 - .byte4 $$248749 + .4byte $$248749 .4byte 0 - .byte4 $$248750 + .4byte $$248750 .4byte 0 - .byte4 $$248751 + .4byte $$248751 .4byte 0 - .byte4 $$248752 + .4byte $$248752 .4byte 0 - .byte4 $$248753 + .4byte $$248753 .4byte 0 - .byte4 $$248754 + .4byte $$248754 .4byte 0 - .byte4 $$248755 + .4byte $$248755 .4byte 0 - .byte4 $$248756 + .4byte $$248756 .4byte 0 - .byte4 $$248757 + .4byte $$248757 .4byte 0 - .byte4 $$248758 + .4byte $$248758 .4byte 0 - .byte4 $$248759 + .4byte $$248759 .4byte 0 - .byte4 $$248760 + .4byte $$248760 .4byte 0 - .byte4 $$248761 + .4byte $$248761 .4byte 0 - .byte4 $$248762 + .4byte $$248762 .4byte 0 - .byte4 $$248763 + .4byte $$248763 .4byte 0 - .byte4 $$248764 + .4byte $$248764 .4byte 0 - .byte4 $$248765 + .4byte $$248765 .4byte 0 - .byte4 $$248766 + .4byte $$248766 .4byte 0 - .byte4 $$248767 + .4byte $$248767 .4byte 0 - .byte4 $$248768 + .4byte $$248768 .4byte 0 - .byte4 $$248769 + .4byte $$248769 .4byte 0 - .byte4 $$248770 + .4byte $$248770 .4byte 0 - .byte4 $$248771 + .4byte $$248771 .4byte 0 - .byte4 $$248772 + .4byte $$248772 .4byte 0 - .byte4 $$248773 + .4byte $$248773 .4byte 0 - .byte4 $$248774 + .4byte $$248774 .4byte 0 - .byte4 $$248775 + .4byte $$248775 .4byte 0 - .byte4 $$248776 + .4byte $$248776 .4byte 0 - .byte4 $$248777 + .4byte $$248777 .4byte 0 - .byte4 $$248778 + .4byte $$248778 .4byte 0 - .byte4 $$248779 + .4byte $$248779 .4byte 0 - .byte4 $$248780 + .4byte $$248780 .4byte 0 - .byte4 $$248781 + .4byte $$248781 .4byte 0 - .byte4 $$248782 + .4byte $$248782 .4byte 0 - .byte4 $$248783 + .4byte $$248783 .4byte 0 - .byte4 $$248784 + .4byte $$248784 .4byte 0 - .byte4 $$248785 + .4byte $$248785 .4byte 0 - .byte4 $$248786 + .4byte $$248786 .4byte 0 - .byte4 $$248787 + .4byte $$248787 .4byte 0 - .byte4 $$248788 + .4byte $$248788 .4byte 0 - .byte4 $$248789 + .4byte $$248789 .4byte 0 - .byte4 $$248790 + .4byte $$248790 .4byte 0 - .byte4 $$248791 + .4byte $$248791 .4byte 0 - .byte4 $$248792 + .4byte $$248792 .4byte 0 - .byte4 $$248793 + .4byte $$248793 .4byte 0 - .byte4 $$248794 + .4byte $$248794 .4byte 0 - .byte4 $$248795 + .4byte $$248795 .4byte 0 - .byte4 $$248796 + .4byte $$248796 .4byte 0 - .byte4 $$248797 + .4byte $$248797 .4byte 0 - .byte4 $$248798 + .4byte $$248798 .4byte 0 - .byte4 $$248799 + .4byte $$248799 .4byte 0 - .byte4 $$248800 + .4byte $$248800 .4byte 0 - .byte4 $$248801 + .4byte $$248801 .4byte 0 - .byte4 $$248802 + .4byte $$248802 .4byte 0 - .byte4 $$248803 + .4byte $$248803 .4byte 0 - .byte4 $$248804 + .4byte $$248804 .4byte 0 - .byte4 $$248805 + .4byte $$248805 .4byte 0 - .byte4 $$248806 + .4byte $$248806 .4byte 0 - .byte4 $$248807 + .4byte $$248807 .4byte 0 - .byte4 $$248808 + .4byte $$248808 .4byte 0 - .byte4 $$248809 + .4byte $$248809 .4byte 0 - .byte4 $$248810 + .4byte $$248810 .4byte 0 - .byte4 $$248811 + .4byte $$248811 .4byte 0 - .byte4 $$248812 + .4byte $$248812 .4byte 0 - .byte4 $$248813 + .4byte $$248813 .4byte 0 - .byte4 $$248814 + .4byte $$248814 .4byte 0 - .byte4 $$248815 + .4byte $$248815 .4byte 0 - .byte4 $$248816 + .4byte $$248816 .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248817 + .4byte $$248817 .4byte 0 - .byte4 $$248818 + .4byte $$248818 .4byte 0 - .byte4 $$248819 + .4byte $$248819 .4byte 0 - .byte4 $$248820 + .4byte $$248820 .4byte 0 - .byte4 $$248821 + .4byte $$248821 .4byte 0 - .byte4 $$248822 + .4byte $$248822 .4byte 0 - .byte4 $$248823 + .4byte $$248823 .4byte 0 - .byte4 $$248824 + .4byte $$248824 .4byte 0 - .byte4 $$248825 + .4byte $$248825 .4byte 0 - .byte4 $$248826 + .4byte $$248826 .4byte 0 - .byte4 $$248827 + .4byte $$248827 .4byte 0 - .byte4 $$248828 + .4byte $$248828 .4byte 0 - .byte4 $$248829 + .4byte $$248829 .4byte 0 - .byte4 $$248830 + .4byte $$248830 .4byte 0 - .byte4 $$248831 + .4byte $$248831 .4byte 0 - .byte4 $$248832 + .4byte $$248832 .4byte 0 - .byte4 $$248833 + .4byte $$248833 .4byte 0 - .byte4 $$248834 + .4byte $$248834 .4byte 0 - .byte4 $$248835 + .4byte $$248835 .4byte 0 - .byte4 $$248836 + .4byte $$248836 .4byte 0 - .byte4 $$248837 + .4byte $$248837 .4byte 0 - .byte4 $$248838 + .4byte $$248838 .4byte 0 - .byte4 $$248839 + .4byte $$248839 .4byte 0 - .byte4 $$248840 + .4byte $$248840 .4byte 0 - .byte4 $$248841 + .4byte $$248841 .4byte 0 - .byte4 $$248842 + .4byte $$248842 .4byte 0 - .byte4 $$248843 + .4byte $$248843 .4byte 0 - .byte4 $$248844 + .4byte $$248844 .4byte 0 - .byte4 $$248845 + .4byte $$248845 .4byte 0 - .byte4 $$248846 + .4byte $$248846 .4byte 0 - .byte4 $$248847 + .4byte $$248847 .4byte 0 - .byte4 $$248848 + .4byte $$248848 .4byte 0 - .byte4 $$248848 + .4byte $$248848 .4byte 0 - .byte4 $$248848 + .4byte $$248848 .4byte 0 - .byte4 $$248849 + .4byte $$248849 .4byte 0 - .byte4 $$248850 + .4byte $$248850 .4byte 0 - .byte4 $$248851 + .4byte $$248851 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248727 + .4byte $$248727 .4byte 0 - .byte4 $$248852 + .4byte $$248852 .4byte 0 - .byte4 $$248759 + .4byte $$248759 .4byte 0 - .byte4 $$248727 + .4byte $$248727 .4byte 0 - .byte4 $$248853 + .4byte $$248853 .4byte 0 - .byte4 $$248854 + .4byte $$248854 .4byte 0 - .byte4 $$248855 + .4byte $$248855 .4byte 0 - .byte4 $$248856 + .4byte $$248856 .4byte 0 - .byte4 $$248857 + .4byte $$248857 .4byte 0 - .byte4 $$248858 + .4byte $$248858 .4byte 0 - .byte4 $$248859 + .4byte $$248859 .4byte 0 - .byte4 $$248860 + .4byte $$248860 .4byte 0 - .byte4 $$248861 + .4byte $$248861 .4byte 0 - .byte4 $$248862 + .4byte $$248862 .4byte 0 - .byte4 $$248863 + .4byte $$248863 .4byte 0x00000001 - .byte4 $$248864 + .4byte $$248864 .4byte 0x00000001 - .byte4 $$248865 + .4byte $$248865 .4byte 0x00000001 - .byte4 $$248866 + .4byte $$248866 .4byte 0x00000001 - .byte4 $$248867 + .4byte $$248867 .4byte 0x00000001 - .byte4 $$248868 + .4byte $$248868 .4byte 0x00000001 - .byte4 $$248869 + .4byte $$248869 .4byte 0x00000001 - .byte4 $$248870 + .4byte $$248870 .4byte 0x00000001 - .byte4 $$248871 + .4byte $$248871 .4byte 0x00000001 - .byte4 $$248872 + .4byte $$248872 .4byte 0x00000001 - .byte4 $$248873 + .4byte $$248873 .4byte 0x00000001 - .byte4 $$248874 + .4byte $$248874 .4byte 0x00000001 - .byte4 $$248875 + .4byte $$248875 .4byte 0x00000001 - .byte4 $$248876 + .4byte $$248876 .4byte 0x00000001 - .byte4 $$248877 + .4byte $$248877 .4byte 0x00000001 - .byte4 $$248878 + .4byte $$248878 .4byte 0x00000001 - .byte4 $$248879 + .4byte $$248879 .4byte 0x00000001 - .byte4 $$248880 + .4byte $$248880 .4byte 0x00000001 - .byte4 $$248881 + .4byte $$248881 .4byte 0x00000001 - .byte4 $$248882 + .4byte $$248882 .4byte 0x00000001 - .byte4 $$248883 + .4byte $$248883 .4byte 0x00000001 - .byte4 $$248884 + .4byte $$248884 .4byte 0x00000001 - .byte4 $$248885 + .4byte $$248885 .4byte 0x00000002 - .byte4 $$248886 + .4byte $$248886 .4byte 0x00000002 - .byte4 $$248887 + .4byte $$248887 .4byte 0x00000002 - .byte4 $$248888 + .4byte $$248888 .4byte 0x00000002 - .byte4 $$248889 + .4byte $$248889 .4byte 0x00000002 - .byte4 $$248890 + .4byte $$248890 .4byte 0x00000002 - .byte4 $$248891 + .4byte $$248891 .4byte 0x00000002 - .byte4 $$248892 + .4byte $$248892 .4byte 0x00000002 - .byte4 $$248893 + .4byte $$248893 .4byte 0x00000002 - .byte4 $$248894 + .4byte $$248894 .4byte 0x00000002 - .byte4 $$248895 + .4byte $$248895 .4byte 0x00000002 - .byte4 $$248896 + .4byte $$248896 .4byte 0x00000003 - .byte4 $$248897 + .4byte $$248897 .4byte 0x00000003 - .byte4 $$248898 + .4byte $$248898 .4byte 0x00000003 - .byte4 $$248899 + .4byte $$248899 .4byte 0x00000003 - .byte4 $$248900 + .4byte $$248900 .4byte 0x00000003 - .byte4 $$248901 + .4byte $$248901 .4byte 0x00000003 - .byte4 $$248902 + .4byte $$248902 .4byte 0x00000003 - .byte4 $$248903 + .4byte $$248903 .4byte 0x00000003 - .byte4 $$248904 + .4byte $$248904 .4byte 0x00000003 - .byte4 $$248905 + .4byte $$248905 .4byte 0x00000003 - .byte4 $$248906 + .4byte $$248906 .4byte 0x00000003 - .byte4 $$248907 + .4byte $$248907 .4byte 0x00000003 - .byte4 $$248908 + .4byte $$248908 .4byte 0x00000003 - .byte4 $$248909 + .4byte $$248909 .4byte 0x00000003 - .byte4 $$248910 + .4byte $$248910 .4byte 0x00000003 - .byte4 $$248911 + .4byte $$248911 .4byte 0x00000003 - .byte4 $$248912 + .4byte $$248912 .4byte 0x00000004 - .byte4 $$248913 + .4byte $$248913 .4byte 0x00000004 - .byte4 $$248914 + .4byte $$248914 .4byte 0x00000004 - .byte4 $$248915 + .4byte $$248915 .4byte 0x00000004 - .byte4 $$248916 + .4byte $$248916 .4byte 0x00000004 - .byte4 $$248917 + .4byte $$248917 .4byte 0x00000004 - .byte4 $$248918 + .4byte $$248918 .4byte 0x00000004 - .byte4 $$248919 + .4byte $$248919 .4byte 0x00000004 - .byte4 $$248920 + .4byte $$248920 .4byte 0x00000004 - .byte4 $$248921 + .4byte $$248921 .4byte 0x00000004 - .byte4 $$248922 + .4byte $$248922 .4byte 0x00000004 - .byte4 $$248923 + .4byte $$248923 .4byte 0x00000005 - .byte4 $$248924 + .4byte $$248924 .4byte 0x00000005 - .byte4 $$248925 + .4byte $$248925 .4byte 0x00000005 - .byte4 $$248926 + .4byte $$248926 .4byte 0x00000005 - .byte4 $$248927 + .4byte $$248927 .4byte 0x00000005 - .byte4 $$248928 + .4byte $$248928 .4byte 0x00000005 - .byte4 $$248929 + .4byte $$248929 .4byte 0x00000005 - .byte4 $$248930 + .4byte $$248930 .4byte 0x00000005 - .byte4 $$248931 + .4byte $$248931 .4byte 0x00000005 - .byte4 $$248932 + .4byte $$248932 .4byte 0x00000006 - .byte4 $$248933 + .4byte $$248933 .4byte 0x00000006 - .byte4 $$248933 + .4byte $$248933 .4byte 0x00000006 - .byte4 $$248934 + .4byte $$248934 .4byte 0x00000006 - .byte4 $$248935 + .4byte $$248935 .4byte 0x00000006 - .byte4 $$248936 + .4byte $$248936 .4byte 0x00000006 - .byte4 $$248937 + .4byte $$248937 .4byte 0x00000007 - .byte4 $$248938 + .4byte $$248938 .4byte 0x00000007 - .byte4 $$248939 + .4byte $$248939 .4byte 0x00000007 - .byte4 $$248940 + .4byte $$248940 .4byte 0x00000007 - .byte4 $$248941 + .4byte $$248941 .4byte 0x00000007 - .byte4 $$248942 + .4byte $$248942 .4byte 0x00000007 - .byte4 $$248943 + .4byte $$248943 .4byte 0x00000007 - .byte4 $$248944 + .4byte $$248944 .4byte 0x00000007 - .byte4 $$248907 + .4byte $$248907 .4byte 0x00000007 - .byte4 $$248945 + .4byte $$248945 .4byte 0x00000007 - .byte4 $$248946 + .4byte $$248946 .4byte 0x00000007 - .byte4 $$248947 + .4byte $$248947 .4byte 0x00000007 - .byte4 $$248948 + .4byte $$248948 .4byte 0x00000007 - .byte4 $$248949 + .4byte $$248949 .4byte 0x00000008 - .byte4 $$248950 + .4byte $$248950 .4byte 0x00000008 - .byte4 $$248951 + .4byte $$248951 .4byte 0x00000008 - .byte4 $$248952 + .4byte $$248952 .4byte 0x00000008 - .byte4 $$248953 + .4byte $$248953 .4byte 0x00000008 - .byte4 $$248954 + .4byte $$248954 .4byte 0x00000008 - .byte4 $$248955 + .4byte $$248955 .4byte 0x00000008 - .byte4 $$248956 + .4byte $$248956 .4byte 0x00000008 - .byte4 $$248957 + .4byte $$248957 .4byte 0x00000008 - .byte4 $$248958 + .4byte $$248958 .4byte 0x00000008 - .byte4 $$248959 + .4byte $$248959 .4byte 0x00000008 - .byte4 $$248960 + .4byte $$248960 .4byte 0x00000008 - .byte4 $$248961 + .4byte $$248961 .4byte 0x00000008 - .byte4 $$248962 + .4byte $$248962 .4byte 0x00000008 - .byte4 $$248963 + .4byte $$248963 .4byte 0x00000008 - .byte4 $$248964 + .4byte $$248964 .4byte 0x00000009 - .byte4 $$248965 + .4byte $$248965 .4byte 0x00000009 - .byte4 $$248966 + .4byte $$248966 .4byte 0x00000009 - .byte4 $$248967 + .4byte $$248967 .4byte 0x00000009 - .byte4 $$248968 + .4byte $$248968 .4byte 0x00000009 - .byte4 $$248969 + .4byte $$248969 .4byte 0x00000009 - .byte4 $$248970 + .4byte $$248970 .4byte 0x00000009 - .byte4 $$248971 + .4byte $$248971 .4byte 0x00000009 - .byte4 $$248972 + .4byte $$248972 .4byte 0x00000009 - .byte4 $$248973 + .4byte $$248973 .4byte 0x00000009 - .byte4 $$248974 + .4byte $$248974 .4byte 0x00000009 - .byte4 $$248975 + .4byte $$248975 .4byte 0x00000009 - .byte4 $$248976 + .4byte $$248976 .4byte 0x00000009 - .byte4 $$248977 + .4byte $$248977 .4byte 0x00000009 - .byte4 $$248978 + .4byte $$248978 .4byte 0x00000009 - .byte4 $$248979 + .4byte $$248979 .4byte 0x00000009 - .byte4 $$248980 + .4byte $$248980 .4byte 0x00000009 - .byte4 $$248981 + .4byte $$248981 .4byte 0x00000009 - .byte4 $$248982 + .4byte $$248982 .4byte 0x00000009 - .byte4 $$248983 + .4byte $$248983 .4byte 0x00000009 - .byte4 $$248984 + .4byte $$248984 .4byte 0x00000009 - .byte4 $$248985 + .4byte $$248985 .4byte 0x00000009 - .byte4 $$248986 + .4byte $$248986 .4byte 0x00000009 - .byte4 $$248987 + .4byte $$248987 .4byte 0x0000000A - .byte4 $$248988 + .4byte $$248988 .4byte 0x0000000A - .byte4 $$248989 + .4byte $$248989 .4byte 0x0000000A - .byte4 $$248990 + .4byte $$248990 .4byte 0x0000000A - .byte4 $$248991 + .4byte $$248991 .4byte 0x0000000A - .byte4 $$248992 + .4byte $$248992 .4byte 0x0000000A - .byte4 $$248993 + .4byte $$248993 .4byte 0x0000000A - .byte4 $$248994 + .4byte $$248994 .4byte 0x0000000A - .byte4 $$248995 + .4byte $$248995 .4byte 0x0000000A - .byte4 $$248996 + .4byte $$248996 .4byte 0x0000000A - .byte4 $$248997 + .4byte $$248997 .4byte 0x0000000A - .byte4 $$248998 + .4byte $$248998 .4byte 0x0000000A - .byte4 $$248999 + .4byte $$248999 .4byte 0x0000000A - .byte4 $$249000 + .4byte $$249000 .4byte 0x0000000A - .byte4 $$249001 + .4byte $$249001 .4byte 0x0000000A - .byte4 $$249002 + .4byte $$249002 .4byte 0x0000000A - .byte4 $$249003 + .4byte $$249003 .4byte 0x0000000A - .byte4 $$249004 + .4byte $$249004 .4byte 0x0000000A - .byte4 $$249005 + .4byte $$249005 .4byte 0x0000000A - .byte4 $$249006 + .4byte $$249006 .4byte 0x0000000A - .byte4 $$249007 + .4byte $$249007 .4byte 0x0000000A - .byte4 $$249008 + .4byte $$249008 .4byte 0x0000000A - .byte4 $$249009 + .4byte $$249009 .4byte 0x0000000A - .byte4 $$249010 + .4byte $$249010 .4byte 0x0000000A - .byte4 $$249011 + .4byte $$249011 .4byte 0x0000000A - .byte4 $$249012 + .4byte $$249012 .4byte 0x0000000A - .byte4 $$249013 + .4byte $$249013 .4byte 0x0000000A - .byte4 $$249014 + .4byte $$249014 .4byte 0x0000000A - .byte4 $$249015 + .4byte $$249015 .4byte 0x0000000A - .byte4 $$249015 + .4byte $$249015 .4byte 0x0000000A - .byte4 $$249016 + .4byte $$249016 .4byte 0x0000000A - .byte4 $$249017 + .4byte $$249017 .4byte 0x0000000A - .byte4 $$249018 + .4byte $$249018 .4byte 0x0000000A - .byte4 $$249019 + .4byte $$249019 .4byte 0x0000000A - .byte4 $$249020 + .4byte $$249020 .4byte 0x0000000A - .byte4 $$249021 + .4byte $$249021 .4byte 0x0000000A - .byte4 $$249022 + .4byte $$249022 .4byte 0x0000000A - .byte4 $$249023 + .4byte $$249023 .4byte 0x0000000A - .byte4 $$249024 + .4byte $$249024 .4byte 0x0000000A - .byte4 $$249025 + .4byte $$249025 .4byte 0x0000000A - .byte4 $$249026 + .4byte $$249026 .4byte 0x0000000A .4byte 0 .4byte 0 @@ -2687,61 +2687,61 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc5KirbyFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$249027 + .4byte $$249027 .4byte 0 - .byte4 $$249028 + .4byte $$249028 .4byte 0 - .byte4 $$249029 + .4byte $$249029 .4byte 0 - .byte4 $$249030 + .4byte $$249030 .4byte 0 - .byte4 $$249031 + .4byte $$249031 .4byte 0 - .byte4 $$249032 + .4byte $$249032 .4byte 0 - .byte4 $$249033 + .4byte $$249033 .4byte 0 - .byte4 $$249034 + .4byte $$249034 .4byte 0 - .byte4 $$249035 + .4byte $$249035 .4byte 0 - .byte4 $$249036 + .4byte $$249036 .4byte 0 - .byte4 $$249037 + .4byte $$249037 .4byte 0 - .byte4 $$249038 + .4byte $$249038 .4byte 0 - .byte4 $$249039 + .4byte $$249039 .4byte 0 - .byte4 $$249040 + .4byte $$249040 .4byte 0 - .byte4 $$249041 + .4byte $$249041 .4byte 0 - .byte4 $$249042 + .4byte $$249042 .4byte 0 - .byte4 $$249043 + .4byte $$249043 .4byte 0 - .byte4 $$249044 + .4byte $$249044 .4byte 0 - .byte4 $$249045 + .4byte $$249045 .4byte 0 - .byte4 $$249046 + .4byte $$249046 .4byte 0 - .byte4 $$249047 + .4byte $$249047 .4byte 0 - .byte4 $$249048 + .4byte $$249048 .4byte 0 - .byte4 $$249049 + .4byte $$249049 .4byte 0 - .byte4 $$249050 + .4byte $$249050 .4byte 0 - .byte4 $$249051 + .4byte $$249051 .4byte 0 - .byte4 $$249052 + .4byte $$249052 .4byte 0 - .byte4 $$249053 + .4byte $$249053 .4byte 0 - .byte4 $$249054 + .4byte $$249054 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -3822,36 +3822,36 @@ $$249086: .4byte 0 .global $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc5KirbyFv$$2NAMES$$20 $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc5KirbyFv$$2NAMES$$20: - .byte4 $$249065 - .byte4 $$249066 - .byte4 $$249067 - .byte4 $$249068 - .byte4 $$249069 - .byte4 $$249070 - .byte4 $$249071 - .byte4 $$249072 - .byte4 $$249073 - .byte4 $$249074 - .byte4 $$249075 - .byte4 $$249066 - .byte4 $$249076 - .byte4 $$249077 - .byte4 $$249078 - .byte4 $$249079 - .byte4 $$249075 - .byte4 $$249080 - .byte4 $$249065 - .byte4 $$249065 - .byte4 $$249065 - .byte4 $$249065 - .byte4 $$249065 - .byte4 $$249065 - .byte4 $$249081 - .byte4 $$249082 - .byte4 $$249083 - .byte4 $$249084 - .byte4 $$249085 - .byte4 $$249086 + .4byte $$249065 + .4byte $$249066 + .4byte $$249067 + .4byte $$249068 + .4byte $$249069 + .4byte $$249070 + .4byte $$249071 + .4byte $$249072 + .4byte $$249073 + .4byte $$249074 + .4byte $$249075 + .4byte $$249066 + .4byte $$249076 + .4byte $$249077 + .4byte $$249078 + .4byte $$249079 + .4byte $$249075 + .4byte $$249080 + .4byte $$249065 + .4byte $$249065 + .4byte $$249065 + .4byte $$249065 + .4byte $$249065 + .4byte $$249065 + .4byte $$249081 + .4byte $$249082 + .4byte $$249083 + .4byte $$249084 + .4byte $$249085 + .4byte $$249086 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254931 diff --git a/asm/src/Kiss.s b/asm/src/Kiss.s index 5cae907c..3c9e4488 100644 --- a/asm/src/Kiss.s +++ b/asm/src/Kiss.s @@ -1172,8 +1172,8 @@ lbl_80344378: __vt__Q24util211StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4hero12interference9StateKiss$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q24util35ObjRefHandle$$0Q43scn4step4hero4Hero$$1$$4Q43scn4step4hero11KissContext$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util211StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4hero12interference9StateKiss$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q24util35ObjRefHandle$$0Q43scn4step4hero4Hero$$1$$4Q43scn4step4hero11KissContext$$1Fv - .byte4 create__Q24util211StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4hero12interference9StateKiss$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q24util35ObjRefHandle$$0Q43scn4step4hero4Hero$$1$$4Q43scn4step4hero11KissContext$$1Fv + .4byte __dt__Q24util211StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4hero12interference9StateKiss$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q24util35ObjRefHandle$$0Q43scn4step4hero4Hero$$1$$4Q43scn4step4hero11KissContext$$1Fv + .4byte create__Q24util211StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4hero12interference9StateKiss$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q24util35ObjRefHandle$$0Q43scn4step4hero4Hero$$1$$4Q43scn4step4hero11KissContext$$1Fv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256609 diff --git a/asm/src/LandLayer.s b/asm/src/LandLayer.s index 8530bba0..0d49fb82 100644 --- a/asm/src/LandLayer.s +++ b/asm/src/LandLayer.s @@ -1789,7 +1789,7 @@ __sinit_$$3LandLayer_cpp: /* 801B9ACC 001B590C 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3LandLayer_cpp + .4byte __sinit_$$3LandLayer_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global T_GRID_SHAPE_INFO_TABLE__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 diff --git a/asm/src/Loader.s b/asm/src/Loader.s index 1cfd44ef..3194ae04 100644 --- a/asm/src/Loader.s +++ b/asm/src/Loader.s @@ -55,9 +55,9 @@ $$250075: .balign 4 .global tFILENAME_TABLE__Q33scn2vc20$$2unnamed$$2Loader_cpp$$2 tFILENAME_TABLE__Q33scn2vc20$$2unnamed$$2Loader_cpp$$2: - .byte4 $$250070 - .byte4 $$250071 - .byte4 $$250072 - .byte4 $$250073 - .byte4 $$250074 - .byte4 $$250075 + .4byte $$250070 + .4byte $$250071 + .4byte $$250072 + .4byte $$250073 + .4byte $$250074 + .4byte $$250075 diff --git a/asm/src/Locale.s b/asm/src/Locale.s index dc38939b..9e177a78 100644 --- a/asm/src/Locale.s +++ b/asm/src/Locale.s @@ -290,13 +290,13 @@ lbl_8019DDFC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_POSTS_US__Q23app20$$2unnamed$$2Locale_cpp$$2 T_POSTS_US__Q23app20$$2unnamed$$2Locale_cpp$$2: - .byte4 $$250071 - .byte4 $$250072 - .byte4 $$250073 - .byte4 $$250074 - .byte4 $$250075 - .byte4 $$250076 - .byte4 $$250077 + .4byte $$250071 + .4byte $$250072 + .4byte $$250073 + .4byte $$250074 + .4byte $$250075 + .4byte $$250076 + .4byte $$250077 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/src/Mahoroa.s b/asm/src/Mahoroa.s index 1ed8e766..9a35aa20 100644 --- a/asm/src/Mahoroa.s +++ b/asm/src/Mahoroa.s @@ -1194,56 +1194,56 @@ lbl_80344FD4: /* 80344FE4 00340E24 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3Mahoroa_cpp + .4byte __sinit_$$3Mahoroa_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step7gimmick7mahoroa21$$2unnamed$$2Mahoroa_cpp$$2 T_ANIM_ENTRIES__Q53scn4step7gimmick7mahoroa21$$2unnamed$$2Mahoroa_cpp$$2: - .byte4 $$255205 + .4byte $$255205 .4byte 0 - .byte4 $$255206 + .4byte $$255206 .4byte 0 - .byte4 $$255207 + .4byte $$255207 .4byte 0 - .byte4 $$255208 + .4byte $$255208 .4byte 0 - .byte4 $$255209 + .4byte $$255209 .4byte 0 - .byte4 $$255210 + .4byte $$255210 .4byte 0 - .byte4 $$255211 + .4byte $$255211 .4byte 0 - .byte4 $$255212 + .4byte $$255212 .4byte 0 - .byte4 $$255213 + .4byte $$255213 .4byte 0 - .byte4 $$255214 + .4byte $$255214 .4byte 0 - .byte4 $$255215 + .4byte $$255215 .4byte 0 - .byte4 $$255216 + .4byte $$255216 .4byte 0 - .byte4 $$255217 + .4byte $$255217 .4byte 0 - .byte4 $$255218 + .4byte $$255218 .4byte 0 - .byte4 $$255219 + .4byte $$255219 .4byte 0 - .byte4 $$255220 + .4byte $$255220 .4byte 0 - .byte4 $$255221 + .4byte $$255221 .4byte 0 - .byte4 $$255222 + .4byte $$255222 .4byte 0 - .byte4 $$255223 + .4byte $$255223 .4byte 0 - .byte4 $$255224 + .4byte $$255224 .4byte 0 - .byte4 $$255225 + .4byte $$255225 .4byte 0 - .byte4 $$255226 + .4byte $$255226 .4byte 0 - .byte4 $$255227 + .4byte $$255227 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1341,7 +1341,7 @@ $$255233: .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step7gimmick7mahoroa21$$2unnamed$$2Mahoroa_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step7gimmick7mahoroa21$$2unnamed$$2Mahoroa_cpp$$2: - .byte4 $$255229 + .4byte $$255229 .4byte 0 .4byte 0 .4byte 0 @@ -1356,12 +1356,12 @@ T_SCRIPT_ENTRIES__Q53scn4step7gimmick7mahoroa21$$2unnamed$$2Mahoroa_cpp$$2: .4byte 0x00000010 .4byte 0 .4byte 0 - .byte4 $$255230 + .4byte $$255230 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$255231 + .4byte $$255231 .4byte 0 .4byte 0 .4byte 0 @@ -1371,12 +1371,12 @@ T_SCRIPT_ENTRIES__Q53scn4step7gimmick7mahoroa21$$2unnamed$$2Mahoroa_cpp$$2: .4byte 0x00000010 .4byte 0 .4byte 0 - .byte4 $$255232 + .4byte $$255232 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$255233 + .4byte $$255233 .4byte 0 .4byte 0 .4byte 0 @@ -1453,7 +1453,7 @@ $$255203: .balign 4 .global T_NODE_NAMES__Q53scn4step7gimmick7mahoroa21$$2unnamed$$2Mahoroa_cpp$$2 T_NODE_NAMES__Q53scn4step7gimmick7mahoroa21$$2unnamed$$2Mahoroa_cpp$$2: - .byte4 $$255203 + .4byte $$255203 .global $$255205 $$255205: .asciz "Wait" diff --git a/asm/src/Main.s b/asm/src/Main.s index 4d4242c7..c7e10622 100644 --- a/asm/src/Main.s +++ b/asm/src/Main.s @@ -10922,11 +10922,11 @@ lbl_803F3F7C: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global COMIC_INFO_TABLE__Q33scn5comic18$$2unnamed$$2Main_cpp$$2 COMIC_INFO_TABLE__Q33scn5comic18$$2unnamed$$2Main_cpp$$2: - .byte4 $$251866 + .4byte $$251866 .4byte 0x00000027 - .byte4 $$251867 + .4byte $$251867 .4byte 0x00000027 - .byte4 $$251868 + .4byte $$251868 .4byte 0x00000027 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -11012,9 +11012,9 @@ $$251872: .asciz "ExitComicCheck2" .global EXIT_COMIC_LABEL_TABLE__Q33scn5comic18$$2unnamed$$2Main_cpp$$2 EXIT_COMIC_LABEL_TABLE__Q33scn5comic18$$2unnamed$$2Main_cpp$$2: - .byte4 $$251870 - .byte4 $$251871 - .byte4 $$251872 + .4byte $$251870 + .4byte $$251871 + .4byte $$251872 .global $$257641 $$257641: .asciz "comic/Param" @@ -11100,97 +11100,97 @@ $$262268: $$262439: .4byte 0 .4byte 0xFFFFFFFF - .byte4 disappear__Q33scn7history12PackageHelpsFv + .4byte disappear__Q33scn7history12PackageHelpsFv .global $$262440 $$262440: .4byte 0 .4byte 0xFFFFFFFF - .byte4 decideEffect__Q33scn7history5StageFi + .4byte decideEffect__Q33scn7history5StageFi .global $$262441 $$262441: .4byte 0 .4byte 0xFFFFFFFF - .byte4 start__Q23snd11SERequestorFUl + .4byte start__Q23snd11SERequestorFUl .global $$262442 $$262442: .4byte 0 .4byte 0xFFFFFFFF - .byte4 backStep__Q33scn7history5KirbyFv + .4byte backStep__Q33scn7history5KirbyFv .global $$262443 $$262443: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isAnimEnd__Q33scn7history5KirbyFv + .4byte isAnimEnd__Q33scn7history5KirbyFv .global $$262444 $$262444: .4byte 0 .4byte 0xFFFFFFFF - .byte4 vacuum__Q33scn7history5KirbyFv + .4byte vacuum__Q33scn7history5KirbyFv .global $$262445 $$262445: .4byte 0 .4byte 0xFFFFFFFF - .byte4 vacuumPackage__Q33scn7history5StageFiRCQ33hel4math7Vector3 + .4byte vacuumPackage__Q33scn7history5StageFiRCQ33hel4math7Vector3 .global $$262446 $$262446: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isVacuumEnd__Q33scn7history5KirbyCFv + .4byte isVacuumEnd__Q33scn7history5KirbyCFv .global $$262447 $$262447: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setColor__Q23sfx4FadeFRC8_GXColor + .4byte setColor__Q23sfx4FadeFRC8_GXColor .global $$262448 $$262448: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setFadeOut__Q23sfx4FadeFUl + .4byte setFadeOut__Q23sfx4FadeFUl .global $$262449 $$262449: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isEnd__Q23sfx4FadeCFv + .4byte isEnd__Q23sfx4FadeCFv .global $$262450 $$262450: .4byte 0 .4byte 0xFFFFFFFF - .byte4 vacuumSuka__Q33scn7history5KirbyFv + .4byte vacuumSuka__Q33scn7history5KirbyFv .global $$262451 $$262451: .4byte 0 .4byte 0xFFFFFFFF - .byte4 startShakePackage__Q33scn7history5StageFi + .4byte startShakePackage__Q33scn7history5StageFi .global $$262452 $$262452: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isVacuumEnd__Q33scn7history5KirbyCFv + .4byte isVacuumEnd__Q33scn7history5KirbyCFv .global $$262453 $$262453: .4byte 0 .4byte 0xFFFFFFFF - .byte4 stopShakePackage__Q33scn7history5StageFi + .4byte stopShakePackage__Q33scn7history5StageFi .global $$262454 $$262454: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isTired__Q33scn7history5KirbyCFv + .4byte isTired__Q33scn7history5KirbyCFv .global $$262455 $$262455: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setColor__Q23sfx4FadeFRC8_GXColor + .4byte setColor__Q23sfx4FadeFRC8_GXColor .global $$262456 $$262456: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setFadeOut__Q23sfx4FadeFUl + .4byte setFadeOut__Q23sfx4FadeFUl .global $$262457 $$262457: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isEnd__Q23sfx4FadeCFv + .4byte isEnd__Q23sfx4FadeCFv .global $$262648 $$262648: .4byte 0x8020A930 ;# ptr @@ -11208,58 +11208,58 @@ $$262648: __vt__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$$1: .4byte 0 .4byte 0 - .byte4 __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 - .byte4 clone__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$$1CFv - .byte4 clone__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$$1CFPv - .byte4 __cl__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 + .4byte __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 + .4byte clone__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$$1CFv + .4byte clone__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$$1CFPv + .4byte __cl__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 .global __vt__Q43std3tr16detail275function_imp$$0PFv_v$$4Q43std3tr16detail231bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q33scn7history5Stage$$4i$$1$$4Q33std3tr1150tuple$$0PQ33scn7history5Stage$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail275function_imp$$0PFv_v$$4Q43std3tr16detail231bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q33scn7history5Stage$$4i$$1$$4Q33std3tr1150tuple$$0PQ33scn7history5Stage$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail275function_imp$$0PFv_v$$4Q43std3tr16detail231bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q33scn7history5Stage$$4i$$1$$4Q33std3tr1150tuple$$0PQ33scn7history5Stage$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv - .byte4 clone__Q43std3tr16detail275function_imp$$0PFv_v$$4Q43std3tr16detail231bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q33scn7history5Stage$$4i$$1$$4Q33std3tr1150tuple$$0PQ33scn7history5Stage$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv - .byte4 clone__Q43std3tr16detail275function_imp$$0PFv_v$$4Q43std3tr16detail231bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q33scn7history5Stage$$4i$$1$$4Q33std3tr1150tuple$$0PQ33scn7history5Stage$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv - .byte4 __cl__Q43std3tr16detail275function_imp$$0PFv_v$$4Q43std3tr16detail231bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q33scn7history5Stage$$4i$$1$$4Q33std3tr1150tuple$$0PQ33scn7history5Stage$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte __dt__Q43std3tr16detail275function_imp$$0PFv_v$$4Q43std3tr16detail231bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q33scn7history5Stage$$4i$$1$$4Q33std3tr1150tuple$$0PQ33scn7history5Stage$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte clone__Q43std3tr16detail275function_imp$$0PFv_v$$4Q43std3tr16detail231bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q33scn7history5Stage$$4i$$1$$4Q33std3tr1150tuple$$0PQ33scn7history5Stage$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv + .4byte clone__Q43std3tr16detail275function_imp$$0PFv_v$$4Q43std3tr16detail231bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q33scn7history5Stage$$4i$$1$$4Q33std3tr1150tuple$$0PQ33scn7history5Stage$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv + .4byte __cl__Q43std3tr16detail275function_imp$$0PFv_v$$4Q43std3tr16detail231bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q33scn7history5Stage$$4i$$1$$4Q33std3tr1150tuple$$0PQ33scn7history5Stage$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv .global __vt__Q43std3tr16detail305function_imp$$0PFv_v$$4Q43std3tr16detail261bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q23snd11SERequestor$$4Ul$$1$$4Q33std3tr1180tuple$$0Q33std3tr138reference_wrapper$$0Q23snd11SERequestor$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail305function_imp$$0PFv_v$$4Q43std3tr16detail261bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q23snd11SERequestor$$4Ul$$1$$4Q33std3tr1180tuple$$0Q33std3tr138reference_wrapper$$0Q23snd11SERequestor$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail305function_imp$$0PFv_v$$4Q43std3tr16detail261bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q23snd11SERequestor$$4Ul$$1$$4Q33std3tr1180tuple$$0Q33std3tr138reference_wrapper$$0Q23snd11SERequestor$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv - .byte4 clone__Q43std3tr16detail305function_imp$$0PFv_v$$4Q43std3tr16detail261bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q23snd11SERequestor$$4Ul$$1$$4Q33std3tr1180tuple$$0Q33std3tr138reference_wrapper$$0Q23snd11SERequestor$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv - .byte4 clone__Q43std3tr16detail305function_imp$$0PFv_v$$4Q43std3tr16detail261bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q23snd11SERequestor$$4Ul$$1$$4Q33std3tr1180tuple$$0Q33std3tr138reference_wrapper$$0Q23snd11SERequestor$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv - .byte4 __cl__Q43std3tr16detail305function_imp$$0PFv_v$$4Q43std3tr16detail261bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q23snd11SERequestor$$4Ul$$1$$4Q33std3tr1180tuple$$0Q33std3tr138reference_wrapper$$0Q23snd11SERequestor$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte __dt__Q43std3tr16detail305function_imp$$0PFv_v$$4Q43std3tr16detail261bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q23snd11SERequestor$$4Ul$$1$$4Q33std3tr1180tuple$$0Q33std3tr138reference_wrapper$$0Q23snd11SERequestor$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte clone__Q43std3tr16detail305function_imp$$0PFv_v$$4Q43std3tr16detail261bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q23snd11SERequestor$$4Ul$$1$$4Q33std3tr1180tuple$$0Q33std3tr138reference_wrapper$$0Q23snd11SERequestor$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv + .4byte clone__Q43std3tr16detail305function_imp$$0PFv_v$$4Q43std3tr16detail261bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q23snd11SERequestor$$4Ul$$1$$4Q33std3tr1180tuple$$0Q33std3tr138reference_wrapper$$0Q23snd11SERequestor$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv + .4byte __cl__Q43std3tr16detail305function_imp$$0PFv_v$$4Q43std3tr16detail261bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q23snd11SERequestor$$4Ul$$1$$4Q33std3tr1180tuple$$0Q33std3tr138reference_wrapper$$0Q23snd11SERequestor$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv .global __vt__Q43std3tr16detail286function_imp$$0PFv_v$$4Q43std3tr16detail242bound_func$$0v$$4Q43std3tr16detail32mem_fn_0$$0v$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail286function_imp$$0PFv_v$$4Q43std3tr16detail242bound_func$$0v$$4Q43std3tr16detail32mem_fn_0$$0v$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail286function_imp$$0PFv_v$$4Q43std3tr16detail242bound_func$$0v$$4Q43std3tr16detail32mem_fn_0$$0v$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv - .byte4 clone__Q43std3tr16detail286function_imp$$0PFv_v$$4Q43std3tr16detail242bound_func$$0v$$4Q43std3tr16detail32mem_fn_0$$0v$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv - .byte4 clone__Q43std3tr16detail286function_imp$$0PFv_v$$4Q43std3tr16detail242bound_func$$0v$$4Q43std3tr16detail32mem_fn_0$$0v$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv - .byte4 __cl__Q43std3tr16detail286function_imp$$0PFv_v$$4Q43std3tr16detail242bound_func$$0v$$4Q43std3tr16detail32mem_fn_0$$0v$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte __dt__Q43std3tr16detail286function_imp$$0PFv_v$$4Q43std3tr16detail242bound_func$$0v$$4Q43std3tr16detail32mem_fn_0$$0v$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte clone__Q43std3tr16detail286function_imp$$0PFv_v$$4Q43std3tr16detail242bound_func$$0v$$4Q43std3tr16detail32mem_fn_0$$0v$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv + .4byte clone__Q43std3tr16detail286function_imp$$0PFv_v$$4Q43std3tr16detail242bound_func$$0v$$4Q43std3tr16detail32mem_fn_0$$0v$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv + .4byte __cl__Q43std3tr16detail286function_imp$$0PFv_v$$4Q43std3tr16detail242bound_func$$0v$$4Q43std3tr16detail32mem_fn_0$$0v$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv .global __vt__Q43std3tr16detail286function_imp$$0PFv_b$$4Q43std3tr16detail242bound_func$$0b$$4Q43std3tr16detail32mem_fn_0$$0b$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail286function_imp$$0PFv_b$$4Q43std3tr16detail242bound_func$$0b$$4Q43std3tr16detail32mem_fn_0$$0b$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail286function_imp$$0PFv_b$$4Q43std3tr16detail242bound_func$$0b$$4Q43std3tr16detail32mem_fn_0$$0b$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv - .byte4 clone__Q43std3tr16detail286function_imp$$0PFv_b$$4Q43std3tr16detail242bound_func$$0b$$4Q43std3tr16detail32mem_fn_0$$0b$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv - .byte4 clone__Q43std3tr16detail286function_imp$$0PFv_b$$4Q43std3tr16detail242bound_func$$0b$$4Q43std3tr16detail32mem_fn_0$$0b$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv - .byte4 __cl__Q43std3tr16detail286function_imp$$0PFv_b$$4Q43std3tr16detail242bound_func$$0b$$4Q43std3tr16detail32mem_fn_0$$0b$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte __dt__Q43std3tr16detail286function_imp$$0PFv_b$$4Q43std3tr16detail242bound_func$$0b$$4Q43std3tr16detail32mem_fn_0$$0b$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte clone__Q43std3tr16detail286function_imp$$0PFv_b$$4Q43std3tr16detail242bound_func$$0b$$4Q43std3tr16detail32mem_fn_0$$0b$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv + .4byte clone__Q43std3tr16detail286function_imp$$0PFv_b$$4Q43std3tr16detail242bound_func$$0b$$4Q43std3tr16detail32mem_fn_0$$0b$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv + .4byte __cl__Q43std3tr16detail286function_imp$$0PFv_b$$4Q43std3tr16detail242bound_func$$0b$$4Q43std3tr16detail32mem_fn_0$$0b$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv .global __vt__Q43std3tr16detail302function_imp$$0PFv_v$$4Q43std3tr16detail258bound_func$$0v$$4Q43std3tr16detail56mem_fn_2$$0v$$4Q33scn7history5Stage$$4i$$4RCQ33hel4math7Vector3$$1$$4Q33std3tr1155tuple$$0PQ33scn7history5Stage$$4i$$4Q33hel4math7Vector3$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail302function_imp$$0PFv_v$$4Q43std3tr16detail258bound_func$$0v$$4Q43std3tr16detail56mem_fn_2$$0v$$4Q33scn7history5Stage$$4i$$4RCQ33hel4math7Vector3$$1$$4Q33std3tr1155tuple$$0PQ33scn7history5Stage$$4i$$4Q33hel4math7Vector3$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail302function_imp$$0PFv_v$$4Q43std3tr16detail258bound_func$$0v$$4Q43std3tr16detail56mem_fn_2$$0v$$4Q33scn7history5Stage$$4i$$4RCQ33hel4math7Vector3$$1$$4Q33std3tr1155tuple$$0PQ33scn7history5Stage$$4i$$4Q33hel4math7Vector3$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv - .byte4 clone__Q43std3tr16detail302function_imp$$0PFv_v$$4Q43std3tr16detail258bound_func$$0v$$4Q43std3tr16detail56mem_fn_2$$0v$$4Q33scn7history5Stage$$4i$$4RCQ33hel4math7Vector3$$1$$4Q33std3tr1155tuple$$0PQ33scn7history5Stage$$4i$$4Q33hel4math7Vector3$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv - .byte4 clone__Q43std3tr16detail302function_imp$$0PFv_v$$4Q43std3tr16detail258bound_func$$0v$$4Q43std3tr16detail56mem_fn_2$$0v$$4Q33scn7history5Stage$$4i$$4RCQ33hel4math7Vector3$$1$$4Q33std3tr1155tuple$$0PQ33scn7history5Stage$$4i$$4Q33hel4math7Vector3$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv - .byte4 __cl__Q43std3tr16detail302function_imp$$0PFv_v$$4Q43std3tr16detail258bound_func$$0v$$4Q43std3tr16detail56mem_fn_2$$0v$$4Q33scn7history5Stage$$4i$$4RCQ33hel4math7Vector3$$1$$4Q33std3tr1155tuple$$0PQ33scn7history5Stage$$4i$$4Q33hel4math7Vector3$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte __dt__Q43std3tr16detail302function_imp$$0PFv_v$$4Q43std3tr16detail258bound_func$$0v$$4Q43std3tr16detail56mem_fn_2$$0v$$4Q33scn7history5Stage$$4i$$4RCQ33hel4math7Vector3$$1$$4Q33std3tr1155tuple$$0PQ33scn7history5Stage$$4i$$4Q33hel4math7Vector3$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte clone__Q43std3tr16detail302function_imp$$0PFv_v$$4Q43std3tr16detail258bound_func$$0v$$4Q43std3tr16detail56mem_fn_2$$0v$$4Q33scn7history5Stage$$4i$$4RCQ33hel4math7Vector3$$1$$4Q33std3tr1155tuple$$0PQ33scn7history5Stage$$4i$$4Q33hel4math7Vector3$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv + .4byte clone__Q43std3tr16detail302function_imp$$0PFv_v$$4Q43std3tr16detail258bound_func$$0v$$4Q43std3tr16detail56mem_fn_2$$0v$$4Q33scn7history5Stage$$4i$$4RCQ33hel4math7Vector3$$1$$4Q33std3tr1155tuple$$0PQ33scn7history5Stage$$4i$$4Q33hel4math7Vector3$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv + .4byte __cl__Q43std3tr16detail302function_imp$$0PFv_v$$4Q43std3tr16detail258bound_func$$0v$$4Q43std3tr16detail56mem_fn_2$$0v$$4Q33scn7history5Stage$$4i$$4RCQ33hel4math7Vector3$$1$$4Q33std3tr1155tuple$$0PQ33scn7history5Stage$$4i$$4Q33hel4math7Vector3$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv .global __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 __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: .4byte 0 .4byte 0 - .byte4 __dt__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$$1Fv - .byte4 clone__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$$1CFv - .byte4 clone__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$$1CFPv - .byte4 __cl__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$$1Fv + .4byte __dt__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$$1Fv + .4byte clone__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$$1CFv + .4byte clone__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$$1CFPv + .4byte __cl__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$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -11311,30 +11311,30 @@ $$255601: $$255656: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isPushEnd__Q34info6common10ButtonHelpCFv + .4byte isPushEnd__Q34info6common10ButtonHelpCFv .global $$255657 $$255657: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setColor__Q23sfx4FadeFRC8_GXColor + .4byte setColor__Q23sfx4FadeFRC8_GXColor .global $$255658 $$255658: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setFadeOut__Q23sfx4FadeFUl + .4byte setFadeOut__Q23sfx4FadeFUl .global $$255659 $$255659: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isEnd__Q23sfx4FadeCFv + .4byte isEnd__Q23sfx4FadeCFv .global __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 __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: .4byte 0 .4byte 0 - .byte4 __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 - .byte4 clone__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$$1CFv - .byte4 clone__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$$1CFPv - .byte4 __cl__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 + .4byte __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 + .4byte clone__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$$1CFv + .4byte clone__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$$1CFPv + .4byte __cl__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 .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/Manager.s b/asm/src/Manager.s index 8396ab85..c4083c9b 100644 --- a/asm/src/Manager.s +++ b/asm/src/Manager.s @@ -37905,7 +37905,7 @@ screenRemapDrawEnd__Q23sfx7ManagerFv: /* 80401308 003FD148 4B C2 31 98 */ b DefaultSwitchThreadCallback .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3Manager_cpp + .4byte __sinit_$$3Manager_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$257185 @@ -37915,11 +37915,11 @@ $$257185: .4byte 0x0000000A .global $$257316 $$257316: - .byte4 $$257311 - .byte4 $$257312 - .byte4 $$257313 - .byte4 $$257314 - .byte4 $$257315 + .4byte $$257311 + .4byte $$257312 + .4byte $$257313 + .4byte $$257314 + .4byte $$257315 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251648 @@ -37965,24 +37965,24 @@ $$249107: .4byte 0 .global t_fileNames__Q23msg21$$2unnamed$$2Manager_cpp$$2 t_fileNames__Q23msg21$$2unnamed$$2Manager_cpp$$2: - .byte4 $$249090 - .byte4 $$249091 - .byte4 $$249092 - .byte4 $$249093 - .byte4 $$249094 - .byte4 $$249095 - .byte4 $$249096 - .byte4 $$249097 - .byte4 $$249098 - .byte4 $$249099 - .byte4 $$249100 - .byte4 $$249101 - .byte4 $$249102 - .byte4 $$249103 - .byte4 $$249104 - .byte4 $$249105 - .byte4 $$249106 - .byte4 $$249107 + .4byte $$249090 + .4byte $$249091 + .4byte $$249092 + .4byte $$249093 + .4byte $$249094 + .4byte $$249095 + .4byte $$249096 + .4byte $$249097 + .4byte $$249098 + .4byte $$249099 + .4byte $$249100 + .4byte $$249101 + .4byte $$249102 + .4byte $$249103 + .4byte $$249104 + .4byte $$249105 + .4byte $$249106 + .4byte $$249107 .global $$249787 $$249787: .asciz "MsgManager" @@ -38010,11 +38010,11 @@ $$252573: __vt__Q43scn4step2bg7Manager: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step2bg7ManagerFv - .byte4 onStopNormalStarted__Q43scn4step2bg7ManagerFRCQ25ostop5Actor - .byte4 onStopNormalFinished__Q43scn4step2bg7ManagerFRCQ25ostop5Actor - .byte4 onStopPowerfulStarted__Q43scn4step2bg7ManagerFRCQ25ostop5Actor - .byte4 onStopPowerfulFinished__Q43scn4step2bg7ManagerFRCQ25ostop5Actor + .4byte __dt__Q43scn4step2bg7ManagerFv + .4byte onStopNormalStarted__Q43scn4step2bg7ManagerFRCQ25ostop5Actor + .4byte onStopNormalFinished__Q43scn4step2bg7ManagerFRCQ25ostop5Actor + .4byte onStopPowerfulStarted__Q43scn4step2bg7ManagerFRCQ25ostop5Actor + .4byte onStopPowerfulFinished__Q43scn4step2bg7ManagerFRCQ25ostop5Actor .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -38033,42 +38033,42 @@ T_SCORE_KIND_INFO_TABLE__21$$2unnamed$$2Manager_cpp$$2: .4byte 0x00000127 .4byte 0 .4byte 0xFFFFFFFF - .byte4 resFile100__Q43scn4step9challenge7ManagerFv + .4byte resFile100__Q43scn4step9challenge7ManagerFv .4byte 0 .4byte 0xFFFFFFFF - .byte4 incCoinSCount__Q43scn4step9challenge7ManagerFv + .4byte incCoinSCount__Q43scn4step9challenge7ManagerFv .4byte 0 .4byte 0x00000128 .4byte 0 .4byte 0xFFFFFFFF - .byte4 resFile1000__Q43scn4step9challenge7ManagerFv + .4byte resFile1000__Q43scn4step9challenge7ManagerFv .4byte 0 .4byte 0xFFFFFFFF - .byte4 incCoinLCount__Q43scn4step9challenge7ManagerFv + .4byte incCoinLCount__Q43scn4step9challenge7ManagerFv .4byte 0x01000000 .4byte 0x00000126 .4byte 0 .4byte 0xFFFFFFFF - .byte4 resFile50__Q43scn4step9challenge7ManagerFv + .4byte resFile50__Q43scn4step9challenge7ManagerFv .4byte 0 .4byte 0xFFFFFFFF - .byte4 incEnemyCount__Q43scn4step9challenge7ManagerFv + .4byte incEnemyCount__Q43scn4step9challenge7ManagerFv .4byte 0 .4byte 0x00000128 .4byte 0 .4byte 0xFFFFFFFF - .byte4 resFile1000__Q43scn4step9challenge7ManagerFv + .4byte resFile1000__Q43scn4step9challenge7ManagerFv .4byte 0 .4byte 0xFFFFFFFF - .byte4 incEnemyLCount__Q43scn4step9challenge7ManagerFv + .4byte incEnemyLCount__Q43scn4step9challenge7ManagerFv .4byte 0x01000000 .4byte 0x00000244 .4byte 0 .4byte 0xFFFFFFFF - .byte4 resFile100Minus__Q43scn4step9challenge7ManagerFv + .4byte resFile100Minus__Q43scn4step9challenge7ManagerFv .4byte 0 .4byte 0xFFFFFFFF - .byte4 incDamageScore__Q43scn4step9challenge7ManagerFv + .4byte incDamageScore__Q43scn4step9challenge7ManagerFv .4byte 0 .global $$255619 $$255619: @@ -38112,20 +38112,20 @@ $$259391: __vt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6bouncy11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6bouncy11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv - .byte4 create__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6bouncy11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv + .4byte __dt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6bouncy11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv + .4byte create__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6bouncy11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv .global __vt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1 __vt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv - .byte4 create__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv + .4byte __dt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv + .4byte create__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateGoodbye$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateGoodbye$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateGoodbye$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateGoodbye$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateGoodbye$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateGoodbye$$4PQ43scn4step5enemy5Enemy$$1Fv .section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$024$$1FRQ33scn4step9Component @@ -38192,26 +38192,26 @@ $$266848: __vt__Q24util179StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$4Q33hel4math7Vector3$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util179StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$4Q33hel4math7Vector3$$1Fv - .byte4 create__Q24util179StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$4Q33hel4math7Vector3$$1Fv + .4byte __dt__Q24util179StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$4Q33hel4math7Vector3$$1Fv + .4byte create__Q24util179StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$4Q33hel4math7Vector3$$1Fv .global __vt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$1 __vt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$1Fv - .byte4 create__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$1Fv + .4byte __dt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$1Fv + .4byte create__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateEnterMahoroa$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateEnterMahoroa$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateEnterMahoroa$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateEnterMahoroa$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateEnterMahoroa$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateEnterMahoroa$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceFall$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceFall$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceFall$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceFall$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceFall$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceFall$$4PQ43scn4step4hero4Hero$$1Fv .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256047 @@ -38226,32 +38226,32 @@ $$256049: $$256236: .4byte 0 .4byte 0xFFFFFFFF - .byte4 safeboolFunc__Q24util37PlacementNew$$0Q34info6common8SkipHelp$$1CFv + .4byte safeboolFunc__Q24util37PlacementNew$$0Q34info6common8SkipHelp$$1CFv .global $$256340 $$256340: .4byte 0 .4byte 0xFFFFFFFF - .byte4 safeboolFunc__Q24util35PlacementNew$$0Q34info5cutin7Manager$$1CFv + .4byte safeboolFunc__Q24util35PlacementNew$$0Q34info5cutin7Manager$$1CFv .global $$256351 $$256351: .4byte 0 .4byte 0xFFFFFFFF - .byte4 safeboolFunc__Q24util43PlacementNew$$0Q43scn4step4info11InfoControl$$1CFv + .4byte safeboolFunc__Q24util43PlacementNew$$0Q43scn4step4info11InfoControl$$1CFv .global $$256362 $$256362: .4byte 0 .4byte 0xFFFFFFFF - .byte4 safeboolFunc__Q24util40PlacementNew$$0Q53scn4step4info4ship4Ship$$1CFv + .4byte safeboolFunc__Q24util40PlacementNew$$0Q53scn4step4info4ship4Ship$$1CFv .global $$256373 $$256373: .4byte 0 .4byte 0xFFFFFFFF - .byte4 safeboolFunc__Q24util42PlacementNew$$0Q53scn4step4info5lvmap5LvMap$$1CFv + .4byte safeboolFunc__Q24util42PlacementNew$$0Q53scn4step4info5lvmap5LvMap$$1CFv .global $$256384 $$256384: .4byte 0 .4byte 0xFFFFFFFF - .byte4 safeboolFunc__Q24util50PlacementNew$$0Q53scn4step4info9challenge9Challenge$$1CFv + .4byte safeboolFunc__Q24util50PlacementNew$$0Q53scn4step4info9challenge9Challenge$$1CFv .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254030 diff --git a/asm/src/ManualData.s b/asm/src/ManualData.s index ae68c653..8c90cd65 100644 --- a/asm/src/ManualData.s +++ b/asm/src/ManualData.s @@ -467,260 +467,260 @@ IsCommandLineDouble__Q25pause10ManualDataFQ25pause10ManualKindUlUl: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_CMD_NORMAL__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_NORMAL__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .byte4 $$248732 + .4byte $$248732 .4byte 0 - .byte4 $$248733 + .4byte $$248733 .4byte 0 - .byte4 $$248734 + .4byte $$248734 .4byte 0 - .byte4 $$248735 + .4byte $$248735 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248736 + .4byte $$248736 .4byte 0 - .byte4 $$248737 + .4byte $$248737 .4byte 0 - .byte4 $$248738 + .4byte $$248738 .4byte 0 .global T_CMD_NORMAL_IN_WATER__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_NORMAL_IN_WATER__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .byte4 $$248739 + .4byte $$248739 .4byte 0 - .byte4 $$248740 + .4byte $$248740 .4byte 0 - .byte4 $$248741 + .4byte $$248741 .4byte 0 .global T_CMD_SWORD__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_SWORD__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .byte4 $$248742 + .4byte $$248742 .4byte 0 - .byte4 $$248743 + .4byte $$248743 .4byte 0 - .byte4 $$248744 + .4byte $$248744 .4byte 0 - .byte4 $$248745 + .4byte $$248745 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248746 + .4byte $$248746 .4byte 0 - .byte4 $$248736 + .4byte $$248736 .4byte 0 - .byte4 $$248747 + .4byte $$248747 .4byte 0 - .byte4 $$248748 + .4byte $$248748 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248749 + .4byte $$248749 .4byte 0 - .byte4 $$248750 + .4byte $$248750 .4byte 0 - .byte4 $$248751 + .4byte $$248751 .4byte 0 .global T_CMD_WHIP__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_WHIP__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .byte4 $$248752 + .4byte $$248752 .4byte 0 - .byte4 $$248753 + .4byte $$248753 .4byte 0 - .byte4 $$248754 + .4byte $$248754 .4byte 0 - .byte4 $$248755 + .4byte $$248755 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248732 + .4byte $$248732 .4byte 0 - .byte4 $$248756 + .4byte $$248756 .4byte 0 - .byte4 $$248757 + .4byte $$248757 .4byte 0 - .byte4 $$248758 + .4byte $$248758 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248759 + .4byte $$248759 .4byte 0 - .byte4 $$248760 + .4byte $$248760 .4byte 0 - .byte4 $$248761 + .4byte $$248761 .4byte 0 - .byte4 $$248762 + .4byte $$248762 .4byte 0 .global T_CMD_SPARK__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_SPARK__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .byte4 $$248763 + .4byte $$248763 .4byte 0 - .byte4 $$248764 + .4byte $$248764 .4byte 0 - .byte4 $$248765 + .4byte $$248765 .4byte 0 - .byte4 $$248766 + .4byte $$248766 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248767 + .4byte $$248767 .4byte 0 - .byte4 $$248768 + .4byte $$248768 .4byte 0 - .byte4 $$248769 + .4byte $$248769 .4byte 0 - .byte4 $$248770 + .4byte $$248770 .4byte 0 .global T_CMD_PARASOL__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_PARASOL__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .byte4 $$248771 + .4byte $$248771 .4byte 0 - .byte4 $$248772 + .4byte $$248772 .4byte 0 - .byte4 $$248773 + .4byte $$248773 .4byte 0 - .byte4 $$248746 + .4byte $$248746 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248774 + .4byte $$248774 .4byte 0 - .byte4 $$248775 + .4byte $$248775 .4byte 0 - .byte4 $$248776 + .4byte $$248776 .4byte 0 - .byte4 $$248777 + .4byte $$248777 .4byte 0 .global T_CMD_WING__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_WING__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .byte4 $$248778 + .4byte $$248778 .4byte 0 - .byte4 $$248779 + .4byte $$248779 .4byte 0 - .byte4 $$248780 + .4byte $$248780 .4byte 0 - .byte4 $$248781 + .4byte $$248781 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248782 + .4byte $$248782 .4byte 0 - .byte4 $$248783 + .4byte $$248783 .4byte 0 - .byte4 $$248784 + .4byte $$248784 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248785 + .4byte $$248785 .4byte 0 - .byte4 $$248786 + .4byte $$248786 .4byte 0 - .byte4 $$248787 + .4byte $$248787 .4byte 0 .global T_CMD_FIGHTER__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_FIGHTER__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .byte4 $$248732 + .4byte $$248732 .4byte 0 - .byte4 $$248788 + .4byte $$248788 .4byte 0 - .byte4 $$248748 + .4byte $$248748 .4byte 0 - .byte4 $$248789 + .4byte $$248789 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248790 + .4byte $$248790 .4byte 0 - .byte4 $$248791 + .4byte $$248791 .4byte 0 - .byte4 $$248792 + .4byte $$248792 .4byte 0 - .byte4 $$248793 + .4byte $$248793 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248767 + .4byte $$248767 .4byte 0 - .byte4 $$248794 + .4byte $$248794 .4byte 0 - .byte4 $$248795 + .4byte $$248795 .4byte 0 - .byte4 $$248796 + .4byte $$248796 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248797 + .4byte $$248797 .4byte 0 - .byte4 $$248758 + .4byte $$248758 .4byte 0 - .byte4 $$248776 + .4byte $$248776 .4byte 0 - .byte4 $$248798 + .4byte $$248798 .4byte 0 .global T_CMD_SMASH__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_SMASH__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .byte4 $$248799 + .4byte $$248799 .4byte 0 - .byte4 $$248736 + .4byte $$248736 .4byte 0 - .byte4 $$248800 + .4byte $$248800 .4byte 0 - .byte4 $$248801 + .4byte $$248801 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248802 + .4byte $$248802 .4byte 0 - .byte4 $$248803 + .4byte $$248803 .4byte 0 - .byte4 $$248804 + .4byte $$248804 .4byte 0 - .byte4 $$248805 + .4byte $$248805 .4byte 0 .global T_ENTRIES__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_ENTRIES__Q25pause24$$2unnamed$$2ManualData_cpp$$2: .4byte 0 - .byte4 $$248742 + .4byte $$248742 .4byte 0 - .byte4 T_CMD_NORMAL__Q25pause24$$2unnamed$$2ManualData_cpp$$2 + .4byte T_CMD_NORMAL__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x00000008 .4byte 0 - .byte4 $$248895 - .byte4 $$248742 - .byte4 T_CMD_NORMAL_IN_WATER__Q25pause24$$2unnamed$$2ManualData_cpp$$2 + .4byte $$248895 + .4byte $$248742 + .4byte T_CMD_NORMAL_IN_WATER__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x00000003 .4byte 0 - .byte4 $$248896 + .4byte $$248896 .4byte 0 - .byte4 T_CMD_SWORD__Q25pause24$$2unnamed$$2ManualData_cpp$$2 + .4byte T_CMD_SWORD__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x0000000D .4byte 0x01000000 - .byte4 $$248897 + .4byte $$248897 .4byte 0 - .byte4 T_CMD_WHIP__Q25pause24$$2unnamed$$2ManualData_cpp$$2 + .4byte T_CMD_WHIP__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x0000000E .4byte 0 - .byte4 $$248898 + .4byte $$248898 .4byte 0 - .byte4 T_CMD_SPARK__Q25pause24$$2unnamed$$2ManualData_cpp$$2 + .4byte T_CMD_SPARK__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x00000009 .4byte 0x01000000 - .byte4 $$248899 + .4byte $$248899 .4byte 0 - .byte4 T_CMD_PARASOL__Q25pause24$$2unnamed$$2ManualData_cpp$$2 + .4byte T_CMD_PARASOL__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x00000009 .4byte 0 - .byte4 $$248900 + .4byte $$248900 .4byte 0 - .byte4 T_CMD_WING__Q25pause24$$2unnamed$$2ManualData_cpp$$2 + .4byte T_CMD_WING__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x0000000C .4byte 0x01000000 - .byte4 $$248901 + .4byte $$248901 .4byte 0 - .byte4 T_CMD_FIGHTER__Q25pause24$$2unnamed$$2ManualData_cpp$$2 + .4byte T_CMD_FIGHTER__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x00000013 .4byte 0 - .byte4 $$248902 + .4byte $$248902 .4byte 0 - .byte4 T_CMD_SMASH__Q25pause24$$2unnamed$$2ManualData_cpp$$2 + .4byte T_CMD_SMASH__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x00000009 .4byte 0 diff --git a/asm/src/Message.s b/asm/src/Message.s index 9b6d4b51..53a1852e 100644 --- a/asm/src/Message.s +++ b/asm/src/Message.s @@ -700,209 +700,209 @@ ListenConfirmMusic__Q43scn7history6detail7MessageFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global MSG_LABEL_ARRAY__Q43scn7history6detail21$$2unnamed$$2Message_cpp$$2 MSG_LABEL_ARRAY__Q43scn7history6detail21$$2unnamed$$2Message_cpp$$2: - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 .4byte 0 - .byte4 $$248754 - .byte4 $$248755 - .byte4 $$248756 - .byte4 $$248757 - .byte4 $$248758 - .byte4 $$248759 - .byte4 $$248760 - .byte4 $$248761 - .byte4 $$248762 - .byte4 $$248763 - .byte4 $$248764 - .byte4 $$248765 - .byte4 $$248766 - .byte4 $$248760 - .byte4 $$248767 - .byte4 $$248768 - .byte4 $$248769 - .byte4 $$248770 - .byte4 $$248758 - .byte4 $$248771 - .byte4 $$248771 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 + .4byte $$248754 + .4byte $$248755 + .4byte $$248756 + .4byte $$248757 + .4byte $$248758 + .4byte $$248759 + .4byte $$248760 + .4byte $$248761 + .4byte $$248762 + .4byte $$248763 + .4byte $$248764 + .4byte $$248765 + .4byte $$248766 + .4byte $$248760 + .4byte $$248767 + .4byte $$248768 + .4byte $$248769 + .4byte $$248770 + .4byte $$248758 + .4byte $$248771 + .4byte $$248771 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 .4byte 0 - .byte4 $$248772 - .byte4 $$248773 - .byte4 $$248774 - .byte4 $$248775 - .byte4 $$248776 - .byte4 $$248771 - .byte4 $$248771 - .byte4 $$248777 - .byte4 $$248778 - .byte4 $$248779 - .byte4 $$248780 - .byte4 $$248776 - .byte4 $$248771 - .byte4 $$248771 - .byte4 $$248781 - .byte4 $$248782 - .byte4 $$248783 - .byte4 $$248784 - .byte4 $$248758 - .byte4 $$248785 - .byte4 $$248760 - .byte4 $$248786 - .byte4 $$248787 - .byte4 $$248788 - .byte4 $$248789 - .byte4 $$248758 - .byte4 $$248771 - .byte4 $$248771 - .byte4 $$248790 - .byte4 $$248791 - .byte4 $$248792 - .byte4 $$248793 - .byte4 $$248776 - .byte4 $$248794 - .byte4 $$248795 - .byte4 $$248796 - .byte4 $$248797 - .byte4 $$248798 - .byte4 $$248799 - .byte4 $$248758 - .byte4 $$248771 - .byte4 $$248771 - .byte4 $$248800 - .byte4 $$248801 - .byte4 $$248802 - .byte4 $$248803 - .byte4 $$248776 - .byte4 $$248804 - .byte4 $$248795 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 + .4byte $$248772 + .4byte $$248773 + .4byte $$248774 + .4byte $$248775 + .4byte $$248776 + .4byte $$248771 + .4byte $$248771 + .4byte $$248777 + .4byte $$248778 + .4byte $$248779 + .4byte $$248780 + .4byte $$248776 + .4byte $$248771 + .4byte $$248771 + .4byte $$248781 + .4byte $$248782 + .4byte $$248783 + .4byte $$248784 + .4byte $$248758 + .4byte $$248785 + .4byte $$248760 + .4byte $$248786 + .4byte $$248787 + .4byte $$248788 + .4byte $$248789 + .4byte $$248758 + .4byte $$248771 + .4byte $$248771 + .4byte $$248790 + .4byte $$248791 + .4byte $$248792 + .4byte $$248793 + .4byte $$248776 + .4byte $$248794 + .4byte $$248795 + .4byte $$248796 + .4byte $$248797 + .4byte $$248798 + .4byte $$248799 + .4byte $$248758 + .4byte $$248771 + .4byte $$248771 + .4byte $$248800 + .4byte $$248801 + .4byte $$248802 + .4byte $$248803 + .4byte $$248776 + .4byte $$248804 + .4byte $$248795 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 .4byte 0 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 .4byte 0 - .byte4 $$248805 - .byte4 $$248806 - .byte4 $$248807 - .byte4 $$248808 - .byte4 $$248809 - .byte4 $$248810 - .byte4 $$248811 - .byte4 $$248812 - .byte4 $$248813 - .byte4 $$248814 - .byte4 $$248815 - .byte4 $$248816 - .byte4 $$248771 - .byte4 $$248771 - .byte4 $$248817 - .byte4 $$248818 - .byte4 $$248819 - .byte4 $$248820 - .byte4 $$248821 - .byte4 $$248771 - .byte4 $$248771 - .byte4 $$248822 - .byte4 $$248823 - .byte4 $$248824 - .byte4 $$248825 - .byte4 $$248826 - .byte4 $$248827 - .byte4 $$248771 - .byte4 $$248828 - .byte4 $$248829 - .byte4 $$248830 - .byte4 $$248831 - .byte4 $$248832 - .byte4 $$248771 - .byte4 $$248771 - .byte4 $$248833 - .byte4 $$248834 - .byte4 $$248835 - .byte4 $$248836 - .byte4 $$248821 - .byte4 $$248771 - .byte4 $$248771 - .byte4 $$248837 - .byte4 $$248838 - .byte4 $$248839 - .byte4 $$248840 - .byte4 $$248841 - .byte4 $$248771 - .byte4 $$248771 - .byte4 $$248842 - .byte4 $$248843 - .byte4 $$248844 - .byte4 $$248845 - .byte4 $$248841 - .byte4 $$248771 - .byte4 $$248771 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 + .4byte $$248805 + .4byte $$248806 + .4byte $$248807 + .4byte $$248808 + .4byte $$248809 + .4byte $$248810 + .4byte $$248811 + .4byte $$248812 + .4byte $$248813 + .4byte $$248814 + .4byte $$248815 + .4byte $$248816 + .4byte $$248771 + .4byte $$248771 + .4byte $$248817 + .4byte $$248818 + .4byte $$248819 + .4byte $$248820 + .4byte $$248821 + .4byte $$248771 + .4byte $$248771 + .4byte $$248822 + .4byte $$248823 + .4byte $$248824 + .4byte $$248825 + .4byte $$248826 + .4byte $$248827 + .4byte $$248771 + .4byte $$248828 + .4byte $$248829 + .4byte $$248830 + .4byte $$248831 + .4byte $$248832 + .4byte $$248771 + .4byte $$248771 + .4byte $$248833 + .4byte $$248834 + .4byte $$248835 + .4byte $$248836 + .4byte $$248821 + .4byte $$248771 + .4byte $$248771 + .4byte $$248837 + .4byte $$248838 + .4byte $$248839 + .4byte $$248840 + .4byte $$248841 + .4byte $$248771 + .4byte $$248771 + .4byte $$248842 + .4byte $$248843 + .4byte $$248844 + .4byte $$248845 + .4byte $$248841 + .4byte $$248771 + .4byte $$248771 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 .4byte 0 - .byte4 $$248846 - .byte4 $$248847 - .byte4 $$248848 - .byte4 $$248849 - .byte4 $$248841 - .byte4 $$248771 - .byte4 $$248771 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 - .byte4 $$248753 + .4byte $$248846 + .4byte $$248847 + .4byte $$248848 + .4byte $$248849 + .4byte $$248841 + .4byte $$248771 + .4byte $$248771 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 + .4byte $$248753 .4byte 0 - .byte4 $$248850 - .byte4 $$248851 - .byte4 $$248852 - .byte4 $$248853 - .byte4 $$248854 - .byte4 $$248771 - .byte4 $$248771 - .byte4 $$248855 - .byte4 $$248856 - .byte4 $$248857 - .byte4 $$248858 - .byte4 $$248841 - .byte4 $$248771 - .byte4 $$248771 - .byte4 $$248859 - .byte4 $$248860 - .byte4 $$248861 - .byte4 $$248862 - .byte4 $$248854 - .byte4 $$248771 - .byte4 $$248771 - .byte4 $$248863 - .byte4 $$248864 - .byte4 $$248865 - .byte4 $$248866 - .byte4 $$248867 - .byte4 $$248771 - .byte4 $$248771 + .4byte $$248850 + .4byte $$248851 + .4byte $$248852 + .4byte $$248853 + .4byte $$248854 + .4byte $$248771 + .4byte $$248771 + .4byte $$248855 + .4byte $$248856 + .4byte $$248857 + .4byte $$248858 + .4byte $$248841 + .4byte $$248771 + .4byte $$248771 + .4byte $$248859 + .4byte $$248860 + .4byte $$248861 + .4byte $$248862 + .4byte $$248854 + .4byte $$248771 + .4byte $$248771 + .4byte $$248863 + .4byte $$248864 + .4byte $$248865 + .4byte $$248866 + .4byte $$248867 + .4byte $$248771 + .4byte $$248771 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -921,10 +921,10 @@ $$248892: .global DIRS_US__21$$2unnamed$$2Message_cpp$$2 DIRS_US__21$$2unnamed$$2Message_cpp$$2: .4byte 0 - .byte4 $$248890 + .4byte $$248890 .4byte 0 - .byte4 $$248891 - .byte4 $$248892 + .4byte $$248891 + .4byte $$248892 .4byte 0 .4byte 0 .global $$248894 @@ -954,18 +954,18 @@ $$248899: .global DIRS_EU__21$$2unnamed$$2Message_cpp$$2 DIRS_EU__21$$2unnamed$$2Message_cpp$$2: .4byte 0 - .byte4 $$248894 - .byte4 $$248895 - .byte4 $$248896 - .byte4 $$248897 - .byte4 $$248898 - .byte4 $$248899 + .4byte $$248894 + .4byte $$248895 + .4byte $$248896 + .4byte $$248897 + .4byte $$248898 + .4byte $$248899 .global $$248901 $$248901: .asciz "JP_Japanese" .global DIRS_JP__21$$2unnamed$$2Message_cpp$$2 DIRS_JP__21$$2unnamed$$2Message_cpp$$2: - .byte4 $$248901 + .4byte $$248901 .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/MessageWindow.s b/asm/src/MessageWindow.s index 6d18a015..79d5b62c 100644 --- a/asm/src/MessageWindow.s +++ b/asm/src/MessageWindow.s @@ -2078,22 +2078,22 @@ $$257580: $$257614: .4byte 0 .4byte 0xFFFFFFFF - .byte4 processMessage__Q43scn4step4info13MessageWindowFUl + .4byte processMessage__Q43scn4step4info13MessageWindowFUl .global $$257687 $$257687: .4byte 0 .4byte 0xFFFFFFFF - .byte4 processMessage__Q43scn4step4info13MessageWindowFUl + .4byte processMessage__Q43scn4step4info13MessageWindowFUl .global $$257688 $$257688: .4byte 0 .4byte 0xFFFFFFFF - .byte4 processMessage__Q43scn4step4info13MessageWindowFUl + .4byte processMessage__Q43scn4step4info13MessageWindowFUl .global $$257731 $$257731: .4byte 0 .4byte 0xFFFFFFFF - .byte4 actionCallbackIN__Q43scn4step4info13MessageWindowFPCcPCc + .4byte actionCallbackIN__Q43scn4step4info13MessageWindowFPCcPCc .global $$257820 $$257820: .asciz "MahoroaName" @@ -2105,10 +2105,10 @@ $$257831: __vt__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$$1: .4byte 0 .4byte 0 - .byte4 __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 - .byte4 clone__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$$1CFv - .byte4 clone__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$$1CFPv - .byte4 __cl__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$$1FPCcPCc + .4byte __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 + .4byte clone__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$$1CFv + .4byte clone__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$$1CFPv + .4byte __cl__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$$1FPCcPCc .4byte 0 .4byte 0 .4byte 0 @@ -2119,10 +2119,10 @@ __vt__Q43std3tr16detail367function_imp$$0PFPCcPCc_v$$4Q43std3tr16detail318bound_ __vt__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv - .byte4 clone__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv - .byte4 clone__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv - .byte4 __cl__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte __dt__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte clone__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv + .4byte clone__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv + .4byte __cl__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -2133,18 +2133,18 @@ __vt__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$ __vt__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv - .byte4 clone__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv - .byte4 clone__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv - .byte4 __cl__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte __dt__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte clone__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv + .4byte clone__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv + .4byte __cl__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1161tuple$$0PQ43scn4step4info13MessageWindow$$4i$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv .global __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 __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: .4byte 0 .4byte 0 - .byte4 __dt__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$$1Fv - .byte4 clone__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$$1CFv - .byte4 clone__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$$1CFPv - .byte4 __cl__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$$1Fv + .4byte __dt__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$$1Fv + .4byte clone__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$$1CFv + .4byte clone__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$$1CFPv + .4byte __cl__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$$1Fv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/Meta.s b/asm/src/Meta.s index ab2b6717..196537bf 100644 --- a/asm/src/Meta.s +++ b/asm/src/Meta.s @@ -95,41 +95,41 @@ Script__Q53scn4step4hero9modeldesc4MetaFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20 $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20: - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000C - .byte4 $$248728 + .4byte $$248728 .4byte 0x0000000C - .byte4 $$248729 + .4byte $$248729 .4byte 0x0000000C - .byte4 $$248730 + .4byte $$248730 .4byte 0x0000000C - .byte4 $$248731 + .4byte $$248731 .4byte 0x0000000C - .byte4 $$248732 + .4byte $$248732 .4byte 0x0000000C - .byte4 $$248733 + .4byte $$248733 .4byte 0x0000000C - .byte4 $$248734 + .4byte $$248734 .4byte 0x0000000C - .byte4 $$248735 + .4byte $$248735 .4byte 0x0000000C - .byte4 $$248736 + .4byte $$248736 .4byte 0x0000000C - .byte4 $$248737 + .4byte $$248737 .4byte 0x0000000C - .byte4 $$248738 + .4byte $$248738 .4byte 0x0000000C - .byte4 $$248739 + .4byte $$248739 .4byte 0x0000000C - .byte4 $$248740 + .4byte $$248740 .4byte 0x0000000C - .byte4 $$248741 + .4byte $$248741 .4byte 0x0000000C - .byte4 $$248742 + .4byte $$248742 .4byte 0x0000000C - .byte4 $$248743 + .4byte $$248743 .4byte 0x0000000C - .byte4 $$248744 + .4byte $$248744 .4byte 0x0000000C .4byte 0 .4byte 0 @@ -155,15 +155,15 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248745 + .4byte $$248745 .4byte 0x0000000C - .byte4 $$248746 + .4byte $$248746 .4byte 0x0000000C - .byte4 $$248747 + .4byte $$248747 .4byte 0x0000000C - .byte4 $$248748 + .4byte $$248748 .4byte 0x0000000C - .byte4 $$248749 + .4byte $$248749 .4byte 0x0000000C .4byte 0 .4byte 0 @@ -197,21 +197,21 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248750 + .4byte $$248750 .4byte 0x0000000C - .byte4 $$248751 + .4byte $$248751 .4byte 0x0000000C - .byte4 $$248752 + .4byte $$248752 .4byte 0x0000000C - .byte4 $$248753 + .4byte $$248753 .4byte 0x0000000C - .byte4 $$248754 + .4byte $$248754 .4byte 0x0000000C - .byte4 $$248755 + .4byte $$248755 .4byte 0x0000000C - .byte4 $$248756 + .4byte $$248756 .4byte 0x0000000C - .byte4 $$248757 + .4byte $$248757 .4byte 0x0000000C .4byte 0 .4byte 0 @@ -235,25 +235,25 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248758 + .4byte $$248758 .4byte 0x0000000C - .byte4 $$248759 + .4byte $$248759 .4byte 0x0000000C - .byte4 $$248758 + .4byte $$248758 .4byte 0x0000000C - .byte4 $$248759 + .4byte $$248759 .4byte 0x0000000C - .byte4 $$248760 + .4byte $$248760 .4byte 0x0000000C - .byte4 $$248761 + .4byte $$248761 .4byte 0x0000000C - .byte4 $$248762 + .4byte $$248762 .4byte 0x0000000C - .byte4 $$248763 + .4byte $$248763 .4byte 0x0000000C - .byte4 $$248764 + .4byte $$248764 .4byte 0x0000000C - .byte4 $$248765 + .4byte $$248765 .4byte 0x0000000C .4byte 0 .4byte 0 @@ -267,115 +267,115 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248766 + .4byte $$248766 .4byte 0x0000000C - .byte4 $$248767 + .4byte $$248767 .4byte 0x0000000C - .byte4 $$248768 + .4byte $$248768 .4byte 0x0000000C - .byte4 $$248769 + .4byte $$248769 .4byte 0x0000000C - .byte4 $$248770 + .4byte $$248770 .4byte 0x0000000C - .byte4 $$248771 + .4byte $$248771 .4byte 0x0000000C - .byte4 $$248772 + .4byte $$248772 .4byte 0x0000000C - .byte4 $$248773 + .4byte $$248773 .4byte 0x0000000C - .byte4 $$248774 + .4byte $$248774 .4byte 0x0000000C - .byte4 $$248775 + .4byte $$248775 .4byte 0x0000000C - .byte4 $$248776 + .4byte $$248776 .4byte 0x0000000C - .byte4 $$248777 + .4byte $$248777 .4byte 0x0000000C - .byte4 $$248778 + .4byte $$248778 .4byte 0x0000000C - .byte4 $$248779 + .4byte $$248779 .4byte 0x0000000C .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000C - .byte4 $$248732 + .4byte $$248732 .4byte 0x0000000C - .byte4 $$248780 + .4byte $$248780 .4byte 0x0000000C .4byte 0 .4byte 0 - .byte4 $$248781 + .4byte $$248781 .4byte 0x0000000C .4byte 0 .4byte 0 - .byte4 $$248782 + .4byte $$248782 .4byte 0x0000000C - .byte4 $$248783 + .4byte $$248783 .4byte 0x0000000C .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248784 + .4byte $$248784 .4byte 0x0000000C - .byte4 $$248785 + .4byte $$248785 .4byte 0x0000000C - .byte4 $$248786 + .4byte $$248786 .4byte 0x0000000C - .byte4 $$248787 + .4byte $$248787 .4byte 0x0000000C - .byte4 $$248788 + .4byte $$248788 .4byte 0x0000000C - .byte4 $$248789 + .4byte $$248789 .4byte 0x0000000C - .byte4 $$248790 + .4byte $$248790 .4byte 0x0000000C - .byte4 $$248791 + .4byte $$248791 .4byte 0x0000000C - .byte4 $$248792 + .4byte $$248792 .4byte 0x0000000C - .byte4 $$248793 + .4byte $$248793 .4byte 0x0000000C - .byte4 $$248794 + .4byte $$248794 .4byte 0x0000000C - .byte4 $$248795 + .4byte $$248795 .4byte 0x0000000C - .byte4 $$248795 + .4byte $$248795 .4byte 0x0000000C - .byte4 $$248795 + .4byte $$248795 .4byte 0x0000000C - .byte4 $$248796 + .4byte $$248796 .4byte 0x0000000C - .byte4 $$248797 + .4byte $$248797 .4byte 0x0000000C - .byte4 $$248798 + .4byte $$248798 .4byte 0x0000000C .4byte 0 .4byte 0 - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000C - .byte4 $$248799 + .4byte $$248799 .4byte 0x0000000C - .byte4 $$248747 + .4byte $$248747 .4byte 0x0000000C - .byte4 $$248800 + .4byte $$248800 .4byte 0x0000000C - .byte4 $$248801 + .4byte $$248801 .4byte 0x0000000C - .byte4 $$248802 + .4byte $$248802 .4byte 0x0000000C - .byte4 $$248803 + .4byte $$248803 .4byte 0x0000000C - .byte4 $$248804 + .4byte $$248804 .4byte 0x0000000C - .byte4 $$248805 + .4byte $$248805 .4byte 0x0000000C - .byte4 $$248806 + .4byte $$248806 .4byte 0x0000000C - .byte4 $$248807 + .4byte $$248807 .4byte 0x0000000C .4byte 0 .4byte 0 @@ -717,103 +717,103 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248808 + .4byte $$248808 .4byte 0x0000000C - .byte4 $$248809 + .4byte $$248809 .4byte 0x0000000C - .byte4 $$248810 + .4byte $$248810 .4byte 0x0000000C - .byte4 $$248811 + .4byte $$248811 .4byte 0x0000000C - .byte4 $$248812 + .4byte $$248812 .4byte 0x0000000C - .byte4 $$248813 + .4byte $$248813 .4byte 0x0000000C - .byte4 $$248814 + .4byte $$248814 .4byte 0x0000000C - .byte4 $$248815 + .4byte $$248815 .4byte 0x0000000C - .byte4 $$248816 + .4byte $$248816 .4byte 0x0000000C - .byte4 $$248817 + .4byte $$248817 .4byte 0x0000000C - .byte4 $$248818 + .4byte $$248818 .4byte 0x0000000C - .byte4 $$248819 + .4byte $$248819 .4byte 0x0000000C - .byte4 $$248820 + .4byte $$248820 .4byte 0x0000000C - .byte4 $$248821 + .4byte $$248821 .4byte 0x0000000C - .byte4 $$248822 + .4byte $$248822 .4byte 0x0000000C - .byte4 $$248823 + .4byte $$248823 .4byte 0x0000000C - .byte4 $$248824 + .4byte $$248824 .4byte 0x0000000C - .byte4 $$248825 + .4byte $$248825 .4byte 0x0000000C - .byte4 $$248826 + .4byte $$248826 .4byte 0x0000000C - .byte4 $$248827 + .4byte $$248827 .4byte 0x0000000C - .byte4 $$248828 + .4byte $$248828 .4byte 0x0000000C - .byte4 $$248829 + .4byte $$248829 .4byte 0x0000000C - .byte4 $$248830 + .4byte $$248830 .4byte 0x0000000C - .byte4 $$248831 + .4byte $$248831 .4byte 0x0000000C - .byte4 $$248832 + .4byte $$248832 .4byte 0x0000000C - .byte4 $$248833 + .4byte $$248833 .4byte 0x0000000C - .byte4 $$248834 + .4byte $$248834 .4byte 0x0000000C - .byte4 $$248835 + .4byte $$248835 .4byte 0x0000000C - .byte4 $$248836 + .4byte $$248836 .4byte 0x0000000C - .byte4 $$248837 + .4byte $$248837 .4byte 0x0000000C - .byte4 $$248838 + .4byte $$248838 .4byte 0x0000000C - .byte4 $$248839 + .4byte $$248839 .4byte 0x0000000C - .byte4 $$248840 + .4byte $$248840 .4byte 0x0000000C - .byte4 $$248841 + .4byte $$248841 .4byte 0x0000000C - .byte4 $$248842 + .4byte $$248842 .4byte 0x0000000C - .byte4 $$248843 + .4byte $$248843 .4byte 0x0000000C - .byte4 $$248844 + .4byte $$248844 .4byte 0x0000000C - .byte4 $$248845 + .4byte $$248845 .4byte 0x0000000C - .byte4 $$248846 + .4byte $$248846 .4byte 0x0000000C - .byte4 $$248847 + .4byte $$248847 .4byte 0x0000000C - .byte4 $$248848 + .4byte $$248848 .4byte 0x0000000C - .byte4 $$248849 + .4byte $$248849 .4byte 0x0000000C - .byte4 $$248850 + .4byte $$248850 .4byte 0x0000000C - .byte4 $$248851 + .4byte $$248851 .4byte 0x0000000C - .byte4 $$248852 + .4byte $$248852 .4byte 0x0000000C - .byte4 $$248853 + .4byte $$248853 .4byte 0x0000000C - .byte4 $$248854 + .4byte $$248854 .4byte 0x0000000C - .byte4 $$248855 + .4byte $$248855 .4byte 0x0000000C - .byte4 $$248856 + .4byte $$248856 .4byte 0x0000000C .4byte 0 .4byte 0 @@ -949,39 +949,39 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$248857 + .4byte $$248857 .4byte 0x0000000C - .byte4 $$248858 + .4byte $$248858 .4byte 0x0000000C - .byte4 $$248859 + .4byte $$248859 .4byte 0x0000000C - .byte4 $$248860 + .4byte $$248860 .4byte 0x0000000C - .byte4 $$248861 + .4byte $$248861 .4byte 0x0000000C - .byte4 $$248862 + .4byte $$248862 .4byte 0x0000000C - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000C - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000C - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000C - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000C - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000C - .byte4 $$248727 + .4byte $$248727 .4byte 0x0000000C - .byte4 $$248863 + .4byte $$248863 .4byte 0x0000000C - .byte4 $$248864 + .4byte $$248864 .4byte 0x0000000C - .byte4 $$248865 + .4byte $$248865 .4byte 0x0000000C - .byte4 $$248866 + .4byte $$248866 .4byte 0x0000000C - .byte4 $$248867 + .4byte $$248867 .4byte 0x0000000C .4byte 0 .4byte 0 @@ -1395,36 +1395,36 @@ $$248885: .balign 4 .global $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc4MetaFv$$2NAMES$$20 $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc4MetaFv$$2NAMES$$20: - .byte4 $$248878 - .byte4 $$248879 - .byte4 $$248880 - .byte4 $$248881 - .byte4 $$248882 - .byte4 $$248883 - .byte4 $$248881 - .byte4 $$248881 - .byte4 $$248884 - .byte4 $$248885 - .byte4 $$248881 - .byte4 $$248879 - .byte4 $$248886 - .byte4 $$248887 - .byte4 $$248880 - .byte4 $$248881 - .byte4 $$248881 - .byte4 $$248883 - .byte4 $$248888 - .byte4 $$248882 - .byte4 $$248889 - .byte4 $$248878 - .byte4 $$248878 - .byte4 $$248878 - .byte4 $$248890 - .byte4 $$248890 - .byte4 $$248890 - .byte4 $$248890 - .byte4 $$248890 - .byte4 $$248890 + .4byte $$248878 + .4byte $$248879 + .4byte $$248880 + .4byte $$248881 + .4byte $$248882 + .4byte $$248883 + .4byte $$248881 + .4byte $$248881 + .4byte $$248884 + .4byte $$248885 + .4byte $$248881 + .4byte $$248879 + .4byte $$248886 + .4byte $$248887 + .4byte $$248880 + .4byte $$248881 + .4byte $$248881 + .4byte $$248883 + .4byte $$248888 + .4byte $$248882 + .4byte $$248889 + .4byte $$248878 + .4byte $$248878 + .4byte $$248878 + .4byte $$248890 + .4byte $$248890 + .4byte $$248890 + .4byte $$248890 + .4byte $$248890 + .4byte $$248890 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248727 diff --git a/asm/src/MintAnim.s b/asm/src/MintAnim.s index b67b0851..07349ad8 100644 --- a/asm/src/MintAnim.s +++ b/asm/src/MintAnim.s @@ -94,7 +94,7 @@ __sinit_$$3MintAnim_cpp: /* 8019AC64 00196AA4 4B F4 27 7C */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintAnim_cpp + .4byte __sinit_$$3MintAnim_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj22$$2unnamed$$2MintAnim_cpp$$2 diff --git a/asm/src/MintAttacker.s b/asm/src/MintAttacker.s index 6767f9d6..f2413484 100644 --- a/asm/src/MintAttacker.s +++ b/asm/src/MintAttacker.s @@ -23,7 +23,7 @@ __sinit_$$3MintAttacker_cpp: /* 803D30B8 003CEEF8 4B D0 A3 28 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintAttacker_cpp + .4byte __sinit_$$3MintAttacker_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step6vacuum26$$2unnamed$$2MintAttacker_cpp$$2 diff --git a/asm/src/MintBGMController.s b/asm/src/MintBGMController.s index bc1d4578..74624be7 100644 --- a/asm/src/MintBGMController.s +++ b/asm/src/MintBGMController.s @@ -68,7 +68,7 @@ __sinit_$$3MintBGMController_cpp: /* 80277638 00273478 4B E6 5D A8 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintBGMController_cpp + .4byte __sinit_$$3MintBGMController_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step4core31$$2unnamed$$2MintBGMController_cpp$$2 diff --git a/asm/src/MintBoss.s b/asm/src/MintBoss.s index 4117cb8b..f8334959 100644 --- a/asm/src/MintBoss.s +++ b/asm/src/MintBoss.s @@ -23,7 +23,7 @@ __sinit_$$3MintBoss_cpp: /* 802329D0 0022E810 4B EA AA 10 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintBoss_cpp + .4byte __sinit_$$3MintBoss_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step4boss22$$2unnamed$$2MintBoss_cpp$$2 diff --git a/asm/src/MintCameraController.s b/asm/src/MintCameraController.s index 84249b10..674e08a0 100644 --- a/asm/src/MintCameraController.s +++ b/asm/src/MintCameraController.s @@ -23,7 +23,7 @@ __sinit_$$3MintCameraController_cpp: /* 8026629C 002620DC 4B E7 71 44 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintCameraController_cpp + .4byte __sinit_$$3MintCameraController_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step6camera34$$2unnamed$$2MintCameraController_cpp$$2 diff --git a/asm/src/MintChallengeDoor.s b/asm/src/MintChallengeDoor.s index 4f1531dc..d5adae7a 100644 --- a/asm/src/MintChallengeDoor.s +++ b/asm/src/MintChallengeDoor.s @@ -23,7 +23,7 @@ __sinit_$$3MintChallengeDoor_cpp: /* 8030B06C 00306EAC 4B DD 23 74 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintChallengeDoor_cpp + .4byte __sinit_$$3MintChallengeDoor_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q53scn4step7gimmick13challengedoor31$$2unnamed$$2MintChallengeDoor_cpp$$2 diff --git a/asm/src/MintCommander.s b/asm/src/MintCommander.s index 5c57bc37..649c468e 100644 --- a/asm/src/MintCommander.s +++ b/asm/src/MintCommander.s @@ -23,7 +23,7 @@ __sinit_$$3MintCommander_cpp: /* 803F9B78 003F59B8 4B CE 38 68 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintCommander_cpp + .4byte __sinit_$$3MintCommander_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q33scn11staffcredit27$$2unnamed$$2MintCommander_cpp$$2 diff --git a/asm/src/MintDemo.s b/asm/src/MintDemo.s index dae97a88..06d4aaa1 100644 --- a/asm/src/MintDemo.s +++ b/asm/src/MintDemo.s @@ -23,7 +23,7 @@ __sinit_$$3MintDemo_cpp: /* 802FDDB4 002F9BF4 4B DD F6 2C */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintDemo_cpp + .4byte __sinit_$$3MintDemo_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q53scn4step7gimmick11areamapdemo22$$2unnamed$$2MintDemo_cpp$$2 diff --git a/asm/src/MintEffect.s b/asm/src/MintEffect.s index 5367b10c..353dd4bc 100644 --- a/asm/src/MintEffect.s +++ b/asm/src/MintEffect.s @@ -417,7 +417,7 @@ __sinit_$$3MintEffect_cpp: /* 8026FD7C 0026BBBC 4B E6 D6 64 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintEffect_cpp + .4byte __sinit_$$3MintEffect_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step5chara24$$2unnamed$$2MintEffect_cpp$$2 diff --git a/asm/src/MintEnemy.s b/asm/src/MintEnemy.s index d3a176b0..adc6dd3e 100644 --- a/asm/src/MintEnemy.s +++ b/asm/src/MintEnemy.s @@ -23,7 +23,7 @@ __sinit_$$3MintEnemy_cpp: /* 8028ADD8 00286C18 4B E5 26 08 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintEnemy_cpp + .4byte __sinit_$$3MintEnemy_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step5enemy23$$2unnamed$$2MintEnemy_cpp$$2 diff --git a/asm/src/MintFootState.s b/asm/src/MintFootState.s index 7fc9824e..d19a0413 100644 --- a/asm/src/MintFootState.s +++ b/asm/src/MintFootState.s @@ -28,7 +28,7 @@ __sinit_$$3MintFootState_cpp: /* 8019AC90 00196AD0 4B F4 27 50 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintFootState_cpp + .4byte __sinit_$$3MintFootState_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj27$$2unnamed$$2MintFootState_cpp$$2 diff --git a/asm/src/MintGear.s b/asm/src/MintGear.s index e882494c..131f05d5 100644 --- a/asm/src/MintGear.s +++ b/asm/src/MintGear.s @@ -123,7 +123,7 @@ __sinit_$$3MintGear_cpp: /* 8034B690 003474D0 4B D9 1D 50 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintGear_cpp + .4byte __sinit_$$3MintGear_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step4hero22$$2unnamed$$2MintGear_cpp$$2 diff --git a/asm/src/MintGearAnim.s b/asm/src/MintGearAnim.s index 8603de4b..af6f79e0 100644 --- a/asm/src/MintGearAnim.s +++ b/asm/src/MintGearAnim.s @@ -87,7 +87,7 @@ __sinit_$$3MintGearAnim_cpp: /* 8019AD30 00196B70 4B F4 26 B0 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintGearAnim_cpp + .4byte __sinit_$$3MintGearAnim_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj26$$2unnamed$$2MintGearAnim_cpp$$2 diff --git a/asm/src/MintHero.s b/asm/src/MintHero.s index 4a47d255..9b9ec65e 100644 --- a/asm/src/MintHero.s +++ b/asm/src/MintHero.s @@ -23,7 +23,7 @@ __sinit_$$3MintHero_cpp: /* 8034B6B4 003474F4 4B D9 1D 2C */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintHero_cpp + .4byte __sinit_$$3MintHero_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step4hero22$$2unnamed$$2MintHero_cpp$$2 diff --git a/asm/src/MintLocation.s b/asm/src/MintLocation.s index f7cc3ca9..8adcdd2f 100644 --- a/asm/src/MintLocation.s +++ b/asm/src/MintLocation.s @@ -58,7 +58,7 @@ __sinit_$$3MintLocation_cpp: /* 8019ADBC 00196BFC 4B F4 26 24 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintLocation_cpp + .4byte __sinit_$$3MintLocation_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj26$$2unnamed$$2MintLocation_cpp$$2 diff --git a/asm/src/MintMeshFlip.s b/asm/src/MintMeshFlip.s index 37b842fe..b2a0a11b 100644 --- a/asm/src/MintMeshFlip.s +++ b/asm/src/MintMeshFlip.s @@ -24,7 +24,7 @@ __sinit_$$3MintMeshFlip_cpp: /* 8019ADE4 00196C24 4B F4 25 FC */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintMeshFlip_cpp + .4byte __sinit_$$3MintMeshFlip_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj26$$2unnamed$$2MintMeshFlip_cpp$$2 diff --git a/asm/src/MintModel.s b/asm/src/MintModel.s index 33a05b52..f51ef713 100644 --- a/asm/src/MintModel.s +++ b/asm/src/MintModel.s @@ -91,10 +91,10 @@ __sinit_$$3MintModel_cpp: /* 8026FDCC 0026BC0C 4B E6 D6 14 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintModel_cpp + .4byte __sinit_$$3MintModel_cpp .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintModel_cpp + .4byte __sinit_$$3MintModel_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj23$$2unnamed$$2MintModel_cpp$$2 diff --git a/asm/src/MintModelAccessor.s b/asm/src/MintModelAccessor.s index e93d31ed..27cac212 100644 --- a/asm/src/MintModelAccessor.s +++ b/asm/src/MintModelAccessor.s @@ -56,7 +56,7 @@ __sinit_$$3MintModelAccessor_cpp: /* 8018E9E8 0018A828 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintModelAccessor_cpp + .4byte __sinit_$$3MintModelAccessor_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$253943 diff --git a/asm/src/MintModelRotCtrl.s b/asm/src/MintModelRotCtrl.s index 8c1d609c..6d3efd6b 100644 --- a/asm/src/MintModelRotCtrl.s +++ b/asm/src/MintModelRotCtrl.s @@ -119,7 +119,7 @@ __sinit_$$3MintModelRotCtrl_cpp: /* 8026FE8C 0026BCCC 4B E6 D5 54 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintModelRotCtrl_cpp + .4byte __sinit_$$3MintModelRotCtrl_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step5chara30$$2unnamed$$2MintModelRotCtrl_cpp$$2 diff --git a/asm/src/MintMonitor.s b/asm/src/MintMonitor.s index eca2f155..f9d7188e 100644 --- a/asm/src/MintMonitor.s +++ b/asm/src/MintMonitor.s @@ -12,7 +12,7 @@ __sinit_$$3MintMonitor_cpp: /* 80319808 00315648 4B DC 3B D8 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintMonitor_cpp + .4byte __sinit_$$3MintMonitor_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q53scn4step7gimmick7monitor25$$2unnamed$$2MintMonitor_cpp$$2 diff --git a/asm/src/MintMove.s b/asm/src/MintMove.s index 9eb4a10c..fffe2caf 100644 --- a/asm/src/MintMove.s +++ b/asm/src/MintMove.s @@ -75,7 +75,7 @@ __sinit_$$3MintMove_cpp: /* 8019AF40 00196D80 4B F4 24 A0 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintMove_cpp + .4byte __sinit_$$3MintMove_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj22$$2unnamed$$2MintMove_cpp$$2 diff --git a/asm/src/MintNodeAccessor.s b/asm/src/MintNodeAccessor.s index da0cd789..b2f44113 100644 --- a/asm/src/MintNodeAccessor.s +++ b/asm/src/MintNodeAccessor.s @@ -117,7 +117,7 @@ __sinit_$$3MintNodeAccessor_cpp: /* 8018EB48 0018A988 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintNodeAccessor_cpp + .4byte __sinit_$$3MintNodeAccessor_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$253785 diff --git a/asm/src/MintOCollManager.s b/asm/src/MintOCollManager.s index 64615aa8..d7958f50 100644 --- a/asm/src/MintOCollManager.s +++ b/asm/src/MintOCollManager.s @@ -23,7 +23,7 @@ __sinit_$$3MintOCollManager_cpp: /* 803CABB8 003C69F8 4B D1 28 28 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintOCollManager_cpp + .4byte __sinit_$$3MintOCollManager_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_manager__Q43scn4step5ocoll30$$2unnamed$$2MintOCollManager_cpp$$2 diff --git a/asm/src/MintObjColl.s b/asm/src/MintObjColl.s index 65f478d6..16191eb0 100644 --- a/asm/src/MintObjColl.s +++ b/asm/src/MintObjColl.s @@ -706,7 +706,7 @@ SetBodyCollJump__Q43scn4step4hero11MintObjCollFv: /* 8034BAA0 003478E0 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintObjColl_cpp + .4byte __sinit_$$3MintObjColl_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step5chara25$$2unnamed$$2MintObjColl_cpp$$2 diff --git a/asm/src/MintSERequestor.s b/asm/src/MintSERequestor.s index 80903a72..49e387f3 100644 --- a/asm/src/MintSERequestor.s +++ b/asm/src/MintSERequestor.s @@ -29,7 +29,7 @@ __sinit_$$3MintSERequestor_cpp: /* 80402A68 003FE8A8 4B CD A9 78 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintSERequestor_cpp + .4byte __sinit_$$3MintSERequestor_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q23snd29$$2unnamed$$2MintSERequestor_cpp$$2 diff --git a/asm/src/MintScript.s b/asm/src/MintScript.s index e58b40ea..c5290577 100644 --- a/asm/src/MintScript.s +++ b/asm/src/MintScript.s @@ -23,7 +23,7 @@ __sinit_$$3MintScript_cpp: /* 8019AF64 00196DA4 4B F4 24 7C */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintScript_cpp + .4byte __sinit_$$3MintScript_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj24$$2unnamed$$2MintScript_cpp$$2 diff --git a/asm/src/MintScriptTrigger.s b/asm/src/MintScriptTrigger.s index 628fa034..6a07287e 100644 --- a/asm/src/MintScriptTrigger.s +++ b/asm/src/MintScriptTrigger.s @@ -24,7 +24,7 @@ __sinit_$$3MintScriptTrigger_cpp: /* 802706B0 0026C4F0 4B E6 CD 30 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintScriptTrigger_cpp + .4byte __sinit_$$3MintScriptTrigger_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step5chara31$$2unnamed$$2MintScriptTrigger_cpp$$2 diff --git a/asm/src/MintSetting.s b/asm/src/MintSetting.s index 3995cf2a..758c534e 100644 --- a/asm/src/MintSetting.s +++ b/asm/src/MintSetting.s @@ -385,21 +385,21 @@ $$249285: .balign 4 .global $$2LOCAL$$2messageKindString__Q26mintvm11MintSettingFQ26mintvm11MintMsgKind$$2table $$2LOCAL$$2messageKindString__Q26mintvm11MintSettingFQ26mintvm11MintMsgKind$$2table: - .byte4 $$249078 - .byte4 $$249079 - .byte4 $$249080 + .4byte $$249078 + .4byte $$249079 + .4byte $$249080 .global __vt__Q26mintvm13MintAllocator __vt__Q26mintvm13MintAllocator: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm13MintAllocatorFv - .byte4 mintAlloc__Q26mintvm13MintAllocatorFUl - .byte4 mintFree__Q26mintvm13MintAllocatorFPv + .4byte __dt__Q26mintvm13MintAllocatorFv + .4byte mintAlloc__Q26mintvm13MintAllocatorFUl + .4byte mintFree__Q26mintvm13MintAllocatorFPv .global __vt__Q26mintvm10IAllocator __vt__Q26mintvm10IAllocator: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm10IAllocatorFv + .4byte __dt__Q26mintvm10IAllocatorFv .4byte 0 .4byte 0 .global $$2STRING$$2UnsetInstance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv$$20 diff --git a/asm/src/MintShake.s b/asm/src/MintShake.s index 05113b88..5bd85644 100644 --- a/asm/src/MintShake.s +++ b/asm/src/MintShake.s @@ -24,7 +24,7 @@ __sinit_$$3MintShake_cpp: /* 802706D8 0026C518 4B E6 CD 08 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintShake_cpp + .4byte __sinit_$$3MintShake_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step5chara23$$2unnamed$$2MintShake_cpp$$2 diff --git a/asm/src/MintShipEvent.s b/asm/src/MintShipEvent.s index fbe88cdb..1a98e340 100644 --- a/asm/src/MintShipEvent.s +++ b/asm/src/MintShipEvent.s @@ -23,7 +23,7 @@ __sinit_$$3MintShipEvent_cpp: /* 8031F7C0 0031B600 4B DB DC 20 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintShipEvent_cpp + .4byte __sinit_$$3MintShipEvent_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q53scn4step7gimmick9shipevent27$$2unnamed$$2MintShipEvent_cpp$$2 diff --git a/asm/src/MintSuperBackPicture.s b/asm/src/MintSuperBackPicture.s index 4dbb3f9c..0b2a23b0 100644 --- a/asm/src/MintSuperBackPicture.s +++ b/asm/src/MintSuperBackPicture.s @@ -150,7 +150,7 @@ __sinit_$$3MintSuperBackPicture_cpp: /* 803CDCD8 003C9B18 4B D0 F7 08 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintSuperBackPicture_cpp + .4byte __sinit_$$3MintSuperBackPicture_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step3sfx34$$2unnamed$$2MintSuperBackPicture_cpp$$2 diff --git a/asm/src/MintSuperFade.s b/asm/src/MintSuperFade.s index 45bbdd57..1221fcf5 100644 --- a/asm/src/MintSuperFade.s +++ b/asm/src/MintSuperFade.s @@ -24,7 +24,7 @@ __sinit_$$3MintSuperFade_cpp: /* 803CDD00 003C9B40 4B D0 F6 E0 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintSuperFade_cpp + .4byte __sinit_$$3MintSuperFade_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step3sfx27$$2unnamed$$2MintSuperFade_cpp$$2 diff --git a/asm/src/MintTarget.s b/asm/src/MintTarget.s index 1da5f072..00c07525 100644 --- a/asm/src/MintTarget.s +++ b/asm/src/MintTarget.s @@ -54,7 +54,7 @@ __sinit_$$3MintTarget_cpp: /* 8019AFD4 00196E14 4B F4 24 0C */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintTarget_cpp + .4byte __sinit_$$3MintTarget_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q24gobj24$$2unnamed$$2MintTarget_cpp$$2 diff --git a/asm/src/MintZoomQuake.s b/asm/src/MintZoomQuake.s index 0d6293a3..3cc25046 100644 --- a/asm/src/MintZoomQuake.s +++ b/asm/src/MintZoomQuake.s @@ -23,7 +23,7 @@ __sinit_$$3MintZoomQuake_cpp: /* 802662C0 00262100 4B E7 71 20 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MintZoomQuake_cpp + .4byte __sinit_$$3MintZoomQuake_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_obj__Q43scn4step6camera27$$2unnamed$$2MintZoomQuake_cpp$$2 diff --git a/asm/src/Model.s b/asm/src/Model.s index b2e64a47..3457977a 100644 --- a/asm/src/Model.s +++ b/asm/src/Model.s @@ -5316,80 +5316,80 @@ onObjStopFinished__Q43scn4step4hero5ModelFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$258142 $$258142: - .byte4 Model__Q53scn4step4hero9modeldesc5KirbyFv - .byte4 Model__Q53scn4step4hero9modeldesc5KirbyFv - .byte4 Model__Q53scn4step4hero9modeldesc5KirbyFv - .byte4 Model__Q53scn4step4hero9modeldesc5KirbyFv - .byte4 Model__Q53scn4step4hero9modeldesc4MetaFv - .byte4 Model__Q53scn4step4hero9modeldesc6DededeFv - .byte4 Model__Q53scn4step4hero9modeldesc3DeeFv + .4byte Model__Q53scn4step4hero9modeldesc5KirbyFv + .4byte Model__Q53scn4step4hero9modeldesc5KirbyFv + .4byte Model__Q53scn4step4hero9modeldesc5KirbyFv + .4byte Model__Q53scn4step4hero9modeldesc5KirbyFv + .4byte Model__Q53scn4step4hero9modeldesc4MetaFv + .4byte Model__Q53scn4step4hero9modeldesc6DededeFv + .4byte Model__Q53scn4step4hero9modeldesc3DeeFv .global $$258152 $$258152: - .byte4 Anim__Q53scn4step4hero9modeldesc5KirbyFv - .byte4 Anim__Q53scn4step4hero9modeldesc5KirbyFv - .byte4 Anim__Q53scn4step4hero9modeldesc5KirbyFv - .byte4 Anim__Q53scn4step4hero9modeldesc5KirbyFv - .byte4 Anim__Q53scn4step4hero9modeldesc4MetaFv - .byte4 Anim__Q53scn4step4hero9modeldesc6DededeFv - .byte4 Anim__Q53scn4step4hero9modeldesc3DeeFv + .4byte Anim__Q53scn4step4hero9modeldesc5KirbyFv + .4byte Anim__Q53scn4step4hero9modeldesc5KirbyFv + .4byte Anim__Q53scn4step4hero9modeldesc5KirbyFv + .4byte Anim__Q53scn4step4hero9modeldesc5KirbyFv + .4byte Anim__Q53scn4step4hero9modeldesc4MetaFv + .4byte Anim__Q53scn4step4hero9modeldesc6DededeFv + .4byte Anim__Q53scn4step4hero9modeldesc3DeeFv .global $$258162 $$258162: - .byte4 MeshFlip__Q53scn4step4hero9modeldesc5KirbyFv - .byte4 MeshFlip__Q53scn4step4hero9modeldesc5KirbyFv - .byte4 MeshFlip__Q53scn4step4hero9modeldesc5KirbyFv - .byte4 MeshFlip__Q53scn4step4hero9modeldesc5KirbyFv - .byte4 MeshFlip__Q53scn4step4hero9modeldesc4MetaFv - .byte4 MeshFlip__Q53scn4step4hero9modeldesc6DededeFv - .byte4 MeshFlip__Q53scn4step4hero9modeldesc3DeeFv + .4byte MeshFlip__Q53scn4step4hero9modeldesc5KirbyFv + .4byte MeshFlip__Q53scn4step4hero9modeldesc5KirbyFv + .4byte MeshFlip__Q53scn4step4hero9modeldesc5KirbyFv + .4byte MeshFlip__Q53scn4step4hero9modeldesc5KirbyFv + .4byte MeshFlip__Q53scn4step4hero9modeldesc4MetaFv + .4byte MeshFlip__Q53scn4step4hero9modeldesc6DededeFv + .4byte MeshFlip__Q53scn4step4hero9modeldesc3DeeFv .global $$258172 $$258172: - .byte4 Script__Q53scn4step4hero9modeldesc5KirbyFv - .byte4 Script__Q53scn4step4hero9modeldesc5KirbyFv - .byte4 Script__Q53scn4step4hero9modeldesc5KirbyFv - .byte4 Script__Q53scn4step4hero9modeldesc5KirbyFv - .byte4 Script__Q53scn4step4hero9modeldesc4MetaFv - .byte4 Script__Q53scn4step4hero9modeldesc6DededeFv - .byte4 Script__Q53scn4step4hero9modeldesc3DeeFv + .4byte Script__Q53scn4step4hero9modeldesc5KirbyFv + .4byte Script__Q53scn4step4hero9modeldesc5KirbyFv + .4byte Script__Q53scn4step4hero9modeldesc5KirbyFv + .4byte Script__Q53scn4step4hero9modeldesc5KirbyFv + .4byte Script__Q53scn4step4hero9modeldesc4MetaFv + .4byte Script__Q53scn4step4hero9modeldesc6DededeFv + .4byte Script__Q53scn4step4hero9modeldesc3DeeFv .global $$258190 $$258190: - .byte4 $$258183 - .byte4 $$258184 - .byte4 $$258185 - .byte4 $$258186 - .byte4 $$258187 - .byte4 $$258188 - .byte4 $$258189 + .4byte $$258183 + .4byte $$258184 + .4byte $$258185 + .4byte $$258186 + .4byte $$258187 + .4byte $$258188 + .4byte $$258189 .global $$258207 $$258207: - .byte4 $$258203 - .byte4 $$258203 - .byte4 $$258203 - .byte4 $$258203 - .byte4 $$258204 - .byte4 $$258205 - .byte4 $$258206 + .4byte $$258203 + .4byte $$258203 + .4byte $$258203 + .4byte $$258203 + .4byte $$258204 + .4byte $$258205 + .4byte $$258206 .global $$258220 $$258220: - .byte4 $$258216 - .byte4 $$258216 - .byte4 $$258216 - .byte4 $$258216 - .byte4 $$258217 - .byte4 $$258218 - .byte4 $$258219 + .4byte $$258216 + .4byte $$258216 + .4byte $$258216 + .4byte $$258216 + .4byte $$258217 + .4byte $$258218 + .4byte $$258219 .4byte 0 .global $$258964 $$258964: - .byte4 $$258960 - .byte4 $$258961 - .byte4 $$258962 - .byte4 $$258963 + .4byte $$258960 + .4byte $$258961 + .4byte $$258962 + .4byte $$258963 .global $$258967 $$258967: - .byte4 $$258960 - .byte4 $$258960 - .byte4 $$258960 - .byte4 $$258960 + .4byte $$258960 + .4byte $$258960 + .4byte $$258960 + .4byte $$258960 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256416 @@ -5400,20 +5400,20 @@ $$256416: __vt__Q33g3d5Model14ScnObjCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q33g3d5Model14ScnObjCallbackFv - .byte4 ExecCallback_CALC_WORLD__Q33g3d5Model14ScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv - .byte4 ExecCallback_CALC_MAT__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv - .byte4 ExecCallback_CALC_VIEW__Q33g3d5Model14ScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv - .byte4 ExecCallback_DRAW_OPA__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv - .byte4 ExecCallback_DRAW_XLU__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv + .4byte __dt__Q33g3d5Model14ScnObjCallbackFv + .4byte ExecCallback_CALC_WORLD__Q33g3d5Model14ScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv + .4byte ExecCallback_CALC_MAT__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv + .4byte ExecCallback_CALC_VIEW__Q33g3d5Model14ScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv + .4byte ExecCallback_DRAW_OPA__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv + .4byte ExecCallback_DRAW_XLU__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv .global __vt__Q33g3d5Model17CalcWorldCallback __vt__Q33g3d5Model17CalcWorldCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q33g3d5Model17CalcWorldCallbackFv - .byte4 ExecCallbackA__Q33g3d5Model17CalcWorldCallbackFPQ34nw4r3g3d12ChrAnmResultQ34nw4r3g3d6ResMdlPQ34nw4r3g3d16FuncObjCalcWorld - .byte4 ExecCallbackB__Q34nw4r3g3d18ICalcWorldCallbackFPQ34nw4r3g3d13WorldMtxManipQ34nw4r3g3d6ResMdlPQ34nw4r3g3d16FuncObjCalcWorld - .byte4 ExecCallbackC__Q34nw4r3g3d18ICalcWorldCallbackFPQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlPQ34nw4r3g3d16FuncObjCalcWorld + .4byte __dt__Q33g3d5Model17CalcWorldCallbackFv + .4byte ExecCallbackA__Q33g3d5Model17CalcWorldCallbackFPQ34nw4r3g3d12ChrAnmResultQ34nw4r3g3d6ResMdlPQ34nw4r3g3d16FuncObjCalcWorld + .4byte ExecCallbackB__Q34nw4r3g3d18ICalcWorldCallbackFPQ34nw4r3g3d13WorldMtxManipQ34nw4r3g3d6ResMdlPQ34nw4r3g3d16FuncObjCalcWorld + .4byte ExecCallbackC__Q34nw4r3g3d18ICalcWorldCallbackFPQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlPQ34nw4r3g3d16FuncObjCalcWorld .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: .asciz "NW4R:Pointer must not be NULL (p)" @@ -5469,18 +5469,18 @@ $$2STRING$$2ref__Q34nw4r3g3d7ResNodeFv: __vt__Q24gobj5Model: .4byte 0 .4byte 0 - .byte4 __dt__Q24gobj5ModelFv - .byte4 g3dModel__Q24gobj5ModelFv + .4byte __dt__Q24gobj5ModelFv + .4byte g3dModel__Q24gobj5ModelFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5chara5Model __vt__Q43scn4step5chara5Model: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step5chara5ModelFv - .byte4 onScriptRequested__Q43scn4step5chara5ModelFRCQ24gobj6ScriptUlUl - .byte4 onScriptExecPre__Q43scn4step5chara5ModelFRCQ24gobj6Script - .byte4 onScriptExecPost__Q43scn4step5chara5ModelFRCQ24gobj6Script + .4byte __dt__Q43scn4step5chara5ModelFv + .4byte onScriptRequested__Q43scn4step5chara5ModelFRCQ24gobj6ScriptUlUl + .4byte onScriptExecPre__Q43scn4step5chara5ModelFRCQ24gobj6Script + .4byte onScriptExecPost__Q43scn4step5chara5ModelFRCQ24gobj6Script .section .data, "wa" # 0x80421040 - 0x80496700 .global $$258183 @@ -5572,10 +5572,10 @@ $$258997: __vt__Q43scn4step4hero5Model: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4hero5ModelFv - .byte4 onScriptRequested__Q43scn4step4hero5ModelFRCQ24gobj6ScriptUlUl - .byte4 onScriptExecPre__Q43scn4step4hero5ModelFRCQ24gobj6Script - .byte4 onScriptExecPost__Q43scn4step4hero5ModelFRCQ24gobj6Script + .4byte __dt__Q43scn4step4hero5ModelFv + .4byte onScriptRequested__Q43scn4step4hero5ModelFRCQ24gobj6ScriptUlUl + .4byte onScriptExecPre__Q43scn4step4hero5ModelFRCQ24gobj6Script + .4byte onScriptExecPost__Q43scn4step4hero5ModelFRCQ24gobj6Script .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" @@ -5630,10 +5630,10 @@ $$260417: .4byte 0xBF800000 .global $$258994 $$258994: - .byte4 $$258993 + .4byte $$258993 .global $$258998 $$258998: - .byte4 $$258997 + .4byte $$258997 .global $$260515 $$260515: .4byte 0xBE99999A diff --git a/asm/src/ModelAnimAccessor.s b/asm/src/ModelAnimAccessor.s index 4c876837..adb65a51 100644 --- a/asm/src/ModelAnimAccessor.s +++ b/asm/src/ModelAnimAccessor.s @@ -218,8 +218,8 @@ onFrameChanged__Q23g3d34NullModelAnimAccessorEventReceiverFRCQ23g3d17ModelAnimAc __vt__Q23g3d34NullModelAnimAccessorEventReceiver: .4byte 0 .4byte 0 - .byte4 __dt__Q23g3d34NullModelAnimAccessorEventReceiverFv - .byte4 onFrameChanged__Q23g3d34NullModelAnimAccessorEventReceiverFRCQ23g3d17ModelAnimAccessor + .4byte __dt__Q23g3d34NullModelAnimAccessorEventReceiverFv + .4byte onFrameChanged__Q23g3d34NullModelAnimAccessorEventReceiverFRCQ23g3d17ModelAnimAccessor .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2Instance__Q23g3d34NullModelAnimAccessorEventReceiverFv$$2obj diff --git a/asm/src/ModelDesc.s b/asm/src/ModelDesc.s index e7337c1f..84a9135e 100644 --- a/asm/src/ModelDesc.s +++ b/asm/src/ModelDesc.s @@ -8779,230 +8779,230 @@ __sinit_$$3ModelDesc_cpp: /* 803EF704 003EB544 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp - .byte4 __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp + .4byte __sinit_$$3ModelDesc_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 - .byte4 $$250146 + .4byte $$250146 .4byte 0 - .byte4 $$250147 + .4byte $$250147 .4byte 0 - .byte4 $$250148 + .4byte $$250148 .4byte 0 - .byte4 $$250149 + .4byte $$250149 .4byte 0 - .byte4 $$250150 + .4byte $$250150 .4byte 0 - .byte4 $$250151 + .4byte $$250151 .4byte 0 - .byte4 $$250152 + .4byte $$250152 .4byte 0 - .byte4 $$250153 + .4byte $$250153 .4byte 0 - .byte4 $$250154 + .4byte $$250154 .4byte 0 - .byte4 $$250155 + .4byte $$250155 .4byte 0 - .byte4 $$250156 + .4byte $$250156 .4byte 0 - .byte4 $$250157 + .4byte $$250157 .4byte 0 - .byte4 $$250158 + .4byte $$250158 .4byte 0 - .byte4 $$250159 + .4byte $$250159 .4byte 0 - .byte4 $$250160 + .4byte $$250160 .4byte 0 - .byte4 $$250161 + .4byte $$250161 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250163 + .4byte $$250163 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250164 + .4byte $$250164 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250165 + .4byte $$250165 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250166 + .4byte $$250166 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250167 + .4byte $$250167 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250168 + .4byte $$250168 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250169 + .4byte $$250169 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250170 + .4byte $$250170 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250171 + .4byte $$250171 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250172 + .4byte $$250172 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250173 + .4byte $$250173 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250174 + .4byte $$250174 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250175 + .4byte $$250175 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250176 + .4byte $$250176 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250177 + .4byte $$250177 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250178 + .4byte $$250178 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250179 + .4byte $$250179 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250180 + .4byte $$250180 .4byte 0 .4byte 0 .4byte 0 @@ -9011,131 +9011,131 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step4boss15challengemaster23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss15challengemaster23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 - .byte4 $$250146 + .4byte $$250146 .4byte 0 - .byte4 $$250147 + .4byte $$250147 .4byte 0 - .byte4 $$250148 + .4byte $$250148 .4byte 0 - .byte4 $$250149 + .4byte $$250149 .4byte 0 - .byte4 $$250150 + .4byte $$250150 .4byte 0 - .byte4 $$250151 + .4byte $$250151 .4byte 0 - .byte4 $$250152 + .4byte $$250152 .4byte 0 - .byte4 $$250153 + .4byte $$250153 .4byte 0 - .byte4 $$250154 + .4byte $$250154 .4byte 0 - .byte4 $$250155 + .4byte $$250155 .4byte 0 - .byte4 $$250156 + .4byte $$250156 .4byte 0 - .byte4 $$250157 + .4byte $$250157 .4byte 0 - .byte4 $$250158 + .4byte $$250158 .4byte 0 - .byte4 $$250159 + .4byte $$250159 .4byte 0 - .byte4 $$250160 + .4byte $$250160 .4byte 0 - .byte4 $$250161 + .4byte $$250161 .4byte 0 - .byte4 $$250162 + .4byte $$250162 .4byte 0 - .byte4 $$250163 + .4byte $$250163 .4byte 0 - .byte4 $$250164 + .4byte $$250164 .4byte 0 - .byte4 $$250165 + .4byte $$250165 .4byte 0 - .byte4 $$250166 + .4byte $$250166 .4byte 0 - .byte4 $$250167 + .4byte $$250167 .4byte 0 - .byte4 $$250168 + .4byte $$250168 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step4boss12creditdedede23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss12creditdedede23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 - .byte4 $$250146 + .4byte $$250146 .4byte 0 - .byte4 $$250147 + .4byte $$250147 .4byte 0 - .byte4 $$250148 + .4byte $$250148 .4byte 0 - .byte4 $$250149 + .4byte $$250149 .4byte 0 - .byte4 $$250150 + .4byte $$250150 .4byte 0 - .byte4 $$250151 + .4byte $$250151 .4byte 0 .global T_DYNAMICS_DESCNODE__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2 T_DYNAMICS_DESCNODE__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2: @@ -9159,72 +9159,72 @@ T_DYNAMICS_DESCNODE__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x3F800000 .global T_ANIM_ENTRIES__Q53scn4step4boss10creditmeta23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss10creditmeta23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250144 + .4byte $$250144 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 .4byte 0 .4byte 0 @@ -9239,47 +9239,47 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250146 + .4byte $$250146 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250147 + .4byte $$250147 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250148 + .4byte $$250148 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250148 + .4byte $$250148 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250149 + .4byte $$250149 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250150 + .4byte $$250150 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250151 + .4byte $$250151 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250151 + .4byte $$250151 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250152 + .4byte $$250152 .4byte 0 .4byte 0 .4byte 0 @@ -9289,149 +9289,149 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 - .byte4 $$250146 + .4byte $$250146 .4byte 0 - .byte4 $$250147 + .4byte $$250147 .4byte 0 - .byte4 $$250148 + .4byte $$250148 .4byte 0 - .byte4 $$250149 + .4byte $$250149 .4byte 0 - .byte4 $$250150 + .4byte $$250150 .4byte 0 - .byte4 $$250151 + .4byte $$250151 .4byte 0 - .byte4 $$250152 + .4byte $$250152 .4byte 0 - .byte4 $$250153 + .4byte $$250153 .4byte 0 - .byte4 $$250154 + .4byte $$250154 .4byte 0 - .byte4 $$250155 + .4byte $$250155 .4byte 0 - .byte4 $$250156 + .4byte $$250156 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250158 + .4byte $$250158 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250159 + .4byte $$250159 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250160 + .4byte $$250160 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250161 + .4byte $$250161 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250162 + .4byte $$250162 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250163 + .4byte $$250163 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250164 + .4byte $$250164 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250165 + .4byte $$250165 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250166 + .4byte $$250166 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250167 + .4byte $$250167 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250167 + .4byte $$250167 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250167 + .4byte $$250167 .4byte 0x00000002 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250168 + .4byte $$250168 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250169 + .4byte $$250169 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250170 + .4byte $$250170 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250171 + .4byte $$250171 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250172 + .4byte $$250172 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250173 + .4byte $$250173 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250174 + .4byte $$250174 .4byte 0 .4byte 0 .4byte 0 @@ -9439,137 +9439,137 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 - .byte4 $$250146 + .4byte $$250146 .4byte 0 - .byte4 $$250147 + .4byte $$250147 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 - .byte4 $$250148 + .4byte $$250148 .4byte 0 - .byte4 $$250149 + .4byte $$250149 .4byte 0 - .byte4 $$250150 + .4byte $$250150 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250152 + .4byte $$250152 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250153 + .4byte $$250153 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250154 + .4byte $$250154 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250155 + .4byte $$250155 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250156 + .4byte $$250156 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250157 + .4byte $$250157 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250158 + .4byte $$250158 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250159 + .4byte $$250159 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250160 + .4byte $$250160 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250161 + .4byte $$250161 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250162 + .4byte $$250162 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250163 + .4byte $$250163 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250164 + .4byte $$250164 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250165 + .4byte $$250165 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250165 + .4byte $$250165 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250166 + .4byte $$250166 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250167 + .4byte $$250167 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250168 + .4byte $$250168 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250169 + .4byte $$250169 .4byte 0 .4byte 0 .4byte 0 @@ -9577,334 +9577,334 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step4boss9moundeath23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss9moundeath23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss9moundeath23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss9moundeath23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250147 + .4byte $$250147 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250148 + .4byte $$250148 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250149 + .4byte $$250149 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250150 + .4byte $$250150 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250151 + .4byte $$250151 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250152 + .4byte $$250152 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250153 + .4byte $$250153 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250154 + .4byte $$250154 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250155 + .4byte $$250155 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250156 + .4byte $$250156 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250157 + .4byte $$250157 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250158 + .4byte $$250158 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250159 + .4byte $$250159 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250160 + .4byte $$250160 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250161 + .4byte $$250161 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250162 + .4byte $$250162 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250163 + .4byte $$250163 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250164 + .4byte $$250164 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250165 + .4byte $$250165 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250166 + .4byte $$250166 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250167 + .4byte $$250167 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250168 + .4byte $$250168 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250169 + .4byte $$250169 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250170 + .4byte $$250170 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250171 + .4byte $$250171 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250172 + .4byte $$250172 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250173 + .4byte $$250173 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250174 + .4byte $$250174 .4byte 0 .4byte 0 .4byte 0 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 - .byte4 $$250146 + .4byte $$250146 .4byte 0 - .byte4 $$250147 + .4byte $$250147 .4byte 0 - .byte4 $$250146 + .4byte $$250146 .4byte 0 - .byte4 $$250147 + .4byte $$250147 .4byte 0 - .byte4 $$250148 + .4byte $$250148 .4byte 0 - .byte4 $$250149 + .4byte $$250149 .4byte 0 - .byte4 $$250150 + .4byte $$250150 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 - .byte4 $$250151 + .4byte $$250151 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250153 + .4byte $$250153 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250154 + .4byte $$250154 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250155 + .4byte $$250155 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250156 + .4byte $$250156 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250157 + .4byte $$250157 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250158 + .4byte $$250158 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250159 + .4byte $$250159 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250160 + .4byte $$250160 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250161 + .4byte $$250161 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250162 + .4byte $$250162 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250163 + .4byte $$250163 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250164 + .4byte $$250164 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250165 + .4byte $$250165 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250166 + .4byte $$250166 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250167 + .4byte $$250167 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250168 + .4byte $$250168 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250169 + .4byte $$250169 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250170 + .4byte $$250170 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250171 + .4byte $$250171 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250172 + .4byte $$250172 .4byte 0 .4byte 0 .4byte 0 @@ -9913,228 +9913,228 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step4boss6whispy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss6whispy23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 - .byte4 $$250146 + .4byte $$250146 .4byte 0 - .byte4 $$250147 + .4byte $$250147 .4byte 0 - .byte4 $$250148 + .4byte $$250148 .4byte 0 - .byte4 $$250149 + .4byte $$250149 .4byte 0 - .byte4 $$250150 + .4byte $$250150 .4byte 0 - .byte4 $$250151 + .4byte $$250151 .4byte 0 - .byte4 $$250152 + .4byte $$250152 .4byte 0 - .byte4 $$250153 + .4byte $$250153 .4byte 0 - .byte4 $$250154 + .4byte $$250154 .4byte 0 - .byte4 $$250155 + .4byte $$250155 .4byte 0 - .byte4 $$250156 + .4byte $$250156 .4byte 0 - .byte4 $$250157 + .4byte $$250157 .4byte 0 - .byte4 $$250158 + .4byte $$250158 .4byte 0 - .byte4 $$250159 + .4byte $$250159 .4byte 0 - .byte4 $$250160 + .4byte $$250160 .4byte 0 - .byte4 $$250161 + .4byte $$250161 .4byte 0 - .byte4 $$250162 + .4byte $$250162 .4byte 0 - .byte4 $$250163 + .4byte $$250163 .4byte 0 - .byte4 $$250164 + .4byte $$250164 .4byte 0 - .byte4 $$250165 + .4byte $$250165 .4byte 0 - .byte4 $$250166 + .4byte $$250166 .4byte 0 - .byte4 $$250167 + .4byte $$250167 .4byte 0 - .byte4 $$250168 + .4byte $$250168 .4byte 0 - .byte4 $$250169 + .4byte $$250169 .4byte 0 - .byte4 $$250170 + .4byte $$250170 .4byte 0 - .byte4 $$250171 + .4byte $$250171 .4byte 0 - .byte4 $$250172 + .4byte $$250172 .4byte 0 - .byte4 $$250173 + .4byte $$250173 .4byte 0 - .byte4 $$250174 + .4byte $$250174 .4byte 0 - .byte4 $$250175 + .4byte $$250175 .4byte 0 - .byte4 $$250176 + .4byte $$250176 .4byte 0 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 - .byte4 $$250146 + .4byte $$250146 .4byte 0 - .byte4 $$250146 + .4byte $$250146 .4byte 0 - .byte4 $$250147 + .4byte $$250147 .4byte 0 - .byte4 $$250148 + .4byte $$250148 .4byte 0 - .byte4 $$250149 + .4byte $$250149 .4byte 0 - .byte4 $$250150 + .4byte $$250150 .4byte 0 - .byte4 $$250151 + .4byte $$250151 .4byte 0 - .byte4 $$250152 + .4byte $$250152 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250154 + .4byte $$250154 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250155 + .4byte $$250155 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250156 + .4byte $$250156 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250157 + .4byte $$250157 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250158 + .4byte $$250158 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250159 + .4byte $$250159 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250160 + .4byte $$250160 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250161 + .4byte $$250161 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250162 + .4byte $$250162 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250162 + .4byte $$250162 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250163 + .4byte $$250163 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250164 + .4byte $$250164 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250165 + .4byte $$250165 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250166 + .4byte $$250166 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250167 + .4byte $$250167 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250167 + .4byte $$250167 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250167 + .4byte $$250167 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250168 + .4byte $$250168 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250169 + .4byte $$250169 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250170 + .4byte $$250170 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250171 + .4byte $$250171 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250156 + .4byte $$250156 .4byte 0x00000001 .4byte 0 .4byte 0 @@ -10143,73 +10143,73 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step5enemy8armordee23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8armordee23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy11bladeknight23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy11bladeknight23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy7blipper23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7blipper23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy11bonkersbomb23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy11bonkersbomb23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250126 + .4byte $$250126 .4byte 0 .4byte 0 .4byte 0 @@ -10247,419 +10247,419 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy11bonkersbomb23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6bouncy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6bouncy23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5bowby23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5bowby23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy10brontoburt23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy10brontoburt23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy11broomhatter23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy11broomhatter23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5cappy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5cappy23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8cappyhat23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8cappyhat23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250124 + .4byte $$250124 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8cerulean23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8cerulean23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6chilly23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6chilly23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy4como23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy4como23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6degout23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6degout23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8dubiorjr23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8dubiorjr23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy4elec23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy4elec23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5foley23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5foley23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5gemra23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5gemra23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5gordo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5gordo23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250124 + .4byte $$250124 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy7hothead23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7hothead23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6juckle23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6juckle23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy4kabu23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy4kabu23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 - .byte4 $$250146 + .4byte $$250146 .4byte 0 - .byte4 $$250147 + .4byte $$250147 .4byte 0 - .byte4 $$250148 + .4byte $$250148 .4byte 0 - .byte4 $$250149 + .4byte $$250149 .4byte 0 - .byte4 $$250150 + .4byte $$250150 .4byte 0 - .byte4 $$250151 + .4byte $$250151 .4byte 0 - .byte4 $$250152 + .4byte $$250152 .4byte 0 - .byte4 $$250153 + .4byte $$250153 .4byte 0 - .byte4 $$250154 + .4byte $$250154 .4byte 0 - .byte4 $$250155 + .4byte $$250155 .4byte 0 - .byte4 $$250156 + .4byte $$250156 .4byte 0 - .byte4 $$250157 + .4byte $$250157 .4byte 0 - .byte4 $$250158 + .4byte $$250158 .4byte 0 - .byte4 $$250159 + .4byte $$250159 .4byte 0 - .byte4 $$250160 + .4byte $$250160 .4byte 0 - .byte4 $$250161 + .4byte $$250161 .4byte 0 - .byte4 $$250162 + .4byte $$250162 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6lanzer23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6lanzer23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6leafan23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6leafan23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy9mbossdead23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy9mbossdead23$$2unnamed$$2ModelDesc_cpp$$2: @@ -10701,135 +10701,135 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy9mbossdead23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy7mumbies23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7mumbies23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5noddy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5noddy23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5nruff23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5nruff23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6owgulf23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6owgulf23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy7parasol23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7parasol23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6pierce23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6pierce23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy10poppybrojr23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy10poppybrojr23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy14poppybrojrbomb23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy14poppybrojrbomb23$$2unnamed$$2ModelDesc_cpp$$2: @@ -10871,239 +10871,239 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy14poppybrojrbomb23$$2unnamed$$2ModelDesc_cpp$ .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy9puppetdee23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy9puppetdee23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5rocky23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5rocky23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8rollball23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8rollball23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step5enemy7sandbag23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7sandbag23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8searches23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8searches23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6shotzo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6shotzo23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy9sirkibble23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy9sirkibble23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy11sisterbound23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy11sisterbound23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5snowl23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5snowl23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6sodory23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6sodory23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6sparky23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6sparky23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy10stareffect23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy10stareffect23$$2unnamed$$2ModelDesc_cpp$$2: @@ -11145,191 +11145,191 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy10stareffect23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 .global T_ANIM_ENTRIES_SUN__Q53scn4step5enemy3sun23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES_SUN__Q53scn4step5enemy3sun23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy9tsukikage23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy9tsukikage23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy9waddledee23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy9waddledee23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 - .byte4 $$250146 + .4byte $$250146 .4byte 0 - .byte4 $$250147 + .4byte $$250147 .4byte 0 - .byte4 $$250148 + .4byte $$250148 .4byte 0 - .byte4 $$250149 + .4byte $$250149 .4byte 0 - .byte4 $$250150 + .4byte $$250150 .4byte 0 - .byte4 $$250151 + .4byte $$250151 .4byte 0 - .byte4 $$250152 + .4byte $$250152 .4byte 0 - .byte4 $$250153 + .4byte $$250153 .4byte 0 - .byte4 $$250154 + .4byte $$250154 .4byte 0 - .byte4 $$250155 + .4byte $$250155 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy9waddledoo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy9waddledoo23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 - .byte4 $$250146 + .4byte $$250146 .4byte 0 - .byte4 $$250147 + .4byte $$250147 .4byte 0 - .byte4 $$250148 + .4byte $$250148 .4byte 0 - .byte4 $$250149 + .4byte $$250149 .4byte 0 - .byte4 $$250150 + .4byte $$250150 .4byte 0 - .byte4 $$250151 + .4byte $$250151 .4byte 0 - .byte4 $$250152 + .4byte $$250152 .4byte 0 - .byte4 $$250153 + .4byte $$250153 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy10watergalbo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy10watergalbo23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 - .byte4 $$250129 + .4byte $$250129 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy11whispyapple23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy11whispyapple23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp$$2: @@ -11368,17 +11368,17 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0x00000001 .4byte 0 .4byte 0 @@ -11387,51 +11387,51 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step6weapon13whispyairball23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon13whispyairball23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step6weapon10spearspear23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon10spearspear23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step6weapon9foleyleaf23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon9foleyleaf23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 - .byte4 $$250125 + .4byte $$250125 .4byte 0 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step6weapon8deespear23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon8deespear23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 - .byte4 $$250126 + .4byte $$250126 .4byte 0 - .byte4 $$250127 + .4byte $$250127 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 .global T_INDIVI_TABLE__Q43scn4step4boss23$$2unnamed$$2ModelDesc_cpp$$2 T_INDIVI_TABLE__Q43scn4step4boss23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 - .byte4 Create__Q53scn4step4boss6whispy9ModelDescFUlb - .byte4 Create__Q53scn4step4boss10gigantedge9ModelDescFUlb + .4byte Create__Q53scn4step4boss6whispy9ModelDescFUlb + .4byte Create__Q53scn4step4boss10gigantedge9ModelDescFUlb .4byte 0 - .byte4 Create__Q53scn4step4boss13watergalboros9ModelDescFUlb - .byte4 Create__Q53scn4step4boss8kingsdoo9ModelDescFUlb - .byte4 Create__Q53scn4step4boss9zankibble9ModelDescFUlb - .byte4 CreateNormal__Q53scn4step4boss7bonkers9ModelDescFUlb - .byte4 Create__Q53scn4step4boss6dubior9ModelDescFUlb + .4byte Create__Q53scn4step4boss13watergalboros9ModelDescFUlb + .4byte Create__Q53scn4step4boss8kingsdoo9ModelDescFUlb + .4byte Create__Q53scn4step4boss9zankibble9ModelDescFUlb + .4byte CreateNormal__Q53scn4step4boss7bonkers9ModelDescFUlb + .4byte Create__Q53scn4step4boss6dubior9ModelDescFUlb .4byte 0 - .byte4 Create__Q53scn4step4boss9moundeath9ModelDescFUlb + .4byte Create__Q53scn4step4boss9moundeath9ModelDescFUlb .4byte 0 .4byte 0 .4byte 0 @@ -11443,11 +11443,11 @@ T_INDIVI_TABLE__Q43scn4step4boss23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 Create__Q53scn4step4boss15challengemaster9ModelDescFUlb - .byte4 Create__Q53scn4step4boss10creditroah9ModelDescFUlb - .byte4 Create__Q53scn4step4boss12creditdedede9ModelDescFUlb - .byte4 Create__Q53scn4step4boss9creditdee9ModelDescFUlb - .byte4 Create__Q53scn4step4boss10creditmeta9ModelDescFUlb + .4byte Create__Q53scn4step4boss15challengemaster9ModelDescFUlb + .4byte Create__Q53scn4step4boss10creditroah9ModelDescFUlb + .4byte Create__Q53scn4step4boss12creditdedede9ModelDescFUlb + .4byte Create__Q53scn4step4boss9creditdee9ModelDescFUlb + .4byte Create__Q53scn4step4boss10creditmeta9ModelDescFUlb .global $$250315 $$250315: .asciz "Scn.Step.Boss" @@ -11465,10 +11465,10 @@ $$250134: .balign 4 .global T_NODE_NAMES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250132 - .byte4 $$250133 - .byte4 $$250134 - .byte4 $$250135 + .4byte $$250132 + .4byte $$250133 + .4byte $$250134 + .4byte $$250135 .global $$250139 $$250139: .asciz "DownStart" @@ -11640,12 +11640,12 @@ $$250134: .balign 4 .global T_NODE_NAMES__Q53scn4step4boss15challengemaster23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss15challengemaster23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250130 - .byte4 $$250131 - .byte4 $$250132 - .byte4 $$250133 - .byte4 $$250134 - .byte4 $$250135 + .4byte $$250130 + .4byte $$250131 + .4byte $$250132 + .4byte $$250133 + .4byte $$250134 + .4byte $$250135 .global $$250139 $$250139: .asciz "FlightWait" @@ -11796,7 +11796,7 @@ $$250191: .balign 4 .global T_SCRIPT_ENTRIES__Q53scn4step4boss15challengemaster23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss15challengemaster23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250170 + .4byte $$250170 .4byte 0 .4byte 0 .4byte 0 @@ -11821,107 +11821,107 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss15challengemaster23$$2unnamed$$2ModelDesc_cpp$ .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250171 + .4byte $$250171 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250172 + .4byte $$250172 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250173 + .4byte $$250173 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250174 + .4byte $$250174 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250175 + .4byte $$250175 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250176 + .4byte $$250176 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250177 + .4byte $$250177 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250178 + .4byte $$250178 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250179 + .4byte $$250179 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250180 + .4byte $$250180 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250181 + .4byte $$250181 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250182 + .4byte $$250182 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250183 + .4byte $$250183 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250184 + .4byte $$250184 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250185 + .4byte $$250185 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250186 + .4byte $$250186 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250187 + .4byte $$250187 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250188 + .4byte $$250188 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250189 + .4byte $$250189 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250190 + .4byte $$250190 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250191 + .4byte $$250191 .4byte 0 .4byte 0 .4byte 0 @@ -11946,9 +11946,9 @@ $$250132: .balign 4 .global T_NODE_NAMES__Q53scn4step4boss12creditdedede23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss12creditdedede23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250130 - .byte4 $$250131 - .byte4 $$250132 + .4byte $$250130 + .4byte $$250131 + .4byte $$250132 .global $$250137 $$250137: .asciz "JumpStart" @@ -12009,17 +12009,17 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss12creditdedede23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250147 + .4byte $$250147 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250148 + .4byte $$250148 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250149 + .4byte $$250149 .4byte 0 .4byte 0 .4byte 0 @@ -12048,10 +12048,10 @@ $$250132: .balign 4 .global T_NODE_NAMES__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250130 - .byte4 $$250131 - .byte4 $$250132 - .byte4 $$250133 + .4byte $$250130 + .4byte $$250131 + .4byte $$250132 + .4byte $$250133 .global $$250138 $$250138: .asciz "JumpStart" @@ -12132,37 +12132,37 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250153 + .4byte $$250153 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250154 + .4byte $$250154 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250155 + .4byte $$250155 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250156 + .4byte $$250156 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250157 + .4byte $$250157 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250158 + .4byte $$250158 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250159 + .4byte $$250159 .4byte 0 .4byte 0 .4byte 0 @@ -12195,9 +12195,9 @@ $$250132: .balign 4 .global T_NODE_NAMES__Q53scn4step4boss10creditmeta23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss10creditmeta23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250130 - .byte4 $$250131 - .byte4 $$250132 + .4byte $$250130 + .4byte $$250131 + .4byte $$250132 .global $$250137 $$250137: .asciz "JumpStart" @@ -12257,27 +12257,27 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss10creditmeta23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250147 + .4byte $$250147 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250148 + .4byte $$250148 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250149 + .4byte $$250149 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250150 + .4byte $$250150 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250151 + .4byte $$250151 .4byte 0 .4byte 0 .4byte 0 @@ -12308,12 +12308,12 @@ $$250131: .4byte 0 .global T_NODE_NAMES__Q53scn4step4boss10creditroah23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss10creditroah23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250130 - .byte4 $$250131 - .byte4 $$250132 - .byte4 $$250133 - .byte4 $$250134 - .byte4 $$250135 + .4byte $$250130 + .4byte $$250131 + .4byte $$250132 + .4byte $$250133 + .4byte $$250134 + .4byte $$250135 .global $$250139 $$250139: .asciz "CreditRoah.AnimScript.Appear.Exec" @@ -12333,7 +12333,7 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss10creditroah23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 .4byte 0 .4byte 0 @@ -12353,12 +12353,12 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss10creditroah23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 .4byte 0 .4byte 0 @@ -12458,10 +12458,10 @@ $$250133: .4byte 0 .global T_NODE_NAMES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250130 - .byte4 $$250131 - .byte4 $$250132 - .byte4 $$250133 + .4byte $$250130 + .4byte $$250131 + .4byte $$250132 + .4byte $$250133 .global $$250137 $$250137: .asciz "PreAppear" @@ -12593,11 +12593,11 @@ $$250270: .section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250130 - .byte4 $$250131 - .byte4 $$250132 - .byte4 $$250133 - .byte4 $$250134 + .4byte $$250130 + .4byte $$250131 + .4byte $$250132 + .4byte $$250133 + .4byte $$250134 .global $$250138 $$250138: .asciz "PreAppear" @@ -13008,18 +13008,18 @@ $$250141: .balign 4 .global T_NODE_NAMES__Q53scn4step4boss6whispy23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss6whispy23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250130 - .byte4 $$250131 - .byte4 $$250132 - .byte4 $$250133 - .byte4 $$250134 - .byte4 $$250135 - .byte4 $$250136 - .byte4 $$250137 - .byte4 $$250138 - .byte4 $$250139 - .byte4 $$250140 - .byte4 $$250141 + .4byte $$250130 + .4byte $$250131 + .4byte $$250132 + .4byte $$250133 + .4byte $$250134 + .4byte $$250135 + .4byte $$250136 + .4byte $$250137 + .4byte $$250138 + .4byte $$250139 + .4byte $$250140 + .4byte $$250141 .global $$250145 $$250145: .asciz "WaitNoFace" @@ -13182,12 +13182,12 @@ $$250196: .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss6whispy23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss6whispy23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250178 + .4byte $$250178 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250179 + .4byte $$250179 .4byte 0 .4byte 0 .4byte 0 @@ -13212,37 +13212,37 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss6whispy23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x0000000C .4byte 0 .4byte 0 - .byte4 $$250180 + .4byte $$250180 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250181 + .4byte $$250181 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250182 + .4byte $$250182 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250183 + .4byte $$250183 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250184 + .4byte $$250184 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250185 + .4byte $$250185 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250186 + .4byte $$250186 .4byte 0 .4byte 0 .4byte 0 @@ -13252,52 +13252,52 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss6whispy23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250187 + .4byte $$250187 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250188 + .4byte $$250188 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250189 + .4byte $$250189 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250190 + .4byte $$250190 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250191 + .4byte $$250191 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250192 + .4byte $$250192 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250193 + .4byte $$250193 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250194 + .4byte $$250194 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250195 + .4byte $$250195 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250196 + .4byte $$250196 .4byte 0 .4byte 0 .4byte 0 @@ -13474,12 +13474,12 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy8armordee23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250131 + .4byte $$250131 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 .4byte 0 .4byte 0 @@ -13520,9 +13520,9 @@ $$250123: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy11bladeknight23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy11bladeknight23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 .global $$250131 $$250131: .asciz "DamageEtc" @@ -13598,12 +13598,12 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy11bladeknight23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 .4byte 0 .4byte 0 @@ -13618,17 +13618,17 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy11bladeknight23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 .4byte 0 .4byte 0 @@ -13818,12 +13818,12 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6bouncy23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 .4byte 0 .4byte 0 @@ -13885,7 +13885,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5bowby23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250132 + .4byte $$250132 .4byte 0 .4byte 0 .4byte 0 @@ -13954,7 +13954,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy10brontoburt23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 .4byte 0 .4byte 0 @@ -13969,7 +13969,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy10brontoburt23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 .4byte 0 .4byte 0 @@ -14036,7 +14036,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy11broomhatter23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 .4byte 0 .4byte 0 @@ -14066,17 +14066,17 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy11broomhatter23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x0000000A .4byte 0 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 .4byte 0 .4byte 0 @@ -14098,10 +14098,10 @@ $$250124: .4byte 0 .global T_NODE_NAMES__Q53scn4step5enemy5cappy23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5cappy23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 .global $$250131 $$250131: .asciz "DamageEtc" @@ -14370,7 +14370,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6chilly23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 .4byte 0 .4byte 0 @@ -14395,9 +14395,9 @@ $$250123: .asciz "CA3Thread1J" .global T_NODE_NAMES__Q53scn4step5enemy4como23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy4como23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250122 + .4byte $$250123 .global $$250128 $$250128: .asciz "DamageEtc" @@ -14594,9 +14594,9 @@ $$250123: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy4elec23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy4elec23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 .global $$250129 $$250129: .asciz "DamageEtc" @@ -14662,12 +14662,12 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy4elec23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 .4byte 0 .4byte 0 @@ -14680,9 +14680,9 @@ $$250214: .section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 .global $$250128 $$250128: .asciz "MoveStart" @@ -14751,17 +14751,17 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000008 .4byte 0 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 .4byte 0 .4byte 0 @@ -14773,11 +14773,11 @@ $$250212: .section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step5enemy5foley23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5foley23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 - .byte4 $$250126 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 + .4byte $$250126 .global $$250130 $$250130: .asciz "DamageEtc" @@ -14847,14 +14847,14 @@ $$250124: .4byte 0 .global T_NODE_NAMES__Q53scn4step5enemy5gemra23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5gemra23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 - .byte4 $$250126 - .byte4 $$250127 - .byte4 $$250128 - .byte4 $$250129 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 + .4byte $$250126 + .4byte $$250127 + .4byte $$250128 + .4byte $$250129 .global $$250131 $$250131: .asciz "FlightWait" @@ -14904,7 +14904,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5gemra23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 .4byte 0 .4byte 0 @@ -14917,41 +14917,41 @@ $$250214: .section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES_GIGA__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES_GIGA__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 - .byte4 $$250123 - .byte4 $$250123 - .byte4 $$250123 - .byte4 $$250126 - .byte4 $$250127 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 + .4byte $$250123 + .4byte $$250123 + .4byte $$250123 + .4byte $$250126 + .4byte $$250127 .global $$250129 $$250129: .asciz "Effect1L" .balign 4 .global T_NODE_NAMES_VOLT__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES_VOLT__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 - .byte4 $$250129 - .byte4 $$250130 - .byte4 $$250131 - .byte4 $$250126 - .byte4 $$250127 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 + .4byte $$250129 + .4byte $$250130 + .4byte $$250131 + .4byte $$250126 + .4byte $$250127 .global T_NODE_NAMES_COLD__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES_COLD__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 - .byte4 $$250123 - .byte4 $$250123 - .byte4 $$250131 - .byte4 $$250133 - .byte4 $$250133 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 + .4byte $$250123 + .4byte $$250123 + .4byte $$250131 + .4byte $$250133 + .4byte $$250133 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 @@ -15063,11 +15063,11 @@ $$250125: .balign 4 .global T_NODE_NAMES_NORMAL__Q53scn4step5enemy7hothead23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES_NORMAL__Q53scn4step5enemy7hothead23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 + .4byte $$250122 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 .global $$250132 $$250132: .asciz "DamageEtc" @@ -15124,12 +15124,12 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy7hothead23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 .4byte 0 .4byte 0 @@ -15276,12 +15276,12 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy4kabu23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 .4byte 0 .4byte 0 @@ -15334,19 +15334,19 @@ $$250134: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 - .byte4 $$250126 - .byte4 $$250127 - .byte4 $$250128 - .byte4 $$250129 - .byte4 $$250130 - .byte4 $$250131 - .byte4 $$250132 - .byte4 $$250133 - .byte4 $$250134 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 + .4byte $$250126 + .4byte $$250127 + .4byte $$250128 + .4byte $$250129 + .4byte $$250130 + .4byte $$250131 + .4byte $$250132 + .4byte $$250133 + .4byte $$250134 .global $$250138 $$250138: .asciz "LandingL" @@ -15465,7 +15465,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000008 .4byte 0 .4byte 0 - .byte4 $$250164 + .4byte $$250164 .4byte 0 .4byte 0 .4byte 0 @@ -15480,7 +15480,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250165 + .4byte $$250165 .4byte 0 .4byte 0 .4byte 0 @@ -15490,37 +15490,37 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .byte4 $$250166 + .4byte $$250166 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250167 + .4byte $$250167 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250168 + .4byte $$250168 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250169 + .4byte $$250169 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250170 + .4byte $$250170 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250171 + .4byte $$250171 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250172 + .4byte $$250172 .4byte 0 .4byte 0 .4byte 0 @@ -15550,10 +15550,10 @@ $$250125: .4byte 0 .global T_NODE_NAMES__Q53scn4step5enemy6lanzer23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6lanzer23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 .global $$250132 $$250132: .asciz "DamageEtc" @@ -15613,17 +15613,17 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6lanzer23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250139 + .4byte $$250139 .4byte 0 .4byte 0 .4byte 0 @@ -15776,9 +15776,9 @@ $$250208: .section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 .global $$250131 $$250131: .asciz "DamageEtc" @@ -15814,7 +15814,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 .4byte 0 .4byte 0 @@ -15834,7 +15834,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250137 + .4byte $$250137 .4byte 0 .4byte 0 .4byte 0 @@ -15910,10 +15910,10 @@ $$250125: .4byte 0 .global T_NODE_NAMES__Q53scn4step5enemy5nruff23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5nruff23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 .global $$250132 $$250132: .asciz "DamageEtc" @@ -15968,12 +15968,12 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5nruff23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 .4byte 0 .4byte 0 @@ -16067,9 +16067,9 @@ $$250124: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy7parasol23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy7parasol23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 .global $$250128 $$250128: .asciz "ParasolLanding" @@ -16210,7 +16210,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6pierce23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x0000000A .4byte 0 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 .4byte 0 .4byte 0 @@ -16220,12 +16220,12 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6pierce23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .byte4 $$250135 + .4byte $$250135 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250136 + .4byte $$250136 .4byte 0 .4byte 0 .4byte 0 @@ -16371,9 +16371,9 @@ $$250123: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy5rocky23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5rocky23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 .global $$250127 $$250127: .asciz "StoneFall" @@ -16595,9 +16595,9 @@ $$250124: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 .global $$250128 $$250128: .asciz "DamageEtc" @@ -16731,7 +16731,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy8searches23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250130 + .4byte $$250130 .4byte 0 .4byte 0 .4byte 0 @@ -16748,9 +16748,9 @@ $$250208: .section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 .global $$250131 $$250131: .asciz "DamageEtc" @@ -16806,7 +16806,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 .4byte 0 .4byte 0 @@ -16831,12 +16831,12 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250142 + .4byte $$250142 .4byte 0 .4byte 0 .4byte 0 @@ -16856,17 +16856,17 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250143 + .4byte $$250143 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 .4byte 0 .4byte 0 @@ -16882,9 +16882,9 @@ $$250123: .asciz "CA2XrotateJ" .global T_NODE_NAMES__Q53scn4step5enemy6shotzo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6shotzo23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy6shotzo23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy6shotzo23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 @@ -16949,11 +16949,11 @@ $$250126: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy9sirkibble23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy9sirkibble23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 - .byte4 $$250126 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 + .4byte $$250126 .global $$250133 $$250133: .asciz "DamageEtc" @@ -17031,7 +17031,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy9sirkibble23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000006 .4byte 0 .4byte 0 - .byte4 $$250141 + .4byte $$250141 .4byte 0 .4byte 0 .4byte 0 @@ -17084,7 +17084,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy11sisterbound23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250133 + .4byte $$250133 .4byte 0 .4byte 0 .4byte 0 @@ -17119,7 +17119,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy11sisterbound23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .byte4 $$250134 + .4byte $$250134 .4byte 0 .4byte 0 .4byte 0 @@ -17205,16 +17205,16 @@ $$250129: .4byte 0 .global T_NODE_NAMES__Q53scn4step5enemy6sodory23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6sodory23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 - .byte4 $$250126 - .byte4 $$250127 - .byte4 $$250128 - .byte4 $$250129 - .byte4 $$250130 - .byte4 $$250131 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 + .4byte $$250126 + .4byte $$250127 + .4byte $$250128 + .4byte $$250129 + .4byte $$250130 + .4byte $$250131 .global $$250138 $$250138: .asciz "DamageEtc" @@ -17275,12 +17275,12 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6sodory23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250144 + .4byte $$250144 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250145 + .4byte $$250145 .4byte 0 .4byte 0 .4byte 0 @@ -17306,10 +17306,10 @@ $$250125: .4byte 0 .global T_NODE_NAMES__Q53scn4step5enemy6sparky23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6sparky23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 .global $$250131 $$250131: .asciz "DamageEtc" @@ -17392,7 +17392,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6sparky23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .byte4 $$250138 + .4byte $$250138 .4byte 0 .4byte 0 .4byte 0 @@ -17418,10 +17418,10 @@ $$250124: .4byte 0 .global T_NODE_NAMES_SUN__Q53scn4step5enemy3sun23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES_SUN__Q53scn4step5enemy3sun23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy3sun23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy3sun23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 @@ -17606,11 +17606,11 @@ $$250125: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy9waddledee23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy9waddledee23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 - .byte4 $$250126 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 + .4byte $$250126 .global $$250133 $$250133: .asciz "DamageEtc" @@ -17779,37 +17779,37 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy9waddledee23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250157 + .4byte $$250157 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250158 + .4byte $$250158 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250159 + .4byte $$250159 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250160 + .4byte $$250160 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250161 + .4byte $$250161 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250162 + .4byte $$250162 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250163 + .4byte $$250163 .4byte 0 .4byte 0 .4byte 0 @@ -17859,7 +17859,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy9waddledee23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .byte4 $$250164 + .4byte $$250164 .4byte 0 .4byte 0 .4byte 0 @@ -17874,12 +17874,12 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy9waddledee23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000008 .4byte 0 .4byte 0 - .byte4 $$250165 + .4byte $$250165 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$250166 + .4byte $$250166 .4byte 0 .4byte 0 .4byte 0 @@ -17929,17 +17929,17 @@ $$250130: .balign 4 .global T_NODE_NAMES_NORMAL__Q53scn4step5enemy9waddledoo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES_NORMAL__Q53scn4step5enemy9waddledoo23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 - .byte4 $$250126 - .byte4 $$250127 - .byte4 $$250128 - .byte4 $$250129 - .byte4 $$250130 - .byte4 $$250131 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 + .4byte $$250126 + .4byte $$250127 + .4byte $$250128 + .4byte $$250129 + .4byte $$250130 + .4byte $$250131 + .4byte $$250123 .global $$250139 $$250139: .asciz "DamageEtc" @@ -18038,7 +18038,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy9waddledoo23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .byte4 $$250155 + .4byte $$250155 .4byte 0 .4byte 0 .4byte 0 @@ -18098,7 +18098,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy9waddledoo23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .byte4 $$250156 + .4byte $$250156 .4byte 0 .4byte 0 .4byte 0 @@ -18201,16 +18201,16 @@ $$250210: .section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 - .byte4 $$250126 - .byte4 $$250127 - .byte4 $$250128 - .byte4 $$250129 - .byte4 $$250130 - .byte4 $$250131 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 + .4byte $$250126 + .4byte $$250127 + .4byte $$250128 + .4byte $$250129 + .4byte $$250130 + .4byte $$250131 .global $$250135 $$250135: .asciz "DamageEtc" @@ -18263,7 +18263,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .byte4 $$250140 + .4byte $$250140 .4byte 0 .4byte 0 .4byte 0 @@ -18318,7 +18318,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy11whispyapple23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .byte4 $$250128 + .4byte $$250128 .4byte 0 .4byte 0 .4byte 0 @@ -18373,9 +18373,9 @@ $$250123: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon11starshotlv123$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon11starshotlv123$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 .global $$250198 $$250198: .asciz "StarShotLv1" @@ -18395,10 +18395,10 @@ $$250125: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon11starshotlv223$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon11starshotlv223$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 .global $$250241 $$250241: .asciz "StarShotLv2" @@ -18422,11 +18422,11 @@ $$250126: .asciz "SmallStar2M" .global T_NODE_NAMES__Q53scn4step6weapon11starshotlv323$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon11starshotlv323$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 - .byte4 $$250126 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 + .4byte $$250126 .global $$250242 $$250242: .asciz "StarShotLv3" @@ -18487,10 +18487,10 @@ $$250124: .4byte 0 .global T_NODE_NAMES__Q53scn4step6weapon13gigatzobullet23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon13gigatzobullet23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 .global $$250288 $$250288: .asciz "GigatzoBullet" @@ -18528,9 +18528,9 @@ $$250124: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon10comothread23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon10comothread23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 .global $$250235 $$250235: .asciz "ComoThread" @@ -18558,11 +18558,11 @@ $$250126: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 - .byte4 $$250126 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 + .4byte $$250126 .global $$250242 $$250242: .asciz "EnemyWaterBullet" @@ -18592,11 +18592,11 @@ $$250126: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon20enemywaterbulletwarp23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon20enemywaterbulletwarp23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 - .byte4 $$250126 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 + .4byte $$250126 .global $$250242 $$250242: .asciz "EnemyWaterBulletWarp" @@ -18643,9 +18643,9 @@ $$250124: .asciz "HammerheadJ" .global T_NODE_NAMES__Q53scn4step6weapon12hammerhammer23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon12hammerhammer23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 .global $$250235 $$250235: .asciz "HammerHammer" @@ -18727,11 +18727,11 @@ $$250125: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon10bowbyarrow23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon10bowbyarrow23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 - .byte4 $$250125 - .byte4 $$250126 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 + .4byte $$250125 + .4byte $$250126 .global $$250261 $$250261: .asciz "step/weapon/bowby/Arrow" @@ -18747,9 +18747,9 @@ $$250123: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon12jucklecutter23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon12jucklecutter23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 .global $$250236 $$250236: .asciz "step/weapon/juckle/Cutter" @@ -18791,9 +18791,9 @@ $$250239: .section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step6weapon18combinationdeeshot23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon18combinationdeeshot23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 - .byte4 $$250124 + .4byte $$250122 + .4byte $$250123 + .4byte $$250124 .global $$250235 $$250235: .asciz "CombinationDeeShot" @@ -19168,8 +19168,8 @@ $$250151: .balign 4 .global T_DYNAMICS_TARGET_NODE__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2 T_DYNAMICS_TARGET_NODE__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250161 - .byte4 $$250161 + .4byte $$250161 + .4byte $$250161 .global $$250130 $$250130: .asciz "TopL" @@ -19242,7 +19242,7 @@ $$250130: .balign 4 .global T_NODE_NAMES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250130 + .4byte $$250130 .global $$250132 $$250132: .asciz "Wait1" @@ -19373,8 +19373,8 @@ $$250131: .balign 4 .global T_NODE_NAMES__Q53scn4step4boss9moundeath23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss9moundeath23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250130 - .byte4 $$250131 + .4byte $$250130 + .4byte $$250131 .global $$250133 $$250133: .asciz "Wait" @@ -19403,7 +19403,7 @@ $$250130: .balign 4 .global T_NODE_NAMES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250130 + .4byte $$250130 .global $$250132 $$250132: .asciz "Wait" @@ -19527,8 +19527,8 @@ $$250130: .balign 4 .global T_NODE_NAMES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250130 - .byte4 $$250131 + .4byte $$250130 + .4byte $$250131 .global $$250133 $$250133: .asciz "Wait" @@ -19573,8 +19573,8 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy8armordee23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy8armordee23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250122 + .4byte $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Wait" @@ -19642,8 +19642,8 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy7blipper23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy7blipper23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250125 $$250125: .asciz "Wait2" @@ -19676,8 +19676,8 @@ $$250123: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy11bonkersbomb23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy11bonkersbomb23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 @@ -19686,8 +19686,8 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy6bouncy23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6bouncy23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250125 $$250125: .asciz "Wait" @@ -19718,8 +19718,8 @@ $$250123: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy5bowby23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5bowby23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250125 $$250125: .asciz "Wait" @@ -19742,7 +19742,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy10brontoburt23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy10brontoburt23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250125 $$250125: .4byte 0x466C7900 @@ -19767,8 +19767,8 @@ $$250123: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy11broomhatter23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy11broomhatter23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250125 $$250125: .asciz "Wait" @@ -19829,8 +19829,8 @@ $$250211: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy8cappyhat23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy8cappyhat23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250122 + .4byte $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Attack" @@ -19843,8 +19843,8 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy8cerulean23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy8cerulean23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250125 $$250125: .asciz "Wait" @@ -19871,8 +19871,8 @@ $$250122: .balign 4 .global T_NODE_NAMES_NORMAL__Q53scn4step5enemy6chilly23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES_NORMAL__Q53scn4step5enemy6chilly23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250122 + .4byte $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Wait" @@ -19931,7 +19931,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy6degout23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6degout23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Wait" @@ -19970,8 +19970,8 @@ $$250123: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy8dubiorjr23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy8dubiorjr23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250125 $$250125: .asciz "Wait" @@ -19988,7 +19988,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy11dubiorspark23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy11dubiorspark23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Main" @@ -20195,8 +20195,8 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy5gordo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5gordo23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250122 + .4byte $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Wait" @@ -20249,7 +20249,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy6juckle23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6juckle23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Wait" @@ -20277,8 +20277,8 @@ $$250123: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy4kabu23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy4kabu23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250125 $$250125: .asciz "Wait" @@ -20397,7 +20397,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy6leafan23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6leafan23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Wait" @@ -20428,7 +20428,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy9mbossdead23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy9mbossdead23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250236 $$250236: .asciz "Model" @@ -20440,7 +20440,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy7mumbies23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy7mumbies23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Wait" @@ -20498,7 +20498,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy5noddy23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5noddy23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Wait" @@ -20556,8 +20556,8 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy6owgulf23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6owgulf23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250125 $$250125: .4byte 0x466C7900 @@ -20598,8 +20598,8 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy6pierce23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6pierce23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250125 $$250125: .asciz "Wait" @@ -20635,8 +20635,8 @@ $$250123: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy10poppybrojr23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy10poppybrojr23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250125 $$250125: .asciz "Wait2" @@ -20664,7 +20664,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy14poppybrojrbomb23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy14poppybrojrbomb23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .4byte 0 .global $$250122 $$250122: @@ -20672,8 +20672,8 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy9puppetdee23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy9puppetdee23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250122 + .4byte $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Wait" @@ -20733,8 +20733,8 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy8rollball23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy8rollball23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250125 $$250125: .asciz "Wait" @@ -20749,7 +20749,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy7sandbag23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy7sandbag23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Wait" @@ -20798,7 +20798,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy8searches23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy8searches23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Wait" @@ -20917,8 +20917,8 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy11sisterbound23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy11sisterbound23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250125 $$250125: .asciz "Wait" @@ -20944,7 +20944,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy5snowl23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5snowl23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Damage" @@ -21055,8 +21055,8 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy10stareffect23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy10stareffect23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250122 + .4byte $$250122 + .4byte $$250122 .global $$250122 $$250122: .asciz "TopL" @@ -21081,7 +21081,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy9tsukikage23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy9tsukikage23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250125 $$250125: .asciz "Fall" @@ -21213,7 +21213,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy10watergalbo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy10watergalbo23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Wait" @@ -21295,7 +21295,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy11whispyapple23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy11whispyapple23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Wait" @@ -21315,8 +21315,8 @@ $$250123: .balign 4 .global T_NODE_NAMES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250125 $$250125: .asciz "Loop" @@ -21329,7 +21329,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon7airball23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon7airball23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Main" @@ -21394,7 +21394,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon13whispyairball23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon13whispyairball23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Loop" @@ -21409,7 +21409,7 @@ $$250257: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon12leafanpollen23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon12leafanpollen23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250235 $$250235: .asciz "Model" @@ -21473,8 +21473,8 @@ $$250123: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon10spearspear23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon10spearspear23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250126 $$250126: .asciz "Loop" @@ -21505,7 +21505,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon8wingshot23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon8wingshot23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Main" @@ -21521,8 +21521,8 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon12shotzobullet23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon12shotzobullet23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250236 $$250236: .asciz "Model" @@ -21537,8 +21537,8 @@ $$250123: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon15sirkibblecutter23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon15sirkibblecutter23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250125 $$250125: .asciz "Main" @@ -21553,7 +21553,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon13owgulffeather23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon13owgulffeather23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250235 $$250235: .asciz "Model" @@ -21565,7 +21565,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon9foleyleaf23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon9foleyleaf23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Vanish" @@ -21628,8 +21628,8 @@ $$250123: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon17tsukikageshuriken23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon17tsukikageshuriken23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250240 $$250240: .asciz "TopL" @@ -21640,7 +21640,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon10whispyroot23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon10whispyroot23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250235 $$250235: .asciz "TopL" @@ -21652,7 +21652,7 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon18combinationairball23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon18combinationairball23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Main" @@ -21688,8 +21688,8 @@ $$250122: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon12dededehammer23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon12dededehammer23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250236 $$250236: .asciz "Model" @@ -21704,8 +21704,8 @@ $$250123: .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon8deespear23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon8deespear23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 - .byte4 $$250123 + .4byte $$250122 + .4byte $$250123 .global $$250126 $$250126: .asciz "Loop" @@ -21724,7 +21724,7 @@ $$250125: .balign 4 .global $$2LOCAL$$2CreateStar__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateStar__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .byte4 $$250125 + .4byte $$250125 .global $$250570 $$250570: .asciz "TopL" @@ -21735,7 +21735,7 @@ $$250171: .asciz "TopL1x1" .global $$2LOCAL$$2CreateHeavy1x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy1x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .byte4 $$250171 + .4byte $$250171 .4byte 0 .global $$250585 $$250585: @@ -21745,7 +21745,7 @@ $$250194: .asciz "TopL2x2" .global $$2LOCAL$$2CreateHeavy2x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy2x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .byte4 $$250194 + .4byte $$250194 .4byte 0 .global $$250589 $$250589: @@ -21755,7 +21755,7 @@ $$250217: .asciz "TopL3x3" .global $$2LOCAL$$2CreateHeavy3x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy3x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .byte4 $$250217 + .4byte $$250217 .4byte 0 .global $$250593 $$250593: @@ -21765,27 +21765,27 @@ $$250240: .asciz "TopL4x4" .global $$2LOCAL$$2CreateHeavy4x4__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy4x4__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .byte4 $$250240 + .4byte $$250240 .4byte 0 .global $$250597 $$250597: .asciz "TopL4x4" .global $$2LOCAL$$2CreateHeavyA1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavyA1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .byte4 $$250263 + .4byte $$250263 .global $$2LOCAL$$2CreateHeavyB1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavyB1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .byte4 $$250286 + .4byte $$250286 .global $$2LOCAL$$2CreateHeavy1x2x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy1x2x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .byte4 $$250309 + .4byte $$250309 .4byte 0 .global $$250332 $$250332: .asciz "TopL1x3" .global $$2LOCAL$$2CreateHeavy1x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy1x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .byte4 $$250332 + .4byte $$250332 .4byte 0 .global $$250613 $$250613: @@ -21795,24 +21795,24 @@ $$250355: .asciz "TopL3x1" .global $$2LOCAL$$2CreateHeavy3x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy3x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .byte4 $$250355 + .4byte $$250355 .4byte 0 .global $$250617 $$250617: .asciz "TopL3x1" .global $$2LOCAL$$2CreateHeavy2x4x4x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy2x4x4x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .byte4 $$250378 + .4byte $$250378 .global $$2LOCAL$$2CreateHeavy3x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy3x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .byte4 $$250401 + .4byte $$250401 .global $$250122 $$250122: .asciz "TopL" .balign 4 .global T_NODE_NAMES__Q53scn4step6weapon11hotheadfire23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon11hotheadfire23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .global $$250124 $$250124: .asciz "Attack" @@ -21826,7 +21826,7 @@ $$250240: .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: - .byte4 Create__Q53scn4step4boss15challengemaster9ModelDescFUlb + .4byte Create__Q53scn4step4boss15challengemaster9ModelDescFUlb .global $$250316 $$250316: .4byte 0 @@ -21846,7 +21846,7 @@ $$250364: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step4boss10creditroah23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss10creditroah23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250137 + .4byte $$250137 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 @@ -21894,7 +21894,7 @@ $$250421: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step5enemy11dubiorspark23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy11dubiorspark23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 @@ -21986,67 +21986,67 @@ T_MESHFLIP_NODE_TABLE__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon7airball23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon7airball23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon11starshotlv223$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon11starshotlv223$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250127 + .4byte $$250127 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon11starshotlv323$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon11starshotlv323$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250128 + .4byte $$250128 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250128 + .4byte $$250128 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon20enemywaterbulletwarp23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon20enemywaterbulletwarp23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250128 + .4byte $$250128 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon8wingshot23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon8wingshot23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon15sirkibblecutter23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon15sirkibblecutter23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250125 + .4byte $$250125 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon17tsukikageshuriken23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon17tsukikageshuriken23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250122 + .4byte $$250122 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon18combinationairball23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon18combinationairball23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon11hotheadfire23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon11hotheadfire23$$2unnamed$$2ModelDesc_cpp$$2: - .byte4 $$250124 + .4byte $$250124 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/ModelDescUtil.s b/asm/src/ModelDescUtil.s index b5cdc849..bb2f1c22 100644 --- a/asm/src/ModelDescUtil.s +++ b/asm/src/ModelDescUtil.s @@ -266,11 +266,11 @@ $$250293: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global SCRIPT_ENTRIES__Q43scn4step4item13ModelDescUtil SCRIPT_ENTRIES__Q43scn4step4item13ModelDescUtil: - .byte4 T_SCRIPT_ENTRIES__Q43scn4step4item27$$2unnamed$$2ModelDescUtil_cpp$$2 + .4byte T_SCRIPT_ENTRIES__Q43scn4step4item27$$2unnamed$$2ModelDescUtil_cpp$$2 .global $$250143 $$250143: .asciz "TopL" .balign 4 .global $$2LOCAL$$2Set__Q43scn4step4item13ModelDescUtilFRQ43scn4step5chara9ModelDescRQ24gobj8AnimDescRQ24gobj10ScriptDescPCcPCcPCcUlPCQ34gobj20G3DAnimDataReposDesc5EntryUlPCQ34gobj10ScriptDesc5Entry$$2NODE_NAMES $$2LOCAL$$2Set__Q43scn4step4item13ModelDescUtilFRQ43scn4step5chara9ModelDescRQ24gobj8AnimDescRQ24gobj10ScriptDescPCcPCcPCcUlPCQ34gobj20G3DAnimDataReposDesc5EntryUlPCQ34gobj10ScriptDesc5Entry$$2NODE_NAMES: - .byte4 $$250143 + .4byte $$250143 diff --git a/asm/src/Monitor.s b/asm/src/Monitor.s index 82b096f0..d9791993 100644 --- a/asm/src/Monitor.s +++ b/asm/src/Monitor.s @@ -168,10 +168,10 @@ $$252078: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251937 $$251937: - .byte4 $$251935 + .4byte $$251935 .global lbl_805629B4 lbl_805629B4: - .byte4 $$251936 + .4byte $$251936 .global $$252079 $$252079: .4byte 0 diff --git a/asm/src/MoveGridGroup.s b/asm/src/MoveGridGroup.s index 46787d57..6f7cfa50 100644 --- a/asm/src/MoveGridGroup.s +++ b/asm/src/MoveGridGroup.s @@ -2015,7 +2015,7 @@ __sinit_$$3MoveGridGroup_cpp: /* 801BBA68 001B78A8 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MoveGridGroup_cpp + .4byte __sinit_$$3MoveGridGroup_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global T_GRID_SHAPE_INFO_TABLE__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 diff --git a/asm/src/MoveGridManager.s b/asm/src/MoveGridManager.s index acaea2f8..d862295d 100644 --- a/asm/src/MoveGridManager.s +++ b/asm/src/MoveGridManager.s @@ -896,17 +896,17 @@ addType_SIceVolcano__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: .global addType_Tbl__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 addType_Tbl__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: .4byte 0 - .byte4 addType_ConditionalStepM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 - .byte4 addType_ConditionalStepHM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 - .byte4 addType_ConditionalStepL__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 - .byte4 addType_ConditionalStepHL__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 - .byte4 addType_SIceVolcano__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 - .byte4 addType_ConditionalCloudStepM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 - .byte4 addType_ConditionalCloudStepHM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 - .byte4 addType_ConditionalCloudStepL__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 - .byte4 addType_ConditionalCloudStepHL__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 - .byte4 addType_ConditionalChallengeMasterExDoor__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 - .byte4 addType_ConditionalCreditOtachidai__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 + .4byte addType_ConditionalStepM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 + .4byte addType_ConditionalStepHM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 + .4byte addType_ConditionalStepL__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 + .4byte addType_ConditionalStepHL__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 + .4byte addType_SIceVolcano__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 + .4byte addType_ConditionalCloudStepM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 + .4byte addType_ConditionalCloudStepHM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 + .4byte addType_ConditionalCloudStepL__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 + .4byte addType_ConditionalCloudStepHL__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 + .4byte addType_ConditionalChallengeMasterExDoor__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 + .4byte addType_ConditionalCreditOtachidai__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 .global $$252675 $$252675: .4byte 0x801BBC00 ;# ptr diff --git a/asm/src/MoveGroupCtrl.s b/asm/src/MoveGroupCtrl.s index fa4898a1..39462154 100644 --- a/asm/src/MoveGroupCtrl.s +++ b/asm/src/MoveGroupCtrl.s @@ -1981,12 +1981,12 @@ t_VibrationSize__Q53scn4step7gimmick13movegroupctrl27$$2unnamed$$2MoveGroupCtrl_ __vt__Q53scn4step7gimmick13movegroupctrl13MoveGroupCtrl: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick13movegroupctrl13MoveGroupCtrlFv - .byte4 onSwitchOn__Q53scn4step7gimmick13movegroupctrl13MoveGroupCtrlFv - .byte4 onSwitchOff__Q53scn4step7gimmick13movegroupctrl13MoveGroupCtrlFv - .byte4 onSwitchToggle__Q43scn4step7gimmick14SwitchReceiverFv - .byte4 onSwitchOnFromSuperBeamSwitch__Q43scn4step7gimmick14SwitchReceiverFv - .byte4 checkDemoPos__Q43scn4step7gimmick14SwitchReceiverCFRQ33hel4math7Vector2 + .4byte __dt__Q53scn4step7gimmick13movegroupctrl13MoveGroupCtrlFv + .4byte onSwitchOn__Q53scn4step7gimmick13movegroupctrl13MoveGroupCtrlFv + .4byte onSwitchOff__Q53scn4step7gimmick13movegroupctrl13MoveGroupCtrlFv + .4byte onSwitchToggle__Q43scn4step7gimmick14SwitchReceiverFv + .4byte onSwitchOnFromSuperBeamSwitch__Q43scn4step7gimmick14SwitchReceiverFv + .4byte checkDemoPos__Q43scn4step7gimmick14SwitchReceiverCFRQ33hel4math7Vector2 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257160 diff --git a/asm/src/MovieButtonContent.s b/asm/src/MovieButtonContent.s index 4e5860f7..05c7d2b7 100644 --- a/asm/src/MovieButtonContent.s +++ b/asm/src/MovieButtonContent.s @@ -130,59 +130,59 @@ $$251563: .balign 4 .global PANES__Q43scn7history6detail32$$2unnamed$$2MovieButtonContent_cpp$$2 PANES__Q43scn7history6detail32$$2unnamed$$2MovieButtonContent_cpp$$2: - .byte4 $$251545 - .byte4 $$251546 - .byte4 $$251547 - .byte4 $$251548 - .byte4 $$251549 - .byte4 $$251550 - .byte4 $$251551 - .byte4 $$251552 - .byte4 $$251553 - .byte4 $$251554 - .byte4 $$251555 - .byte4 $$251556 - .byte4 $$251557 - .byte4 $$251558 - .byte4 $$251559 - .byte4 $$251560 - .byte4 $$251561 - .byte4 $$251562 - .byte4 $$251563 - .byte4 $$251564 - .byte4 $$251565 - .byte4 $$251566 + .4byte $$251545 + .4byte $$251546 + .4byte $$251547 + .4byte $$251548 + .4byte $$251549 + .4byte $$251550 + .4byte $$251551 + .4byte $$251552 + .4byte $$251553 + .4byte $$251554 + .4byte $$251555 + .4byte $$251556 + .4byte $$251557 + .4byte $$251558 + .4byte $$251559 + .4byte $$251560 + .4byte $$251561 + .4byte $$251562 + .4byte $$251563 + .4byte $$251564 + .4byte $$251565 + .4byte $$251566 .global TABLE__Q43scn7history6detail32$$2unnamed$$2MovieButtonContent_cpp$$2 TABLE__Q43scn7history6detail32$$2unnamed$$2MovieButtonContent_cpp$$2: - .byte4 $$251567 - .byte4 $$251546 - .byte4 $$251551 - .byte4 $$251553 - .byte4 $$251567 - .byte4 $$251552 - .byte4 $$251550 - .byte4 $$251547 - .byte4 $$251564 - .byte4 $$251545 - .byte4 $$251554 - .byte4 $$251548 - .byte4 $$251567 - .byte4 $$251567 - .byte4 $$251549 - .byte4 $$251565 - .byte4 $$251559 - .byte4 $$251546 - .byte4 $$251555 - .byte4 $$251560 - .byte4 $$251558 - .byte4 $$251561 - .byte4 $$251567 - .byte4 $$251557 - .byte4 $$251567 - .byte4 $$251562 - .byte4 $$251563 - .byte4 $$251556 - .byte4 $$251566 + .4byte $$251567 + .4byte $$251546 + .4byte $$251551 + .4byte $$251553 + .4byte $$251567 + .4byte $$251552 + .4byte $$251550 + .4byte $$251547 + .4byte $$251564 + .4byte $$251545 + .4byte $$251554 + .4byte $$251548 + .4byte $$251567 + .4byte $$251567 + .4byte $$251549 + .4byte $$251565 + .4byte $$251559 + .4byte $$251546 + .4byte $$251555 + .4byte $$251560 + .4byte $$251558 + .4byte $$251561 + .4byte $$251567 + .4byte $$251557 + .4byte $$251567 + .4byte $$251562 + .4byte $$251563 + .4byte $$251556 + .4byte $$251566 .global $$252003 $$252003: .asciz "history/Detail" diff --git a/asm/src/MovieKindUtil.s b/asm/src/MovieKindUtil.s index 9e2f8161..5f6b0864 100644 --- a/asm/src/MovieKindUtil.s +++ b/asm/src/MovieKindUtil.s @@ -92,7 +92,7 @@ __sinit_$$3MovieKindUtil_cpp: /* 801CEDA8 001CABE8 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3MovieKindUtil_cpp + .4byte __sinit_$$3MovieKindUtil_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248726 @@ -193,82 +193,82 @@ $$248751: .balign 4 .global MOVIE_INFO_TABLE__Q23mov27$$2unnamed$$2MovieKindUtil_cpp$$2 MOVIE_INFO_TABLE__Q23mov27$$2unnamed$$2MovieKindUtil_cpp$$2: - .byte4 $$248726 + .4byte $$248726 .4byte 0x3F800000 .4byte 0 - .byte4 $$248727 + .4byte $$248727 .4byte 0x3F800000 .4byte 0 - .byte4 $$248728 + .4byte $$248728 .4byte 0x3F800000 .4byte 0 - .byte4 $$248729 + .4byte $$248729 .4byte 0x3F800000 .4byte 0 - .byte4 $$248730 + .4byte $$248730 .4byte 0x3F800000 .4byte 0 - .byte4 $$248731 + .4byte $$248731 .4byte 0x3F800000 .4byte 0 - .byte4 $$248732 + .4byte $$248732 .4byte 0x3F800000 .4byte 0 - .byte4 $$248733 + .4byte $$248733 .4byte 0x3F800000 .4byte 0 - .byte4 $$248734 + .4byte $$248734 .4byte 0x3F800000 .4byte 0 - .byte4 $$248735 + .4byte $$248735 .4byte 0x3F800000 .4byte 0 - .byte4 $$248736 + .4byte $$248736 .4byte 0x3F800000 .4byte 0 - .byte4 $$248737 + .4byte $$248737 .4byte 0x3F800000 .4byte 0 - .byte4 $$248738 + .4byte $$248738 .4byte 0x3F800000 .4byte 0 - .byte4 $$248739 + .4byte $$248739 .4byte 0x3F800000 .4byte 0 - .byte4 $$248740 + .4byte $$248740 .4byte 0x3F800000 .4byte 0 - .byte4 $$248741 + .4byte $$248741 .4byte 0x3F800000 .4byte 0 - .byte4 $$248742 + .4byte $$248742 .4byte 0x3F800000 .4byte 0 - .byte4 $$248743 + .4byte $$248743 .4byte 0x3F800000 .4byte 0 - .byte4 $$248744 + .4byte $$248744 .4byte 0x3F800000 .4byte 0 - .byte4 $$248745 + .4byte $$248745 .4byte 0x3F800000 .4byte 0 - .byte4 $$248746 + .4byte $$248746 .4byte 0x3F800000 .4byte 0 - .byte4 $$248747 + .4byte $$248747 .4byte 0x3F800000 .4byte 0 - .byte4 $$248748 + .4byte $$248748 .4byte 0x3F800000 .4byte 0 - .byte4 $$248749 + .4byte $$248749 .4byte 0x3F800000 .4byte 0 - .byte4 $$248750 + .4byte $$248750 .4byte 0x3F800000 .4byte 0 - .byte4 $$248751 + .4byte $$248751 .4byte 0x3F800000 .4byte 0 diff --git a/asm/src/MoviePlayer.s b/asm/src/MoviePlayer.s index f7a320fd..655cbae3 100644 --- a/asm/src/MoviePlayer.s +++ b/asm/src/MoviePlayer.s @@ -924,10 +924,10 @@ $$250331: .4byte 0x3F800000 .global $$249607 $$249607: - .byte4 MoDebug__3movFPvPCc + .4byte MoDebug__3movFPvPCc .global lbl_8055FC14 lbl_8055FC14: - .byte4 MoError__3movFPvPCc + .4byte MoError__3movFPvPCc .global $$250385 $$250385: .4byte 0x3B800000 diff --git a/asm/src/MovieWindow.s b/asm/src/MovieWindow.s index 38ad7cf1..7ba8cd4e 100644 --- a/asm/src/MovieWindow.s +++ b/asm/src/MovieWindow.s @@ -1994,35 +1994,35 @@ $$252450: .balign 4 .global MSG_LABEL_TABLE__Q43scn7history6detail25$$2unnamed$$2MovieWindow_cpp$$2 MSG_LABEL_TABLE__Q43scn7history6detail25$$2unnamed$$2MovieWindow_cpp$$2: - .byte4 $$252429 - .byte4 $$252430 - .byte4 $$252431 - .byte4 $$252432 - .byte4 $$252429 - .byte4 $$252433 - .byte4 $$252434 - .byte4 $$252435 - .byte4 $$252436 - .byte4 $$252437 - .byte4 $$252438 - .byte4 $$252439 - .byte4 $$252429 - .byte4 $$252429 - .byte4 $$252440 - .byte4 $$252441 - .byte4 $$252442 - .byte4 $$252429 - .byte4 $$252443 - .byte4 $$252444 - .byte4 $$252445 - .byte4 $$252446 - .byte4 $$252429 - .byte4 $$252447 - .byte4 $$252429 - .byte4 $$252448 - .byte4 $$252449 - .byte4 $$252450 - .byte4 $$252429 + .4byte $$252429 + .4byte $$252430 + .4byte $$252431 + .4byte $$252432 + .4byte $$252429 + .4byte $$252433 + .4byte $$252434 + .4byte $$252435 + .4byte $$252436 + .4byte $$252437 + .4byte $$252438 + .4byte $$252439 + .4byte $$252429 + .4byte $$252429 + .4byte $$252440 + .4byte $$252441 + .4byte $$252442 + .4byte $$252429 + .4byte $$252443 + .4byte $$252444 + .4byte $$252445 + .4byte $$252446 + .4byte $$252429 + .4byte $$252447 + .4byte $$252429 + .4byte $$252448 + .4byte $$252449 + .4byte $$252450 + .4byte $$252429 .global $$254931 $$254931: .asciz "MovieWindow" diff --git a/asm/src/MovieYuv.s b/asm/src/MovieYuv.s index 8f466a27..64c26dfe 100644 --- a/asm/src/MovieYuv.s +++ b/asm/src/MovieYuv.s @@ -623,11 +623,11 @@ getImage__Q23mov8MovieYuvFPv: __vt__Q23mov8MovieYuv: .4byte 0 .4byte 0 - .byte4 __dt__Q23mov8MovieYuvFv - .byte4 getImage__Q23mov8MovieYuvFPv - .byte4 setupRender__Q23mov8MovieYuvCFv - .byte4 restoreRender__Q23mov8MovieYuvCFv - .byte4 setupTexObjs__Q23mov8MovieYuvCFP9_GXTexObj + .4byte __dt__Q23mov8MovieYuvFv + .4byte getImage__Q23mov8MovieYuvFPv + .4byte setupRender__Q23mov8MovieYuvCFv + .4byte restoreRender__Q23mov8MovieYuvCFv + .4byte setupTexObjs__Q23mov8MovieYuvCFP9_GXTexObj .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/NANDErrorMenu.s b/asm/src/NANDErrorMenu.s index e8f8b3cc..856850a1 100644 --- a/asm/src/NANDErrorMenu.s +++ b/asm/src/NANDErrorMenu.s @@ -1028,7 +1028,7 @@ $$253377: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_LYT_RES__Q23app27$$2unnamed$$2NANDErrorMenu_cpp$$2 T_LYT_RES__Q23app27$$2unnamed$$2NANDErrorMenu_cpp$$2: - .byte4 $$251882 + .4byte $$251882 .global $$253132 $$253132: .asciz "%s%s%s" diff --git a/asm/src/NandThread.s b/asm/src/NandThread.s index 9bd02e22..f741fab1 100644 --- a/asm/src/NandThread.s +++ b/asm/src/NandThread.s @@ -1649,49 +1649,49 @@ lbl_801D3020: SaveFiles__4nand: .4byte 0 .4byte 0x0000F0A0 - .byte4 $$249991 + .4byte $$249991 .4byte 0x00000001 .4byte 0x000007D8 - .byte4 $$249992 + .4byte $$249992 .4byte 0x00000001 .4byte 0x00071C00 - .byte4 $$249993 + .4byte $$249993 .4byte 0x00000001 .4byte 0x00071C00 - .byte4 $$249994 + .4byte $$249994 .4byte 0x00000001 .4byte 0x00071C00 - .byte4 $$249995 + .4byte $$249995 .4byte 0x00000002 .4byte 0x00002000 - .byte4 $$249996 + .4byte $$249996 .4byte 0x00000002 .4byte 0x00002040 - .byte4 $$249997 + .4byte $$249997 .4byte 0x00000002 .4byte 0x00002020 - .byte4 $$249998 + .4byte $$249998 .4byte 0x00000002 .4byte 0x00008020 - .byte4 $$249999 + .4byte $$249999 .4byte 0x00000002 .4byte 0x00004000 - .byte4 $$250000 + .4byte $$250000 .4byte 0x00000002 .4byte 0x0000F788 - .byte4 $$250001 + .4byte $$250001 .4byte 0x00000002 .4byte 0x00011788 - .byte4 $$250002 + .4byte $$250002 .4byte 0x00000002 .4byte 0x00004260 - .byte4 $$250003 + .4byte $$250003 .4byte 0x00000002 .4byte 0x0005FD20 - .byte4 $$250004 + .4byte $$250004 .4byte 0x00000002 .4byte 0x00065D20 - .byte4 $$250005 + .4byte $$250005 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1772,7 +1772,7 @@ $$249989: .balign 4 .global TMP_DIRECTORY__4nand TMP_DIRECTORY__4nand: - .byte4 $$249989 + .4byte $$249989 .global $$251560 $$251560: .asciz "Nand" diff --git a/asm/src/NextArrowPanel.s b/asm/src/NextArrowPanel.s index ad4837b4..5413152a 100644 --- a/asm/src/NextArrowPanel.s +++ b/asm/src/NextArrowPanel.s @@ -324,16 +324,16 @@ lbl_803AFACC: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$253080 $$253080: - .byte4 $$253076 - .byte4 $$253077 - .byte4 $$253078 - .byte4 $$253079 + .4byte $$253076 + .4byte $$253077 + .4byte $$253078 + .4byte $$253079 .global $$253090 $$253090: - .byte4 $$253076 - .byte4 $$253077 - .byte4 $$253078 - .byte4 $$253079 + .4byte $$253076 + .4byte $$253077 + .4byte $$253078 + .4byte $$253079 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253551 diff --git a/asm/src/Nururi.s b/asm/src/Nururi.s index d56fa362..a71cf246 100644 --- a/asm/src/Nururi.s +++ b/asm/src/Nururi.s @@ -963,7 +963,7 @@ mode__Q43scn4step4hero6NururiFv: __vt__Q26nururi6Nururi: .4byte 0 .4byte 0 - .byte4 __dt__Q26nururi6NururiFv + .4byte __dt__Q26nururi6NururiFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/ObjCollReact.s b/asm/src/ObjCollReact.s index adc592e6..5c6fe264 100644 --- a/asm/src/ObjCollReact.s +++ b/asm/src/ObjCollReact.s @@ -3071,100 +3071,100 @@ T_DAMAGERATE_BY_PLAYERCOUNT__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2: __vt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadExtreme$$4PQ43scn4step5enemy5Enemy$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadExtreme$$4PQ43scn4step5enemy5Enemy$$4Ul$$1Fv - .byte4 create__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadExtreme$$4PQ43scn4step5enemy5Enemy$$4Ul$$1Fv + .4byte __dt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadExtreme$$4PQ43scn4step5enemy5Enemy$$4Ul$$1Fv + .4byte create__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadExtreme$$4PQ43scn4step5enemy5Enemy$$4Ul$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage14StateDeadSuper$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage14StateDeadSuper$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage14StateDeadSuper$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage14StateDeadSuper$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage14StateDeadSuper$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage14StateDeadSuper$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateDamageWingToss$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateDamageWingToss$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateDamageWingToss$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateDamageWingToss$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateDamageWingToss$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateDamageWingToss$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage17StateDamageNormal$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage17StateDamageNormal$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage17StateDamageNormal$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage17StateDamageNormal$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage17StateDamageNormal$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage17StateDamageNormal$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageExtreme$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageExtreme$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageExtreme$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageExtreme$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageExtreme$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageExtreme$$4PQ43scn4step5enemy5Enemy$$1Fv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage20StateSuperTeamAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage20StateSuperTeamAttack$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage20StateSuperTeamAttack$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage20StateSuperTeamAttack$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage20StateSuperTeamAttack$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage20StateSuperTeamAttack$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateGuard$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateGuard$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateGuard$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateGuard$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateGuard$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateGuard$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateHover$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateHover$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateHover$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateHover$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateHover$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateHover$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero6damage12StateExtreme11DamageLevel$$1 __vt__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero6damage12StateExtreme11DamageLevel$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero6damage12StateExtreme11DamageLevel$$1Fv - .byte4 create__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero6damage12StateExtreme11DamageLevel$$1Fv + .4byte __dt__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero6damage12StateExtreme11DamageLevel$$1Fv + .4byte create__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero6damage12StateExtreme11DamageLevel$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv2$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv2$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv2$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv2$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv2$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv2$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv1$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv1$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv1$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv1$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv1$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv1$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateBodyHit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateBodyHit$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateBodyHit$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateBodyHit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateBodyHit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateBodyHit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv2$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv2$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv2$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv2$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv2$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv2$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv3$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv3$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv3$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv3$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv3$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv3$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv3$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv3$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv3$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv3$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv3$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv3$$4PQ43scn4step4hero4Hero$$1Fv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_DAMAGERATE_BY_PILE__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2 diff --git a/asm/src/ObjInfoImpl.s b/asm/src/ObjInfoImpl.s index 1b4bf170..9ed64122 100644 --- a/asm/src/ObjInfoImpl.s +++ b/asm/src/ObjInfoImpl.s @@ -347,15 +347,15 @@ state__Q43scn4step4hero11ObjInfoImplCFv: __vt__Q43scn4step4boss11ObjInfoImpl: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4boss11ObjInfoImplFv - .byte4 name__Q43scn4step4boss11ObjInfoImplCFv - .byte4 anim__Q43scn4step4boss11ObjInfoImplCFv - .byte4 footState__Q43scn4step4boss11ObjInfoImplCFv - .byte4 hitPoint__Q43scn4step4boss11ObjInfoImplCFv - .byte4 location__Q43scn4step4boss11ObjInfoImplCFv - .byte4 move__Q43scn4step4boss11ObjInfoImplCFv - .byte4 script__Q43scn4step4boss11ObjInfoImplCFv - .byte4 state__Q43scn4step4boss11ObjInfoImplCFv + .4byte __dt__Q43scn4step4boss11ObjInfoImplFv + .4byte name__Q43scn4step4boss11ObjInfoImplCFv + .4byte anim__Q43scn4step4boss11ObjInfoImplCFv + .4byte footState__Q43scn4step4boss11ObjInfoImplCFv + .4byte hitPoint__Q43scn4step4boss11ObjInfoImplCFv + .4byte location__Q43scn4step4boss11ObjInfoImplCFv + .4byte move__Q43scn4step4boss11ObjInfoImplCFv + .4byte script__Q43scn4step4boss11ObjInfoImplCFv + .4byte state__Q43scn4step4boss11ObjInfoImplCFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -398,15 +398,15 @@ $$255469: __vt__Q43scn4step4hero11ObjInfoImpl: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4hero11ObjInfoImplFv - .byte4 name__Q43scn4step4hero11ObjInfoImplCFv - .byte4 anim__Q43scn4step4hero11ObjInfoImplCFv - .byte4 footState__Q43scn4step4hero11ObjInfoImplCFv - .byte4 hitPoint__Q43scn4step4hero11ObjInfoImplCFv - .byte4 location__Q43scn4step4hero11ObjInfoImplCFv - .byte4 move__Q43scn4step4hero11ObjInfoImplCFv - .byte4 script__Q43scn4step4hero11ObjInfoImplCFv - .byte4 state__Q43scn4step4hero11ObjInfoImplCFv + .4byte __dt__Q43scn4step4hero11ObjInfoImplFv + .4byte name__Q43scn4step4hero11ObjInfoImplCFv + .4byte anim__Q43scn4step4hero11ObjInfoImplCFv + .4byte footState__Q43scn4step4hero11ObjInfoImplCFv + .4byte hitPoint__Q43scn4step4hero11ObjInfoImplCFv + .4byte location__Q43scn4step4hero11ObjInfoImplCFv + .4byte move__Q43scn4step4hero11ObjInfoImplCFv + .4byte script__Q43scn4step4hero11ObjInfoImplCFv + .4byte state__Q43scn4step4hero11ObjInfoImplCFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254747 diff --git a/asm/src/ObjStop.s b/asm/src/ObjStop.s index 82cde08b..e8dc0795 100644 --- a/asm/src/ObjStop.s +++ b/asm/src/ObjStop.s @@ -897,11 +897,11 @@ onStopPowerfulFinished__Q43scn4step6weapon7ObjStopFRCQ25ostop5Actor: __vt__Q43scn4step4boss7ObjStop: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4boss7ObjStopFv - .byte4 onStopNormalStarted__Q43scn4step4boss7ObjStopFRCQ25ostop5Actor - .byte4 onStopNormalFinished__Q43scn4step4boss7ObjStopFRCQ25ostop5Actor - .byte4 onStopPowerfulStarted__Q43scn4step4boss7ObjStopFRCQ25ostop5Actor - .byte4 onStopPowerfulFinished__Q43scn4step4boss7ObjStopFRCQ25ostop5Actor + .4byte __dt__Q43scn4step4boss7ObjStopFv + .4byte onStopNormalStarted__Q43scn4step4boss7ObjStopFRCQ25ostop5Actor + .4byte onStopNormalFinished__Q43scn4step4boss7ObjStopFRCQ25ostop5Actor + .4byte onStopPowerfulStarted__Q43scn4step4boss7ObjStopFRCQ25ostop5Actor + .4byte onStopPowerfulFinished__Q43scn4step4boss7ObjStopFRCQ25ostop5Actor .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -909,11 +909,11 @@ __vt__Q43scn4step4boss7ObjStop: __vt__Q43scn4step5enemy7ObjStop: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step5enemy7ObjStopFv - .byte4 onStopNormalStarted__Q43scn4step5enemy7ObjStopFRCQ25ostop5Actor - .byte4 onStopNormalFinished__Q43scn4step5enemy7ObjStopFRCQ25ostop5Actor - .byte4 onStopPowerfulStarted__Q43scn4step5enemy7ObjStopFRCQ25ostop5Actor - .byte4 onStopPowerfulFinished__Q43scn4step5enemy7ObjStopFRCQ25ostop5Actor + .4byte __dt__Q43scn4step5enemy7ObjStopFv + .4byte onStopNormalStarted__Q43scn4step5enemy7ObjStopFRCQ25ostop5Actor + .4byte onStopNormalFinished__Q43scn4step5enemy7ObjStopFRCQ25ostop5Actor + .4byte onStopPowerfulStarted__Q43scn4step5enemy7ObjStopFRCQ25ostop5Actor + .4byte onStopPowerfulFinished__Q43scn4step5enemy7ObjStopFRCQ25ostop5Actor .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -921,11 +921,11 @@ __vt__Q43scn4step5enemy7ObjStop: __vt__Q43scn4step4hero7ObjStop: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4hero7ObjStopFv - .byte4 onStopNormalStarted__Q43scn4step4hero7ObjStopFRCQ25ostop5Actor - .byte4 onStopNormalFinished__Q43scn4step4hero7ObjStopFRCQ25ostop5Actor - .byte4 onStopPowerfulStarted__Q43scn4step4hero7ObjStopFRCQ25ostop5Actor - .byte4 onStopPowerfulFinished__Q43scn4step4hero7ObjStopFRCQ25ostop5Actor + .4byte __dt__Q43scn4step4hero7ObjStopFv + .4byte onStopNormalStarted__Q43scn4step4hero7ObjStopFRCQ25ostop5Actor + .4byte onStopNormalFinished__Q43scn4step4hero7ObjStopFRCQ25ostop5Actor + .4byte onStopPowerfulStarted__Q43scn4step4hero7ObjStopFRCQ25ostop5Actor + .4byte onStopPowerfulFinished__Q43scn4step4hero7ObjStopFRCQ25ostop5Actor .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -933,11 +933,11 @@ __vt__Q43scn4step4hero7ObjStop: __vt__Q43scn4step4item7ObjStop: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4item7ObjStopFv - .byte4 onStopNormalStarted__Q43scn4step4item7ObjStopFRCQ25ostop5Actor - .byte4 onStopNormalFinished__Q43scn4step4item7ObjStopFRCQ25ostop5Actor - .byte4 onStopPowerfulStarted__Q43scn4step4item7ObjStopFRCQ25ostop5Actor - .byte4 onStopPowerfulFinished__Q43scn4step4item7ObjStopFRCQ25ostop5Actor + .4byte __dt__Q43scn4step4item7ObjStopFv + .4byte onStopNormalStarted__Q43scn4step4item7ObjStopFRCQ25ostop5Actor + .4byte onStopNormalFinished__Q43scn4step4item7ObjStopFRCQ25ostop5Actor + .4byte onStopPowerfulStarted__Q43scn4step4item7ObjStopFRCQ25ostop5Actor + .4byte onStopPowerfulFinished__Q43scn4step4item7ObjStopFRCQ25ostop5Actor .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -945,9 +945,9 @@ __vt__Q43scn4step4item7ObjStop: __vt__Q43scn4step6weapon7ObjStop: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step6weapon7ObjStopFv - .byte4 onStopNormalStarted__Q43scn4step6weapon7ObjStopFRCQ25ostop5Actor - .byte4 onStopNormalFinished__Q43scn4step6weapon7ObjStopFRCQ25ostop5Actor - .byte4 onStopPowerfulStarted__Q43scn4step6weapon7ObjStopFRCQ25ostop5Actor - .byte4 onStopPowerfulFinished__Q43scn4step6weapon7ObjStopFRCQ25ostop5Actor + .4byte __dt__Q43scn4step6weapon7ObjStopFv + .4byte onStopNormalStarted__Q43scn4step6weapon7ObjStopFRCQ25ostop5Actor + .4byte onStopNormalFinished__Q43scn4step6weapon7ObjStopFRCQ25ostop5Actor + .4byte onStopPowerfulStarted__Q43scn4step6weapon7ObjStopFRCQ25ostop5Actor + .4byte onStopPowerfulFinished__Q43scn4step6weapon7ObjStopFRCQ25ostop5Actor .4byte 0 diff --git a/asm/src/OperatorNewDelete.s b/asm/src/OperatorNewDelete.s index 512a7b9e..57a2c6b5 100644 --- a/asm/src/OperatorNewDelete.s +++ b/asm/src/OperatorNewDelete.s @@ -121,7 +121,7 @@ __sinit_$$3OperatorNewDelete_cpp: /* 801BF75C 001BB59C 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3OperatorNewDelete_cpp + .4byte __sinit_$$3OperatorNewDelete_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global t_allocator__31$$2unnamed$$2OperatorNewDelete_cpp$$2 diff --git a/asm/src/Package.s b/asm/src/Package.s index 4ff8addb..4fbb23f8 100644 --- a/asm/src/Package.s +++ b/asm/src/Package.s @@ -937,7 +937,7 @@ __sinit_$$3Package_cpp: /* 8020E010 00209E50 4B EB 00 B0 */ b __ct__Q34nw4r4math4VEC3Ffff .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3Package_cpp + .4byte __sinit_$$3Package_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253252 @@ -959,12 +959,12 @@ $$253256: __vt__Q33scn7history7Package: .4byte 0 .4byte 0 - .byte4 __dt__Q33scn7history7PackageFv - .byte4 ExecCallback_CALC_WORLD__Q33scn7history7PackageFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv - .byte4 ExecCallback_CALC_MAT__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv - .byte4 ExecCallback_CALC_VIEW__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv - .byte4 ExecCallback_DRAW_OPA__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv - .byte4 ExecCallback_DRAW_XLU__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv + .4byte __dt__Q33scn7history7PackageFv + .4byte ExecCallback_CALC_WORLD__Q33scn7history7PackageFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv + .4byte ExecCallback_CALC_MAT__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv + .4byte ExecCallback_CALC_VIEW__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv + .4byte ExecCallback_DRAW_OPA__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv + .4byte ExecCallback_DRAW_XLU__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/PackageButtonContent.s b/asm/src/PackageButtonContent.s index 92ceb9e9..644a6252 100644 --- a/asm/src/PackageButtonContent.s +++ b/asm/src/PackageButtonContent.s @@ -130,59 +130,59 @@ $$251565: .balign 4 .global PANES__Q43scn7history6detail34$$2unnamed$$2PackageButtonContent_cpp$$2 PANES__Q43scn7history6detail34$$2unnamed$$2PackageButtonContent_cpp$$2: - .byte4 $$251545 - .byte4 $$251546 - .byte4 $$251547 - .byte4 $$251548 - .byte4 $$251549 - .byte4 $$251550 - .byte4 $$251551 - .byte4 $$251552 - .byte4 $$251553 - .byte4 $$251554 - .byte4 $$251555 - .byte4 $$251556 - .byte4 $$251557 - .byte4 $$251558 - .byte4 $$251559 - .byte4 $$251560 - .byte4 $$251561 - .byte4 $$251562 - .byte4 $$251563 - .byte4 $$251564 - .byte4 $$251565 - .byte4 $$251566 + .4byte $$251545 + .4byte $$251546 + .4byte $$251547 + .4byte $$251548 + .4byte $$251549 + .4byte $$251550 + .4byte $$251551 + .4byte $$251552 + .4byte $$251553 + .4byte $$251554 + .4byte $$251555 + .4byte $$251556 + .4byte $$251557 + .4byte $$251558 + .4byte $$251559 + .4byte $$251560 + .4byte $$251561 + .4byte $$251562 + .4byte $$251563 + .4byte $$251564 + .4byte $$251565 + .4byte $$251566 .global TABLE__Q43scn7history6detail34$$2unnamed$$2PackageButtonContent_cpp$$2 TABLE__Q43scn7history6detail34$$2unnamed$$2PackageButtonContent_cpp$$2: - .byte4 $$251567 - .byte4 $$251546 - .byte4 $$251551 - .byte4 $$251553 - .byte4 $$251567 - .byte4 $$251552 - .byte4 $$251550 - .byte4 $$251547 - .byte4 $$251564 - .byte4 $$251545 - .byte4 $$251554 - .byte4 $$251548 - .byte4 $$251567 - .byte4 $$251567 - .byte4 $$251549 - .byte4 $$251563 - .byte4 $$251559 - .byte4 $$251546 - .byte4 $$251555 - .byte4 $$251560 - .byte4 $$251558 - .byte4 $$251561 - .byte4 $$251567 - .byte4 $$251557 - .byte4 $$251567 - .byte4 $$251562 - .byte4 $$251565 - .byte4 $$251556 - .byte4 $$251566 + .4byte $$251567 + .4byte $$251546 + .4byte $$251551 + .4byte $$251553 + .4byte $$251567 + .4byte $$251552 + .4byte $$251550 + .4byte $$251547 + .4byte $$251564 + .4byte $$251545 + .4byte $$251554 + .4byte $$251548 + .4byte $$251567 + .4byte $$251567 + .4byte $$251549 + .4byte $$251563 + .4byte $$251559 + .4byte $$251546 + .4byte $$251555 + .4byte $$251560 + .4byte $$251558 + .4byte $$251561 + .4byte $$251567 + .4byte $$251557 + .4byte $$251567 + .4byte $$251562 + .4byte $$251565 + .4byte $$251556 + .4byte $$251566 .global $$252003 $$252003: .asciz "history/Detail" diff --git a/asm/src/PackageWindow.s b/asm/src/PackageWindow.s index 9af5f3a7..969821c7 100644 --- a/asm/src/PackageWindow.s +++ b/asm/src/PackageWindow.s @@ -2043,7 +2043,7 @@ __sinit_$$3PackageWindow_cpp: /* 80219EA8 00215CE8 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3PackageWindow_cpp + .4byte __sinit_$$3PackageWindow_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255641 @@ -2136,12 +2136,12 @@ $$256102: __vt__Q43scn7history6detail13PackageWindow: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn7history6detail13PackageWindowFv - .byte4 ExecCallback_CALC_WORLD__Q43scn7history6detail13PackageWindowFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv - .byte4 ExecCallback_CALC_MAT__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv - .byte4 ExecCallback_CALC_VIEW__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv - .byte4 ExecCallback_DRAW_OPA__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv - .byte4 ExecCallback_DRAW_XLU__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv + .4byte __dt__Q43scn7history6detail13PackageWindowFv + .4byte ExecCallback_CALC_WORLD__Q43scn7history6detail13PackageWindowFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv + .4byte ExecCallback_CALC_MAT__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv + .4byte ExecCallback_CALC_VIEW__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv + .4byte ExecCallback_DRAW_OPA__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv + .4byte ExecCallback_DRAW_XLU__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/PageAbility.s b/asm/src/PageAbility.s index 2485d486..7d5c6357 100644 --- a/asm/src/PageAbility.s +++ b/asm/src/PageAbility.s @@ -226,12 +226,12 @@ $$252592: __vt__Q25pause11PageAbility: .4byte 0 .4byte 0 - .byte4 __dt__Q25pause11PageAbilityFv - .byte4 pageFrameTitle__Q25pause11PageAbilityCFv - .byte4 pageMainLayout__Q25pause11PageAbilityFv - .byte4 pageProcAnim__Q25pause11PageAbilityFv - .byte4 pageProcHID__Q25pause11PageAbilityFv - .byte4 pageIsBusy__Q25pause11PageAbilityCFv + .4byte __dt__Q25pause11PageAbilityFv + .4byte pageFrameTitle__Q25pause11PageAbilityCFv + .4byte pageMainLayout__Q25pause11PageAbilityFv + .4byte pageProcAnim__Q25pause11PageAbilityFv + .4byte pageProcHID__Q25pause11PageAbilityFv + .4byte pageIsBusy__Q25pause11PageAbilityCFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" diff --git a/asm/src/PageCommand.s b/asm/src/PageCommand.s index f4eda044..4bc405ba 100644 --- a/asm/src/PageCommand.s +++ b/asm/src/PageCommand.s @@ -553,12 +553,12 @@ $$252960: __vt__Q25pause11PageCommand: .4byte 0 .4byte 0 - .byte4 __dt__Q25pause11PageCommandFv - .byte4 pageFrameTitle__Q25pause11PageCommandCFv - .byte4 pageMainLayout__Q25pause11PageCommandFv - .byte4 pageProcAnim__Q25pause11PageCommandFv - .byte4 pageProcHID__Q25pause11PageCommandFv - .byte4 pageIsBusy__Q25pause11PageCommandCFv + .4byte __dt__Q25pause11PageCommandFv + .4byte pageFrameTitle__Q25pause11PageCommandCFv + .4byte pageMainLayout__Q25pause11PageCommandFv + .4byte pageProcAnim__Q25pause11PageCommandFv + .4byte pageProcHID__Q25pause11PageCommandFv + .4byte pageIsBusy__Q25pause11PageCommandCFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" diff --git a/asm/src/PageDropout.s b/asm/src/PageDropout.s index 2b47e86d..b7c89ba9 100644 --- a/asm/src/PageDropout.s +++ b/asm/src/PageDropout.s @@ -828,25 +828,25 @@ T_ENTRIES_CHALLENGE__Q25pause25$$2unnamed$$2PageDropout_cpp$$2: .4byte 0 .global T_ENTRY_CONTEXTS__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 T_ENTRY_CONTEXTS__Q25pause25$$2unnamed$$2PageDropout_cpp$$2: - .byte4 T_ENTRIES_STAGE__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 + .4byte T_ENTRIES_STAGE__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 .4byte 0x00000002 - .byte4 T_ENTRIES_LEVELMAP__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 + .4byte T_ENTRIES_LEVELMAP__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 .4byte 0x00000002 - .byte4 T_ENTRIES_CHALLENGE__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 + .4byte T_ENTRIES_CHALLENGE__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 .4byte 0x00000003 - .byte4 T_ENTRIES_ABILITYROOM__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 + .4byte T_ENTRIES_ABILITYROOM__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 .4byte 0x00000002 .global T_LABELS__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 T_LABELS__Q25pause25$$2unnamed$$2PageDropout_cpp$$2: - .byte4 $$252145 - .byte4 $$252146 - .byte4 $$252146 - .byte4 $$252147 - .byte4 $$252148 - .byte4 $$252149 - .byte4 $$252149 - .byte4 $$252146 - .byte4 $$252150 + .4byte $$252145 + .4byte $$252146 + .4byte $$252146 + .4byte $$252147 + .4byte $$252148 + .4byte $$252149 + .4byte $$252149 + .4byte $$252146 + .4byte $$252150 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -936,12 +936,12 @@ $$253492: __vt__Q25pause11PageDropout: .4byte 0 .4byte 0 - .byte4 __dt__Q25pause11PageDropoutFv - .byte4 pageFrameTitle__Q25pause11PageDropoutCFv - .byte4 pageMainLayout__Q25pause11PageDropoutFv - .byte4 pageProcAnim__Q25pause11PageDropoutFv - .byte4 pageProcHID__Q25pause11PageDropoutFv - .byte4 pageIsBusy__Q25pause11PageDropoutCFv + .4byte __dt__Q25pause11PageDropoutFv + .4byte pageFrameTitle__Q25pause11PageDropoutCFv + .4byte pageMainLayout__Q25pause11PageDropoutFv + .4byte pageProcAnim__Q25pause11PageDropoutFv + .4byte pageProcHID__Q25pause11PageDropoutFv + .4byte pageIsBusy__Q25pause11PageDropoutCFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" diff --git a/asm/src/PageManager.s b/asm/src/PageManager.s index df9af045..8cf510c0 100644 --- a/asm/src/PageManager.s +++ b/asm/src/PageManager.s @@ -1173,7 +1173,7 @@ $$254028: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_MOVE_NODE_NAME__Q25pause25$$2unnamed$$2PageManager_cpp$$2 T_MOVE_NODE_NAME__Q25pause25$$2unnamed$$2PageManager_cpp$$2: - .byte4 $$252167 + .4byte $$252167 .global T_FIX_NODE_NAME__Q25pause25$$2unnamed$$2PageManager_cpp$$2 T_FIX_NODE_NAME__Q25pause25$$2unnamed$$2PageManager_cpp$$2: - .byte4 $$252168 + .4byte $$252168 diff --git a/asm/src/Parasol.s b/asm/src/Parasol.s index c4eb87ce..ebd241df 100644 --- a/asm/src/Parasol.s +++ b/asm/src/Parasol.s @@ -325,37 +325,37 @@ lbl_803928E0: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2ParasolAnim__Q53scn4step4hero9modeldesc7ParasolFv$$2entries$$21 $$2LOCAL$$2ParasolAnim__Q53scn4step4hero9modeldesc7ParasolFv$$2entries$$21: - .byte4 $$248740 + .4byte $$248740 .4byte 0 - .byte4 $$248741 + .4byte $$248741 .4byte 0 - .byte4 $$248742 + .4byte $$248742 .4byte 0 - .byte4 $$248743 + .4byte $$248743 .4byte 0 - .byte4 $$248744 + .4byte $$248744 .4byte 0 - .byte4 $$248745 + .4byte $$248745 .4byte 0 - .byte4 $$248746 + .4byte $$248746 .4byte 0 - .byte4 $$248747 + .4byte $$248747 .4byte 0 - .byte4 $$248748 + .4byte $$248748 .4byte 0 - .byte4 $$248749 + .4byte $$248749 .4byte 0 - .byte4 $$248750 + .4byte $$248750 .4byte 0 - .byte4 $$248751 + .4byte $$248751 .4byte 0 - .byte4 $$248752 + .4byte $$248752 .4byte 0 - .byte4 $$248753 + .4byte $$248753 .4byte 0 - .byte4 $$248754 + .4byte $$248754 .4byte 0 - .byte4 $$248755 + .4byte $$248755 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -413,27 +413,27 @@ $$257637: __vt__Q53scn4step4hero7parasol7Parasol: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7parasol7ParasolFv - .byte4 setup__Q53scn4step4hero7parasol7ParasolFv - .byte4 tryToChangeStateOnCarry__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeStateOnInterval__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeStateOnDamage__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeState__Q53scn4step4hero7parasol7ParasolFv - .byte4 onStateEndCleanUp__Q53scn4step4hero7parasol7ParasolFv - .byte4 onGetEventItem__Q43scn4step4hero11AbilityBaseFv - .byte4 onGimmickReactChangeState__Q43scn4step4hero11AbilityBaseFv - .byte4 onStartClearDanceExternal__Q43scn4step4hero11AbilityBaseFv - .byte4 onEnterWarpLowper__Q43scn4step4hero11AbilityBaseFv - .byte4 onShowHero__Q43scn4step4hero11AbilityBaseFv - .byte4 onHideHero__Q43scn4step4hero11AbilityBaseFv - .byte4 onDead__Q43scn4step4hero11AbilityBaseFv - .byte4 onCaptured__Q43scn4step4hero11AbilityBaseFv - .byte4 onVacuumed__Q43scn4step4hero11AbilityBaseFv - .byte4 onStartDemo__Q43scn4step4hero11AbilityBaseFv - .byte4 procAnim__Q53scn4step4hero7parasol7ParasolFv - .byte4 procMove__Q43scn4step4hero11AbilityBaseFv - .byte4 procObjCollReact__Q43scn4step4hero11AbilityBaseFv - .byte4 isDepleted__Q43scn4step4hero11AbilityBaseCFv + .4byte __dt__Q53scn4step4hero7parasol7ParasolFv + .4byte setup__Q53scn4step4hero7parasol7ParasolFv + .4byte tryToChangeStateOnCarry__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeStateOnInterval__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeStateOnDamage__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeState__Q53scn4step4hero7parasol7ParasolFv + .4byte onStateEndCleanUp__Q53scn4step4hero7parasol7ParasolFv + .4byte onGetEventItem__Q43scn4step4hero11AbilityBaseFv + .4byte onGimmickReactChangeState__Q43scn4step4hero11AbilityBaseFv + .4byte onStartClearDanceExternal__Q43scn4step4hero11AbilityBaseFv + .4byte onEnterWarpLowper__Q43scn4step4hero11AbilityBaseFv + .4byte onShowHero__Q43scn4step4hero11AbilityBaseFv + .4byte onHideHero__Q43scn4step4hero11AbilityBaseFv + .4byte onDead__Q43scn4step4hero11AbilityBaseFv + .4byte onCaptured__Q43scn4step4hero11AbilityBaseFv + .4byte onVacuumed__Q43scn4step4hero11AbilityBaseFv + .4byte onStartDemo__Q43scn4step4hero11AbilityBaseFv + .4byte procAnim__Q53scn4step4hero7parasol7ParasolFv + .4byte procMove__Q43scn4step4hero11AbilityBaseFv + .4byte procObjCollReact__Q43scn4step4hero11AbilityBaseFv + .4byte isDepleted__Q43scn4step4hero11AbilityBaseCFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 @@ -447,8 +447,8 @@ $$248733: .balign 4 .global $$2LOCAL$$2ParasolModel__Q53scn4step4hero9modeldesc7ParasolFv$$2names$$21 $$2LOCAL$$2ParasolModel__Q53scn4step4hero9modeldesc7ParasolFv$$2names$$21: - .byte4 $$248732 - .byte4 $$248733 + .4byte $$248732 + .4byte $$248733 .global $$248740 $$248740: .asciz "Carry" diff --git a/asm/src/PauseManager.s b/asm/src/PauseManager.s index 25032863..cbf1a6ab 100644 --- a/asm/src/PauseManager.s +++ b/asm/src/PauseManager.s @@ -146,5 +146,5 @@ lbl_80277988: __vt__Q43scn4step4core12PauseManager: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4core12PauseManagerFv - .byte4 onResultDecided__Q43scn4step4core12PauseManagerFRCQ25pause5Pause + .4byte __dt__Q43scn4step4core12PauseManagerFv + .4byte onResultDecided__Q43scn4step4core12PauseManagerFRCQ25pause5Pause diff --git a/asm/src/PerformanceController.s b/asm/src/PerformanceController.s index 704204d6..299163ce 100644 --- a/asm/src/PerformanceController.s +++ b/asm/src/PerformanceController.s @@ -341,7 +341,7 @@ __sinit_$$3PerformanceController_cpp: /* 8017A9D8 00176818 4B F6 2A 08 */ b __ct__Q34nw4r3g3d8LightObjFv .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3PerformanceController_cpp + .4byte __sinit_$$3PerformanceController_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_DRAW_FRAME_INTERVAL_TABLE__35$$2unnamed$$2PerformanceController_cpp$$2 diff --git a/asm/src/PermEffect.s b/asm/src/PermEffect.s index b4741dc9..85472a68 100644 --- a/asm/src/PermEffect.s +++ b/asm/src/PermEffect.s @@ -348,9 +348,9 @@ onStopPowerfulFinished__Q43scn4step4core10PermEffectFRCQ25ostop5Actor: __vt__Q43scn4step4core10PermEffect: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4core10PermEffectFv - .byte4 onStopNormalStarted__Q43scn4step4core10PermEffectFRCQ25ostop5Actor - .byte4 onStopNormalFinished__Q43scn4step4core10PermEffectFRCQ25ostop5Actor - .byte4 onStopPowerfulStarted__Q43scn4step4core10PermEffectFRCQ25ostop5Actor - .byte4 onStopPowerfulFinished__Q43scn4step4core10PermEffectFRCQ25ostop5Actor + .4byte __dt__Q43scn4step4core10PermEffectFv + .4byte onStopNormalStarted__Q43scn4step4core10PermEffectFRCQ25ostop5Actor + .4byte onStopNormalFinished__Q43scn4step4core10PermEffectFRCQ25ostop5Actor + .4byte onStopPowerfulStarted__Q43scn4step4core10PermEffectFRCQ25ostop5Actor + .4byte onStopPowerfulFinished__Q43scn4step4core10PermEffectFRCQ25ostop5Actor .4byte 0 diff --git a/asm/src/PlayerWindow.s b/asm/src/PlayerWindow.s index b7d2838b..0b079623 100644 --- a/asm/src/PlayerWindow.s +++ b/asm/src/PlayerWindow.s @@ -311,9 +311,9 @@ $$251657: .asciz "One_FourPersons" .global t_getTextLabel__Q43scn9grandmenu4menu26$$2unnamed$$2PlayerWindow_cpp$$2 t_getTextLabel__Q43scn9grandmenu4menu26$$2unnamed$$2PlayerWindow_cpp$$2: - .byte4 $$251655 - .byte4 $$251656 - .byte4 $$251657 + .4byte $$251655 + .4byte $$251656 + .4byte $$251657 .global $$252109 $$252109: .asciz "grandmenu/Main" diff --git a/asm/src/Point2.s b/asm/src/Point2.s index c80b0279..da5e4456 100644 --- a/asm/src/Point2.s +++ b/asm/src/Point2.s @@ -9,7 +9,7 @@ __sinit_$$3Point2_cpp: /* 8019EC78 0019AAB8 48 00 07 30 */ b set__Q33hel4math7Vector2Fff .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3Point2_cpp + .4byte __sinit_$$3Point2_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249826 diff --git a/asm/src/Product.s b/asm/src/Product.s index f59ab375..4ba7c7d2 100644 --- a/asm/src/Product.s +++ b/asm/src/Product.s @@ -381,7 +381,7 @@ __sinit_$$3Product_cpp: /* 8021A3F0 00216230 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3Product_cpp + .4byte __sinit_$$3Product_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$249032 diff --git a/asm/src/ProgressCtrl.s b/asm/src/ProgressCtrl.s index dad399fa..a4b166f7 100644 --- a/asm/src/ProgressCtrl.s +++ b/asm/src/ProgressCtrl.s @@ -329,14 +329,14 @@ __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateLoseFly$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateLoseFly$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateLoseFly$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateLoseFly$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateLoseFly$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateWinFly$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateWinFly$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateWinFly$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateWinFly$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateWinFly$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateWinFly$$4PQ43scn4step4boss4Boss$$1Fv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254746 diff --git a/asm/src/PtclEffectMemManager.s b/asm/src/PtclEffectMemManager.s index 662863dc..b00b883d 100644 --- a/asm/src/PtclEffectMemManager.s +++ b/asm/src/PtclEffectMemManager.s @@ -1165,50 +1165,50 @@ AssignObjectID__Q34nw4r2ef35MemoryManagerTmp$$0Q34nw4r2ef6Effect$$1FPv: __vt__Q34nw4r2ef13MemoryManager: .4byte 0 .4byte 0 - .byte4 __dt__Q34nw4r2ef13MemoryManagerFv - .byte4 GarbageCollection__Q34nw4r2ef13MemoryManagerFv - .byte4 AllocEffect__Q34nw4r2ef13MemoryManagerFv - .byte4 FreeEffect__Q34nw4r2ef13MemoryManagerFPv - .byte4 GetNumAllocEffect__Q34nw4r2ef13MemoryManagerCFv - .byte4 GetNumActiveEffect__Q34nw4r2ef13MemoryManagerCFv - .byte4 GetNumFreeEffect__Q34nw4r2ef13MemoryManagerCFv - .byte4 AllocEmitter__Q34nw4r2ef13MemoryManagerFv - .byte4 FreeEmitter__Q34nw4r2ef13MemoryManagerFPv - .byte4 GetNumAllocEmitter__Q34nw4r2ef13MemoryManagerCFv - .byte4 GetNumActiveEmitter__Q34nw4r2ef13MemoryManagerCFv - .byte4 GetNumFreeEmitter__Q34nw4r2ef13MemoryManagerCFv - .byte4 AllocParticleManager__Q34nw4r2ef13MemoryManagerFv - .byte4 FreeParticleManager__Q34nw4r2ef13MemoryManagerFPv - .byte4 GetNumAllocParticleManager__Q34nw4r2ef13MemoryManagerCFv - .byte4 GetNumActiveParticleManager__Q34nw4r2ef13MemoryManagerCFv - .byte4 GetNumFreeParticleManager__Q34nw4r2ef13MemoryManagerCFv - .byte4 AllocParticle__Q34nw4r2ef13MemoryManagerFv - .byte4 FreeParticle__Q34nw4r2ef13MemoryManagerFPv - .byte4 GetNumAllocParticle__Q34nw4r2ef13MemoryManagerCFv - .byte4 GetNumActiveParticle__Q34nw4r2ef13MemoryManagerCFv - .byte4 GetNumFreeParticle__Q34nw4r2ef13MemoryManagerCFv - .byte4 AllocHeap__Q34nw4r2ef13MemoryManagerFUl - .byte4 FreeHeap__Q34nw4r2ef13MemoryManagerFPv + .4byte __dt__Q34nw4r2ef13MemoryManagerFv + .4byte GarbageCollection__Q34nw4r2ef13MemoryManagerFv + .4byte AllocEffect__Q34nw4r2ef13MemoryManagerFv + .4byte FreeEffect__Q34nw4r2ef13MemoryManagerFPv + .4byte GetNumAllocEffect__Q34nw4r2ef13MemoryManagerCFv + .4byte GetNumActiveEffect__Q34nw4r2ef13MemoryManagerCFv + .4byte GetNumFreeEffect__Q34nw4r2ef13MemoryManagerCFv + .4byte AllocEmitter__Q34nw4r2ef13MemoryManagerFv + .4byte FreeEmitter__Q34nw4r2ef13MemoryManagerFPv + .4byte GetNumAllocEmitter__Q34nw4r2ef13MemoryManagerCFv + .4byte GetNumActiveEmitter__Q34nw4r2ef13MemoryManagerCFv + .4byte GetNumFreeEmitter__Q34nw4r2ef13MemoryManagerCFv + .4byte AllocParticleManager__Q34nw4r2ef13MemoryManagerFv + .4byte FreeParticleManager__Q34nw4r2ef13MemoryManagerFPv + .4byte GetNumAllocParticleManager__Q34nw4r2ef13MemoryManagerCFv + .4byte GetNumActiveParticleManager__Q34nw4r2ef13MemoryManagerCFv + .4byte GetNumFreeParticleManager__Q34nw4r2ef13MemoryManagerCFv + .4byte AllocParticle__Q34nw4r2ef13MemoryManagerFv + .4byte FreeParticle__Q34nw4r2ef13MemoryManagerFPv + .4byte GetNumAllocParticle__Q34nw4r2ef13MemoryManagerCFv + .4byte GetNumActiveParticle__Q34nw4r2ef13MemoryManagerCFv + .4byte GetNumFreeParticle__Q34nw4r2ef13MemoryManagerCFv + .4byte AllocHeap__Q34nw4r2ef13MemoryManagerFUl + .4byte FreeHeap__Q34nw4r2ef13MemoryManagerFPv .global __vt__Q34nw4r2ef37MemoryManagerTmp$$0Q34nw4r2ef8Particle$$1 __vt__Q34nw4r2ef37MemoryManagerTmp$$0Q34nw4r2ef8Particle$$1: .4byte 0 .4byte 0 - .byte4 AssignObjectID__Q34nw4r2ef37MemoryManagerTmp$$0Q34nw4r2ef8Particle$$1FPv + .4byte AssignObjectID__Q34nw4r2ef37MemoryManagerTmp$$0Q34nw4r2ef8Particle$$1FPv .global __vt__Q34nw4r2ef45MemoryManagerTmp$$0Q34nw4r2ef15ParticleManager$$1 __vt__Q34nw4r2ef45MemoryManagerTmp$$0Q34nw4r2ef15ParticleManager$$1: .4byte 0 .4byte 0 - .byte4 AssignObjectID__Q34nw4r2ef45MemoryManagerTmp$$0Q34nw4r2ef15ParticleManager$$1FPv + .4byte AssignObjectID__Q34nw4r2ef45MemoryManagerTmp$$0Q34nw4r2ef15ParticleManager$$1FPv .global __vt__Q34nw4r2ef36MemoryManagerTmp$$0Q34nw4r2ef7Emitter$$1 __vt__Q34nw4r2ef36MemoryManagerTmp$$0Q34nw4r2ef7Emitter$$1: .4byte 0 .4byte 0 - .byte4 AssignObjectID__Q34nw4r2ef36MemoryManagerTmp$$0Q34nw4r2ef7Emitter$$1FPv + .4byte AssignObjectID__Q34nw4r2ef36MemoryManagerTmp$$0Q34nw4r2ef7Emitter$$1FPv .global __vt__Q34nw4r2ef35MemoryManagerTmp$$0Q34nw4r2ef6Effect$$1 __vt__Q34nw4r2ef35MemoryManagerTmp$$0Q34nw4r2ef6Effect$$1: .4byte 0 .4byte 0 - .byte4 AssignObjectID__Q34nw4r2ef35MemoryManagerTmp$$0Q34nw4r2ef6Effect$$1FPv + .4byte AssignObjectID__Q34nw4r2ef35MemoryManagerTmp$$0Q34nw4r2ef6Effect$$1FPv .global $$2STRING$$2__ct__Q34nw4r2ef13MemoryManagerFPvUliiii$$22 $$2STRING$$2__ct__Q34nw4r2ef13MemoryManagerFPvUliiii$$22: .asciz "NW4R:Failed assertion mHeapStartAddr < mHeapEndAddr && reinterpret_cast(mHeapEndAddr) - reinterpret_cast(mHeapStartAddr) > headerSize" diff --git a/asm/src/ReceiverBase.s b/asm/src/ReceiverBase.s index 0ecb9f41..155efb7a 100644 --- a/asm/src/ReceiverBase.s +++ b/asm/src/ReceiverBase.s @@ -261,22 +261,22 @@ handle__Q34util42ObjRefHandle$$0Q43scn4step6vacuum9IReceiver$$15OwnerFv: __vt__Q43scn4step6vacuum12ReceiverBase: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step6vacuum12ReceiverBaseFv + .4byte __dt__Q43scn4step6vacuum12ReceiverBaseFv .4byte 0 .4byte 0 .4byte 0 - .byte4 reqReleaseEnf__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 setConstraintWeapon__Q43scn4step6vacuum12ReceiverBaseFQ24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1UlUl - .byte4 chkDrainAbility__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 onAttackerEndVacuum__Q43scn4step6vacuum12ReceiverBaseFRQ43scn4step6vacuum8Attacker - .byte4 isMighty__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 mightyFrame__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 setMighty__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl - .byte4 setCure__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl - .byte4 deadWithAttacker__Q43scn4step6vacuum12ReceiverBaseFQ43scn4step4hero10DeadFactorRCQ33hel4math7Vector2 - .byte4 isMainPlayer__Q43scn4step6vacuum12ReceiverBaseCFv - .byte4 drawDebug__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 handle__Q43scn4step6vacuum12ReceiverBaseFv + .4byte reqReleaseEnf__Q43scn4step6vacuum12ReceiverBaseFv + .4byte setConstraintWeapon__Q43scn4step6vacuum12ReceiverBaseFQ24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1UlUl + .4byte chkDrainAbility__Q43scn4step6vacuum12ReceiverBaseFv + .4byte onAttackerEndVacuum__Q43scn4step6vacuum12ReceiverBaseFRQ43scn4step6vacuum8Attacker + .4byte isMighty__Q43scn4step6vacuum12ReceiverBaseFv + .4byte mightyFrame__Q43scn4step6vacuum12ReceiverBaseFv + .4byte setMighty__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl + .4byte setCure__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl + .4byte deadWithAttacker__Q43scn4step6vacuum12ReceiverBaseFQ43scn4step4hero10DeadFactorRCQ33hel4math7Vector2 + .4byte isMainPlayer__Q43scn4step6vacuum12ReceiverBaseCFv + .4byte drawDebug__Q43scn4step6vacuum12ReceiverBaseFv + .4byte handle__Q43scn4step6vacuum12ReceiverBaseFv .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: .asciz "NW4R:Pointer must not be NULL (p)" diff --git a/asm/src/Regset.s b/asm/src/Regset.s index 5709d773..011a4fc1 100644 --- a/asm/src/Regset.s +++ b/asm/src/Regset.s @@ -2374,12 +2374,12 @@ $$251264: __vt__Q26mintvm6Regset: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm6RegsetFv + .4byte __dt__Q26mintvm6RegsetFv .global __vt__Q26mintvm8RNObject __vt__Q26mintvm8RNObject: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm8RNObjectFv + .4byte __dt__Q26mintvm8RNObjectFv .4byte 0 .asciz "index = %d, count = %d\n" .asciz "MArray.hpp" diff --git a/asm/src/ResidentFile.s b/asm/src/ResidentFile.s index aa0247b8..1855c953 100644 --- a/asm/src/ResidentFile.s +++ b/asm/src/ResidentFile.s @@ -260,5 +260,5 @@ $$252478: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_FILE_TABLE__Q23app26$$2unnamed$$2ResidentFile_cpp$$2 T_FILE_TABLE__Q23app26$$2unnamed$$2ResidentFile_cpp$$2: - .byte4 $$251961 + .4byte $$251961 .4byte 0 diff --git a/asm/src/ResourceFileName.s b/asm/src/ResourceFileName.s index 5437d0de..30cb35fe 100644 --- a/asm/src/ResourceFileName.s +++ b/asm/src/ResourceFileName.s @@ -68,29 +68,29 @@ $$248736: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global LAYOUT_ENG_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2 LAYOUT_ENG_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: - .byte4 $$248726 + .4byte $$248726 .global LAYOUT_FRA_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2 LAYOUT_FRA_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: - .byte4 $$248728 + .4byte $$248728 .global LAYOUT_SPA_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2 LAYOUT_SPA_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: - .byte4 $$248729 + .4byte $$248729 .global MESSAGE_NORMAL_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2 MESSAGE_NORMAL_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: - .byte4 $$248732 + .4byte $$248732 .global MESSAGE_WARNING_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2 MESSAGE_WARNING_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: - .byte4 $$248733 + .4byte $$248733 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global CONFIG_FILENAME__Q23hbm16ResourceFileName CONFIG_FILENAME__Q23hbm16ResourceFileName: - .byte4 $$248734 + .4byte $$248734 .global SPEAKER_SE_FILENAME__Q23hbm16ResourceFileName SPEAKER_SE_FILENAME__Q23hbm16ResourceFileName: - .byte4 $$248735 + .4byte $$248735 .global SE_FILENAME__Q23hbm16ResourceFileName SE_FILENAME__Q23hbm16ResourceFileName: - .byte4 $$248736 + .4byte $$248736 .4byte 0 diff --git a/asm/src/Result.s b/asm/src/Result.s index c3220f0b..07b116e6 100644 --- a/asm/src/Result.s +++ b/asm/src/Result.s @@ -2902,15 +2902,15 @@ $$253571: .asciz "ResultBonusCoinComplete" .global T_BONUS_MESSAGE_LABEL__Q63scn4step4info9challenge12masterresult20$$2unnamed$$2Result_cpp$$2 T_BONUS_MESSAGE_LABEL__Q63scn4step4info9challenge12masterresult20$$2unnamed$$2Result_cpp$$2: - .byte4 $$253563 - .byte4 $$253564 - .byte4 $$253565 - .byte4 $$253566 - .byte4 $$253567 - .byte4 $$253568 - .byte4 $$253569 - .byte4 $$253570 - .byte4 $$253571 + .4byte $$253563 + .4byte $$253564 + .4byte $$253565 + .4byte $$253566 + .4byte $$253567 + .4byte $$253568 + .4byte $$253569 + .4byte $$253570 + .4byte $$253571 .global $$257484 $$257484: .asciz "masterresult/Main" diff --git a/asm/src/ResultLyt.s b/asm/src/ResultLyt.s index b0993961..3bf9adb0 100644 --- a/asm/src/ResultLyt.s +++ b/asm/src/ResultLyt.s @@ -2950,15 +2950,15 @@ $$253958: .asciz "ResultBonusCoinComplete" .global T_BONUS_MESSAGE_LABEL__23$$2unnamed$$2ResultLyt_cpp$$2 T_BONUS_MESSAGE_LABEL__23$$2unnamed$$2ResultLyt_cpp$$2: - .byte4 $$253950 - .byte4 $$253951 - .byte4 $$253952 - .byte4 $$253953 - .byte4 $$253954 - .byte4 $$253955 - .byte4 $$253956 - .byte4 $$253957 - .byte4 $$253958 + .4byte $$253950 + .4byte $$253951 + .4byte $$253952 + .4byte $$253953 + .4byte $$253954 + .4byte $$253955 + .4byte $$253956 + .4byte $$253957 + .4byte $$253958 .global $$258204 $$258204: .asciz "challengeresult/Main" diff --git a/asm/src/Rumble.s b/asm/src/Rumble.s index f0d4486f..bc11460f 100644 --- a/asm/src/Rumble.s +++ b/asm/src/Rumble.s @@ -106,15 +106,15 @@ $$252003: __vt__Q33scn19challengefileselect6Rumble: .4byte 0 .4byte 0 - .byte4 __dt__Q33scn19challengefileselect6RumbleFv - .byte4 updateFrame__Q33scn19challengefileselect6RumbleFv - .byte4 appear__Q33scn19challengefileselect6RumbleFv - .byte4 focus__Q33scn19challengefileselect6RumbleFv - .byte4 unfocus__Q33scn19challengefileselect6RumbleFv - .byte4 decide__Q33scn19challengefileselect6RumbleFv - .byte4 isAnimEnd__Q33scn19challengefileselect6RumbleCFv - .byte4 kind__Q33scn19challengefileselect6RumbleCFv - .byte4 cursorPane__Q33scn19challengefileselect6RumbleFv + .4byte __dt__Q33scn19challengefileselect6RumbleFv + .4byte updateFrame__Q33scn19challengefileselect6RumbleFv + .4byte appear__Q33scn19challengefileselect6RumbleFv + .4byte focus__Q33scn19challengefileselect6RumbleFv + .4byte unfocus__Q33scn19challengefileselect6RumbleFv + .4byte decide__Q33scn19challengefileselect6RumbleFv + .4byte isAnimEnd__Q33scn19challengefileselect6RumbleCFv + .4byte kind__Q33scn19challengefileselect6RumbleCFv + .4byte cursorPane__Q33scn19challengefileselect6RumbleFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/RumbleResource.s b/asm/src/RumbleResource.s index db2d6f52..57b1ce2b 100644 --- a/asm/src/RumbleResource.s +++ b/asm/src/RumbleResource.s @@ -86,5 +86,5 @@ $$248752: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_DAT_PATH_TABLE__Q23hid28$$2unnamed$$2RumbleResource_cpp$$2 T_DAT_PATH_TABLE__Q23hid28$$2unnamed$$2RumbleResource_cpp$$2: - .byte4 $$248751 - .byte4 $$248752 + .4byte $$248751 + .4byte $$248752 diff --git a/asm/src/Runner.s b/asm/src/Runner.s index 05d1db4d..b5f0bd28 100644 --- a/asm/src/Runner.s +++ b/asm/src/Runner.s @@ -1885,7 +1885,7 @@ $$253157: __vt__Q26mintvm6Runner: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm6RunnerFv + .4byte __dt__Q26mintvm6RunnerFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SDKAllocator.s b/asm/src/SDKAllocator.s index 8c971cb8..f31af6af 100644 --- a/asm/src/SDKAllocator.s +++ b/asm/src/SDKAllocator.s @@ -32,5 +32,5 @@ Free__Q23mem12SDKAllocatorFP12MEMAllocatorPv: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global AllocatorFunc__Q23mem12SDKAllocator AllocatorFunc__Q23mem12SDKAllocator: - .byte4 Alloc__Q23mem12SDKAllocatorFP12MEMAllocatorUl - .byte4 Free__Q23mem12SDKAllocatorFP12MEMAllocatorPv + .4byte Alloc__Q23mem12SDKAllocatorFP12MEMAllocatorUl + .4byte Free__Q23mem12SDKAllocatorFP12MEMAllocatorPv diff --git a/asm/src/SceneAnime.s b/asm/src/SceneAnime.s index 577d2db9..40e6e356 100644 --- a/asm/src/SceneAnime.s +++ b/asm/src/SceneAnime.s @@ -482,19 +482,19 @@ $$252939: __vt__Q33scn5anime10SceneAnime: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q33scn5anime10SceneAnimeCFv - .byte4 __dt__Q33scn5anime10SceneAnimeFv - .byte4 updateMain__Q33scn5anime10SceneAnimeFv - .byte4 updateUseGPU__Q33scn5anime10SceneAnimeFv - .byte4 updateDebug__Q33scn5anime10SceneAnimeFv - .byte4 draw__Q33scn5anime10SceneAnimeFRCQ23scn11DrawReqInfo - .byte4 isSceneEnd__Q33scn5anime10SceneAnimeCFv + .4byte GetRuntimeTypeInfo__Q33scn5anime10SceneAnimeCFv + .4byte __dt__Q33scn5anime10SceneAnimeFv + .4byte updateMain__Q33scn5anime10SceneAnimeFv + .4byte updateUseGPU__Q33scn5anime10SceneAnimeFv + .4byte updateDebug__Q33scn5anime10SceneAnimeFv + .4byte draw__Q33scn5anime10SceneAnimeFRCQ23scn11DrawReqInfo + .4byte isSceneEnd__Q33scn5anime10SceneAnimeCFv .global __vt__Q23scn6IScene __vt__Q23scn6IScene: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q23scn6ISceneCFv - .byte4 __dt__Q23scn6ISceneFv + .4byte GetRuntimeTypeInfo__Q23scn6ISceneCFv + .4byte __dt__Q23scn6ISceneFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneChallengeFileSelect.s b/asm/src/SceneChallengeFileSelect.s index f0e57381..380a094b 100644 --- a/asm/src/SceneChallengeFileSelect.s +++ b/asm/src/SceneChallengeFileSelect.s @@ -5191,67 +5191,67 @@ $$265584: $$265585: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setColor__Q23sfx4FadeFRC8_GXColor + .4byte setColor__Q23sfx4FadeFRC8_GXColor .global $$265586 $$265586: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setFadeOut__Q23sfx4FadeFUl + .4byte setFadeOut__Q23sfx4FadeFUl .global $$265587 $$265587: .4byte 0 .4byte 0xFFFFFFFF - .byte4 update__Q23sfx4FadeFv + .4byte update__Q23sfx4FadeFv .global $$265588 $$265588: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isEnd__Q23sfx4FadeCFv + .4byte isEnd__Q23sfx4FadeCFv .global $$265589 $$265589: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isBackEnd__Q33scn19challengefileselect5FrameCFv + .4byte isBackEnd__Q33scn19challengefileselect5FrameCFv .global $$265590 $$265590: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setColor__Q23sfx4FadeFRC8_GXColor + .4byte setColor__Q23sfx4FadeFRC8_GXColor .global $$265591 $$265591: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setFadeOut__Q23sfx4FadeFUl + .4byte setFadeOut__Q23sfx4FadeFUl .global $$265592 $$265592: .4byte 0 .4byte 0xFFFFFFFF - .byte4 update__Q23sfx4FadeFv + .4byte update__Q23sfx4FadeFv .global $$265593 $$265593: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isEnd__Q23sfx4FadeCFv + .4byte isEnd__Q23sfx4FadeCFv .global $$265594 $$265594: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setColor__Q23sfx4FadeFRC8_GXColor + .4byte setColor__Q23sfx4FadeFRC8_GXColor .global $$265595 $$265595: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setFadeOut__Q23sfx4FadeFUl + .4byte setFadeOut__Q23sfx4FadeFUl .global $$265596 $$265596: .4byte 0 .4byte 0xFFFFFFFF - .byte4 update__Q23sfx4FadeFv + .4byte update__Q23sfx4FadeFv .global $$265597 $$265597: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isEnd__Q23sfx4FadeCFv + .4byte isEnd__Q23sfx4FadeCFv .global $$265598 $$265598: .4byte 0 @@ -5261,17 +5261,17 @@ $$265598: $$265599: .4byte 0 .4byte 0xFFFFFFFF - .byte4 close__Q33scn19challengefileselect13DeleteConfirmFv + .4byte close__Q33scn19challengefileselect13DeleteConfirmFv .global $$265600 $$265600: .4byte 0 .4byte 0xFFFFFFFF - .byte4 closed__Q33scn19challengefileselect13DeleteConfirmCFv + .4byte closed__Q33scn19challengefileselect13DeleteConfirmCFv .global $$265601 $$265601: .4byte 0 .4byte 0xFFFFFFFF - .byte4 show__Q23lyt12PaneAccessorCFv + .4byte show__Q23lyt12PaneAccessorCFv .global $$265920 $$265920: .asciz "StepLevelMapCommon.dn" @@ -5319,71 +5319,71 @@ $$265930: __vt__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$$1: .4byte 0 .4byte 0 - .byte4 __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 - .byte4 clone__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$$1CFv - .byte4 clone__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$$1CFPv - .byte4 __cl__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 + .4byte __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 + .4byte clone__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$$1CFv + .4byte clone__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$$1CFPv + .4byte __cl__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 .global __vt__Q43std3tr16detail315function_imp$$0PFv_v$$4Q43std3tr16detail271bound_func$$0v$$4Q43std3tr16detail35mem_fn_1$$0v$$4Q23sfx4Fade$$4RC8_GXColor$$1$$4Q33std3tr1189tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33hel6common5Color$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail315function_imp$$0PFv_v$$4Q43std3tr16detail271bound_func$$0v$$4Q43std3tr16detail35mem_fn_1$$0v$$4Q23sfx4Fade$$4RC8_GXColor$$1$$4Q33std3tr1189tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33hel6common5Color$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail315function_imp$$0PFv_v$$4Q43std3tr16detail271bound_func$$0v$$4Q43std3tr16detail35mem_fn_1$$0v$$4Q23sfx4Fade$$4RC8_GXColor$$1$$4Q33std3tr1189tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33hel6common5Color$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv - .byte4 clone__Q43std3tr16detail315function_imp$$0PFv_v$$4Q43std3tr16detail271bound_func$$0v$$4Q43std3tr16detail35mem_fn_1$$0v$$4Q23sfx4Fade$$4RC8_GXColor$$1$$4Q33std3tr1189tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33hel6common5Color$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv - .byte4 clone__Q43std3tr16detail315function_imp$$0PFv_v$$4Q43std3tr16detail271bound_func$$0v$$4Q43std3tr16detail35mem_fn_1$$0v$$4Q23sfx4Fade$$4RC8_GXColor$$1$$4Q33std3tr1189tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33hel6common5Color$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv - .byte4 __cl__Q43std3tr16detail315function_imp$$0PFv_v$$4Q43std3tr16detail271bound_func$$0v$$4Q43std3tr16detail35mem_fn_1$$0v$$4Q23sfx4Fade$$4RC8_GXColor$$1$$4Q33std3tr1189tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33hel6common5Color$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte __dt__Q43std3tr16detail315function_imp$$0PFv_v$$4Q43std3tr16detail271bound_func$$0v$$4Q43std3tr16detail35mem_fn_1$$0v$$4Q23sfx4Fade$$4RC8_GXColor$$1$$4Q33std3tr1189tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33hel6common5Color$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte clone__Q43std3tr16detail315function_imp$$0PFv_v$$4Q43std3tr16detail271bound_func$$0v$$4Q43std3tr16detail35mem_fn_1$$0v$$4Q23sfx4Fade$$4RC8_GXColor$$1$$4Q33std3tr1189tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33hel6common5Color$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv + .4byte clone__Q43std3tr16detail315function_imp$$0PFv_v$$4Q43std3tr16detail271bound_func$$0v$$4Q43std3tr16detail35mem_fn_1$$0v$$4Q23sfx4Fade$$4RC8_GXColor$$1$$4Q33std3tr1189tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33hel6common5Color$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv + .4byte __cl__Q43std3tr16detail315function_imp$$0PFv_v$$4Q43std3tr16detail271bound_func$$0v$$4Q43std3tr16detail35mem_fn_1$$0v$$4Q23sfx4Fade$$4RC8_GXColor$$1$$4Q33std3tr1189tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33hel6common5Color$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv .global __vt__Q43std3tr16detail289function_imp$$0PFv_v$$4Q43std3tr16detail245bound_func$$0v$$4Q43std3tr16detail26mem_fn_1$$0v$$4Q23sfx4Fade$$4Ul$$1$$4Q33std3tr1172tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail289function_imp$$0PFv_v$$4Q43std3tr16detail245bound_func$$0v$$4Q43std3tr16detail26mem_fn_1$$0v$$4Q23sfx4Fade$$4Ul$$1$$4Q33std3tr1172tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail289function_imp$$0PFv_v$$4Q43std3tr16detail245bound_func$$0v$$4Q43std3tr16detail26mem_fn_1$$0v$$4Q23sfx4Fade$$4Ul$$1$$4Q33std3tr1172tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv - .byte4 clone__Q43std3tr16detail289function_imp$$0PFv_v$$4Q43std3tr16detail245bound_func$$0v$$4Q43std3tr16detail26mem_fn_1$$0v$$4Q23sfx4Fade$$4Ul$$1$$4Q33std3tr1172tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv - .byte4 clone__Q43std3tr16detail289function_imp$$0PFv_v$$4Q43std3tr16detail245bound_func$$0v$$4Q43std3tr16detail26mem_fn_1$$0v$$4Q23sfx4Fade$$4Ul$$1$$4Q33std3tr1172tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv - .byte4 __cl__Q43std3tr16detail289function_imp$$0PFv_v$$4Q43std3tr16detail245bound_func$$0v$$4Q43std3tr16detail26mem_fn_1$$0v$$4Q23sfx4Fade$$4Ul$$1$$4Q33std3tr1172tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte __dt__Q43std3tr16detail289function_imp$$0PFv_v$$4Q43std3tr16detail245bound_func$$0v$$4Q43std3tr16detail26mem_fn_1$$0v$$4Q23sfx4Fade$$4Ul$$1$$4Q33std3tr1172tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte clone__Q43std3tr16detail289function_imp$$0PFv_v$$4Q43std3tr16detail245bound_func$$0v$$4Q43std3tr16detail26mem_fn_1$$0v$$4Q23sfx4Fade$$4Ul$$1$$4Q33std3tr1172tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv + .4byte clone__Q43std3tr16detail289function_imp$$0PFv_v$$4Q43std3tr16detail245bound_func$$0v$$4Q43std3tr16detail26mem_fn_1$$0v$$4Q23sfx4Fade$$4Ul$$1$$4Q33std3tr1172tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv + .4byte __cl__Q43std3tr16detail289function_imp$$0PFv_v$$4Q43std3tr16detail245bound_func$$0v$$4Q43std3tr16detail26mem_fn_1$$0v$$4Q23sfx4Fade$$4Ul$$1$$4Q33std3tr1172tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv .global __vt__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0v$$4Q43std3tr16detail23mem_fn_0$$0v$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0v$$4Q43std3tr16detail23mem_fn_0$$0v$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0v$$4Q43std3tr16detail23mem_fn_0$$0v$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv - .byte4 clone__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0v$$4Q43std3tr16detail23mem_fn_0$$0v$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv - .byte4 clone__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0v$$4Q43std3tr16detail23mem_fn_0$$0v$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv - .byte4 __cl__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0v$$4Q43std3tr16detail23mem_fn_0$$0v$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte __dt__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0v$$4Q43std3tr16detail23mem_fn_0$$0v$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte clone__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0v$$4Q43std3tr16detail23mem_fn_0$$0v$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv + .4byte clone__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0v$$4Q43std3tr16detail23mem_fn_0$$0v$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv + .4byte __cl__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$$0v$$4Q43std3tr16detail23mem_fn_0$$0v$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv .global __vt__Q43std3tr16detail300function_imp$$0PFv_b$$4Q43std3tr16detail256bound_func$$0b$$4Q43std3tr16detail25mem_fn_0_c$$0b$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail300function_imp$$0PFv_b$$4Q43std3tr16detail256bound_func$$0b$$4Q43std3tr16detail25mem_fn_0_c$$0b$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail300function_imp$$0PFv_b$$4Q43std3tr16detail256bound_func$$0b$$4Q43std3tr16detail25mem_fn_0_c$$0b$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv - .byte4 clone__Q43std3tr16detail300function_imp$$0PFv_b$$4Q43std3tr16detail256bound_func$$0b$$4Q43std3tr16detail25mem_fn_0_c$$0b$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv - .byte4 clone__Q43std3tr16detail300function_imp$$0PFv_b$$4Q43std3tr16detail256bound_func$$0b$$4Q43std3tr16detail25mem_fn_0_c$$0b$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv - .byte4 __cl__Q43std3tr16detail300function_imp$$0PFv_b$$4Q43std3tr16detail256bound_func$$0b$$4Q43std3tr16detail25mem_fn_0_c$$0b$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte __dt__Q43std3tr16detail300function_imp$$0PFv_b$$4Q43std3tr16detail256bound_func$$0b$$4Q43std3tr16detail25mem_fn_0_c$$0b$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte clone__Q43std3tr16detail300function_imp$$0PFv_b$$4Q43std3tr16detail256bound_func$$0b$$4Q43std3tr16detail25mem_fn_0_c$$0b$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv + .4byte clone__Q43std3tr16detail300function_imp$$0PFv_b$$4Q43std3tr16detail256bound_func$$0b$$4Q43std3tr16detail25mem_fn_0_c$$0b$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv + .4byte __cl__Q43std3tr16detail300function_imp$$0PFv_b$$4Q43std3tr16detail256bound_func$$0b$$4Q43std3tr16detail25mem_fn_0_c$$0b$$4Q23sfx4Fade$$1$$4Q33std3tr1184tuple$$0Q33std3tr130reference_wrapper$$0Q23sfx4Fade$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv .global __vt__Q43std3tr16detail344function_imp$$0PFv_b$$4Q43std3tr16detail300bound_func$$0b$$4Q43std3tr16detail47mem_fn_0_c$$0b$$4Q33scn19challengefileselect5Frame$$1$$4Q33std3tr1206tuple$$0Q33std3tr152reference_wrapper$$0Q33scn19challengefileselect5Frame$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1 __vt__Q43std3tr16detail344function_imp$$0PFv_b$$4Q43std3tr16detail300bound_func$$0b$$4Q43std3tr16detail47mem_fn_0_c$$0b$$4Q33scn19challengefileselect5Frame$$1$$4Q33std3tr1206tuple$$0Q33std3tr152reference_wrapper$$0Q33scn19challengefileselect5Frame$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail344function_imp$$0PFv_b$$4Q43std3tr16detail300bound_func$$0b$$4Q43std3tr16detail47mem_fn_0_c$$0b$$4Q33scn19challengefileselect5Frame$$1$$4Q33std3tr1206tuple$$0Q33std3tr152reference_wrapper$$0Q33scn19challengefileselect5Frame$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv - .byte4 clone__Q43std3tr16detail344function_imp$$0PFv_b$$4Q43std3tr16detail300bound_func$$0b$$4Q43std3tr16detail47mem_fn_0_c$$0b$$4Q33scn19challengefileselect5Frame$$1$$4Q33std3tr1206tuple$$0Q33std3tr152reference_wrapper$$0Q33scn19challengefileselect5Frame$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv - .byte4 clone__Q43std3tr16detail344function_imp$$0PFv_b$$4Q43std3tr16detail300bound_func$$0b$$4Q43std3tr16detail47mem_fn_0_c$$0b$$4Q33scn19challengefileselect5Frame$$1$$4Q33std3tr1206tuple$$0Q33std3tr152reference_wrapper$$0Q33scn19challengefileselect5Frame$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv - .byte4 __cl__Q43std3tr16detail344function_imp$$0PFv_b$$4Q43std3tr16detail300bound_func$$0b$$4Q43std3tr16detail47mem_fn_0_c$$0b$$4Q33scn19challengefileselect5Frame$$1$$4Q33std3tr1206tuple$$0Q33std3tr152reference_wrapper$$0Q33scn19challengefileselect5Frame$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte __dt__Q43std3tr16detail344function_imp$$0PFv_b$$4Q43std3tr16detail300bound_func$$0b$$4Q43std3tr16detail47mem_fn_0_c$$0b$$4Q33scn19challengefileselect5Frame$$1$$4Q33std3tr1206tuple$$0Q33std3tr152reference_wrapper$$0Q33scn19challengefileselect5Frame$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte clone__Q43std3tr16detail344function_imp$$0PFv_b$$4Q43std3tr16detail300bound_func$$0b$$4Q43std3tr16detail47mem_fn_0_c$$0b$$4Q33scn19challengefileselect5Frame$$1$$4Q33std3tr1206tuple$$0Q33std3tr152reference_wrapper$$0Q33scn19challengefileselect5Frame$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv + .4byte clone__Q43std3tr16detail344function_imp$$0PFv_b$$4Q43std3tr16detail300bound_func$$0b$$4Q43std3tr16detail47mem_fn_0_c$$0b$$4Q33scn19challengefileselect5Frame$$1$$4Q33std3tr1206tuple$$0Q33std3tr152reference_wrapper$$0Q33scn19challengefileselect5Frame$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv + .4byte __cl__Q43std3tr16detail344function_imp$$0PFv_b$$4Q43std3tr16detail300bound_func$$0b$$4Q43std3tr16detail47mem_fn_0_c$$0b$$4Q33scn19challengefileselect5Frame$$1$$4Q33std3tr1206tuple$$0Q33std3tr152reference_wrapper$$0Q33scn19challengefileselect5Frame$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv .global __vt__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$$1 __vt__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$$1: .4byte 0 .4byte 0 - .byte4 __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 - .byte4 clone__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$$1CFv - .byte4 clone__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$$1CFPv - .byte4 __cl__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 + .4byte __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 + .4byte clone__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$$1CFv + .4byte clone__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$$1CFPv + .4byte __cl__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 .global __vt__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$$1 __vt__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$$1: .4byte 0 .4byte 0 - .byte4 __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 - .byte4 clone__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$$1CFv - .byte4 clone__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$$1CFPv - .byte4 __cl__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 + .4byte __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 + .4byte clone__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$$1CFv + .4byte clone__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$$1CFPv + .4byte __cl__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 .global __vt__Q43std3tr16detail20function_base$$0PFv_b$$1 __vt__Q43std3tr16detail20function_base$$0PFv_b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail20function_base$$0PFv_b$$1Fv + .4byte __dt__Q43std3tr16detail20function_base$$0PFv_b$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -5391,15 +5391,15 @@ __vt__Q43std3tr16detail20function_base$$0PFv_b$$1: __vt__Q43std3tr16detail287function_imp$$0PFv_v$$4Q43std3tr16detail243bound_func$$0v$$4Q43std3tr16detail34mem_fn_0_c$$0v$$4Q23lyt12PaneAccessor$$1$$4Q33std3tr1162tuple$$0Q23lyt12PaneAccessor$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail287function_imp$$0PFv_v$$4Q43std3tr16detail243bound_func$$0v$$4Q43std3tr16detail34mem_fn_0_c$$0v$$4Q23lyt12PaneAccessor$$1$$4Q33std3tr1162tuple$$0Q23lyt12PaneAccessor$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv - .byte4 clone__Q43std3tr16detail287function_imp$$0PFv_v$$4Q43std3tr16detail243bound_func$$0v$$4Q43std3tr16detail34mem_fn_0_c$$0v$$4Q23lyt12PaneAccessor$$1$$4Q33std3tr1162tuple$$0Q23lyt12PaneAccessor$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv - .byte4 clone__Q43std3tr16detail287function_imp$$0PFv_v$$4Q43std3tr16detail243bound_func$$0v$$4Q43std3tr16detail34mem_fn_0_c$$0v$$4Q23lyt12PaneAccessor$$1$$4Q33std3tr1162tuple$$0Q23lyt12PaneAccessor$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv - .byte4 __cl__Q43std3tr16detail287function_imp$$0PFv_v$$4Q43std3tr16detail243bound_func$$0v$$4Q43std3tr16detail34mem_fn_0_c$$0v$$4Q23lyt12PaneAccessor$$1$$4Q33std3tr1162tuple$$0Q23lyt12PaneAccessor$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte __dt__Q43std3tr16detail287function_imp$$0PFv_v$$4Q43std3tr16detail243bound_func$$0v$$4Q43std3tr16detail34mem_fn_0_c$$0v$$4Q23lyt12PaneAccessor$$1$$4Q33std3tr1162tuple$$0Q23lyt12PaneAccessor$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv + .4byte clone__Q43std3tr16detail287function_imp$$0PFv_v$$4Q43std3tr16detail243bound_func$$0v$$4Q43std3tr16detail34mem_fn_0_c$$0v$$4Q23lyt12PaneAccessor$$1$$4Q33std3tr1162tuple$$0Q23lyt12PaneAccessor$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFv + .4byte clone__Q43std3tr16detail287function_imp$$0PFv_v$$4Q43std3tr16detail243bound_func$$0v$$4Q43std3tr16detail34mem_fn_0_c$$0v$$4Q23lyt12PaneAccessor$$1$$4Q33std3tr1162tuple$$0Q23lyt12PaneAccessor$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1CFPv + .4byte __cl__Q43std3tr16detail287function_imp$$0PFv_v$$4Q43std3tr16detail243bound_func$$0v$$4Q43std3tr16detail34mem_fn_0_c$$0v$$4Q23lyt12PaneAccessor$$1$$4Q33std3tr1162tuple$$0Q23lyt12PaneAccessor$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv .global __vt__Q43std3tr16detail20function_base$$0PFv_v$$1 __vt__Q43std3tr16detail20function_base$$0PFv_v$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail20function_base$$0PFv_v$$1Fv + .4byte __dt__Q43std3tr16detail20function_base$$0PFv_v$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -5407,13 +5407,13 @@ __vt__Q43std3tr16detail20function_base$$0PFv_v$$1: __vt__Q33scn19challengefileselect24SceneChallengeFileSelect: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q33scn19challengefileselect24SceneChallengeFileSelectCFv - .byte4 __dt__Q33scn19challengefileselect24SceneChallengeFileSelectFv - .byte4 updateMain__Q33scn19challengefileselect24SceneChallengeFileSelectFv - .byte4 updateUseGPU__Q33scn19challengefileselect24SceneChallengeFileSelectFv - .byte4 updateDebug__Q33scn19challengefileselect24SceneChallengeFileSelectFv - .byte4 draw__Q33scn19challengefileselect24SceneChallengeFileSelectFRCQ23scn11DrawReqInfo - .byte4 isSceneEnd__Q33scn19challengefileselect24SceneChallengeFileSelectCFv + .4byte GetRuntimeTypeInfo__Q33scn19challengefileselect24SceneChallengeFileSelectCFv + .4byte __dt__Q33scn19challengefileselect24SceneChallengeFileSelectFv + .4byte updateMain__Q33scn19challengefileselect24SceneChallengeFileSelectFv + .4byte updateUseGPU__Q33scn19challengefileselect24SceneChallengeFileSelectFv + .4byte updateDebug__Q33scn19challengefileselect24SceneChallengeFileSelectFv + .4byte draw__Q33scn19challengefileselect24SceneChallengeFileSelectFRCQ23scn11DrawReqInfo + .4byte isSceneEnd__Q33scn19challengefileselect24SceneChallengeFileSelectCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneChallengeResult.s b/asm/src/SceneChallengeResult.s index d857a683..81604f2f 100644 --- a/asm/src/SceneChallengeResult.s +++ b/asm/src/SceneChallengeResult.s @@ -829,13 +829,13 @@ $$254440: __vt__Q33scn15challengeresult20SceneChallengeResult: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q33scn15challengeresult20SceneChallengeResultCFv - .byte4 __dt__Q33scn15challengeresult20SceneChallengeResultFv - .byte4 updateMain__Q33scn15challengeresult20SceneChallengeResultFv - .byte4 updateUseGPU__Q33scn15challengeresult20SceneChallengeResultFv - .byte4 updateDebug__Q33scn15challengeresult20SceneChallengeResultFv - .byte4 draw__Q33scn15challengeresult20SceneChallengeResultFRCQ23scn11DrawReqInfo - .byte4 isSceneEnd__Q33scn15challengeresult20SceneChallengeResultCFv + .4byte GetRuntimeTypeInfo__Q33scn15challengeresult20SceneChallengeResultCFv + .4byte __dt__Q33scn15challengeresult20SceneChallengeResultFv + .4byte updateMain__Q33scn15challengeresult20SceneChallengeResultFv + .4byte updateUseGPU__Q33scn15challengeresult20SceneChallengeResultFv + .4byte updateDebug__Q33scn15challengeresult20SceneChallengeResultFv + .4byte draw__Q33scn15challengeresult20SceneChallengeResultFRCQ23scn11DrawReqInfo + .4byte isSceneEnd__Q33scn15challengeresult20SceneChallengeResultCFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254439 diff --git a/asm/src/SceneChallengeTitle.s b/asm/src/SceneChallengeTitle.s index 3a8fe270..c1fc6323 100644 --- a/asm/src/SceneChallengeTitle.s +++ b/asm/src/SceneChallengeTitle.s @@ -492,13 +492,13 @@ $$252720: __vt__Q33scn14challengetitle19SceneChallengeTitle: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q33scn14challengetitle19SceneChallengeTitleCFv - .byte4 __dt__Q33scn14challengetitle19SceneChallengeTitleFv - .byte4 updateMain__Q33scn14challengetitle19SceneChallengeTitleFv - .byte4 updateUseGPU__Q33scn14challengetitle19SceneChallengeTitleFv - .byte4 updateDebug__Q33scn14challengetitle19SceneChallengeTitleFv - .byte4 draw__Q33scn14challengetitle19SceneChallengeTitleFRCQ23scn11DrawReqInfo - .byte4 isSceneEnd__Q33scn14challengetitle19SceneChallengeTitleCFv + .4byte GetRuntimeTypeInfo__Q33scn14challengetitle19SceneChallengeTitleCFv + .4byte __dt__Q33scn14challengetitle19SceneChallengeTitleFv + .4byte updateMain__Q33scn14challengetitle19SceneChallengeTitleFv + .4byte updateUseGPU__Q33scn14challengetitle19SceneChallengeTitleFv + .4byte updateDebug__Q33scn14challengetitle19SceneChallengeTitleFv + .4byte draw__Q33scn14challengetitle19SceneChallengeTitleFRCQ23scn11DrawReqInfo + .4byte isSceneEnd__Q33scn14challengetitle19SceneChallengeTitleCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneChallengeTutorial.s b/asm/src/SceneChallengeTutorial.s index 384f0464..7bbb868c 100644 --- a/asm/src/SceneChallengeTutorial.s +++ b/asm/src/SceneChallengeTutorial.s @@ -676,13 +676,13 @@ $$253523: __vt__Q33scn17challengetutorial22SceneChallengeTutorial: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q33scn17challengetutorial22SceneChallengeTutorialCFv - .byte4 __dt__Q33scn17challengetutorial22SceneChallengeTutorialFv - .byte4 updateMain__Q33scn17challengetutorial22SceneChallengeTutorialFv - .byte4 updateUseGPU__Q33scn17challengetutorial22SceneChallengeTutorialFv - .byte4 updateDebug__Q33scn17challengetutorial22SceneChallengeTutorialFv - .byte4 draw__Q33scn17challengetutorial22SceneChallengeTutorialFRCQ23scn11DrawReqInfo - .byte4 isSceneEnd__Q33scn17challengetutorial22SceneChallengeTutorialCFv + .4byte GetRuntimeTypeInfo__Q33scn17challengetutorial22SceneChallengeTutorialCFv + .4byte __dt__Q33scn17challengetutorial22SceneChallengeTutorialFv + .4byte updateMain__Q33scn17challengetutorial22SceneChallengeTutorialFv + .4byte updateUseGPU__Q33scn17challengetutorial22SceneChallengeTutorialFv + .4byte updateDebug__Q33scn17challengetutorial22SceneChallengeTutorialFv + .4byte draw__Q33scn17challengetutorial22SceneChallengeTutorialFRCQ23scn11DrawReqInfo + .4byte isSceneEnd__Q33scn17challengetutorial22SceneChallengeTutorialCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneComic.s b/asm/src/SceneComic.s index b2e9f1b9..e77f1b88 100644 --- a/asm/src/SceneComic.s +++ b/asm/src/SceneComic.s @@ -289,9 +289,9 @@ $$251711: .balign 4 .global T_COMIC_DN_TABLE__Q33scn5comic24$$2unnamed$$2SceneComic_cpp$$2 T_COMIC_DN_TABLE__Q33scn5comic24$$2unnamed$$2SceneComic_cpp$$2: - .byte4 $$251709 - .byte4 $$251710 - .byte4 $$251711 + .4byte $$251709 + .4byte $$251710 + .4byte $$251711 .global $$252094 $$252094: .asciz "ComicCommon.dn" @@ -320,13 +320,13 @@ $$252099: __vt__Q33scn5comic10SceneComic: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q33scn5comic10SceneComicCFv - .byte4 __dt__Q33scn5comic10SceneComicFv - .byte4 updateMain__Q33scn5comic10SceneComicFv - .byte4 updateUseGPU__Q33scn5comic10SceneComicFv - .byte4 updateDebug__Q33scn5comic10SceneComicFv - .byte4 draw__Q33scn5comic10SceneComicFRCQ23scn11DrawReqInfo - .byte4 isSceneEnd__Q33scn5comic10SceneComicCFv + .4byte GetRuntimeTypeInfo__Q33scn5comic10SceneComicCFv + .4byte __dt__Q33scn5comic10SceneComicFv + .4byte updateMain__Q33scn5comic10SceneComicFv + .4byte updateUseGPU__Q33scn5comic10SceneComicFv + .4byte updateDebug__Q33scn5comic10SceneComicFv + .4byte draw__Q33scn5comic10SceneComicFRCQ23scn11DrawReqInfo + .4byte isSceneEnd__Q33scn5comic10SceneComicCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneGrandMenu.s b/asm/src/SceneGrandMenu.s index 35d58f2a..14815883 100644 --- a/asm/src/SceneGrandMenu.s +++ b/asm/src/SceneGrandMenu.s @@ -449,13 +449,13 @@ $$249820: __vt__Q33scn9grandmenu14SceneGrandMenu: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q33scn9grandmenu14SceneGrandMenuCFv - .byte4 __dt__Q33scn9grandmenu14SceneGrandMenuFv - .byte4 updateMain__Q33scn9grandmenu14SceneGrandMenuFv - .byte4 updateUseGPU__Q33scn9grandmenu14SceneGrandMenuFv - .byte4 updateDebug__Q33scn9grandmenu14SceneGrandMenuFv - .byte4 draw__Q33scn9grandmenu14SceneGrandMenuFRCQ23scn11DrawReqInfo - .byte4 isSceneEnd__Q33scn9grandmenu14SceneGrandMenuCFv + .4byte GetRuntimeTypeInfo__Q33scn9grandmenu14SceneGrandMenuCFv + .4byte __dt__Q33scn9grandmenu14SceneGrandMenuFv + .4byte updateMain__Q33scn9grandmenu14SceneGrandMenuFv + .4byte updateUseGPU__Q33scn9grandmenu14SceneGrandMenuFv + .4byte updateDebug__Q33scn9grandmenu14SceneGrandMenuFv + .4byte draw__Q33scn9grandmenu14SceneGrandMenuFRCQ23scn11DrawReqInfo + .4byte isSceneEnd__Q33scn9grandmenu14SceneGrandMenuCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneGrandTitle.s b/asm/src/SceneGrandTitle.s index 83ead605..d91596e7 100644 --- a/asm/src/SceneGrandTitle.s +++ b/asm/src/SceneGrandTitle.s @@ -452,13 +452,13 @@ $$252625: __vt__Q33scn10grandtitle15SceneGrandTitle: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q33scn10grandtitle15SceneGrandTitleCFv - .byte4 __dt__Q33scn10grandtitle15SceneGrandTitleFv - .byte4 updateMain__Q33scn10grandtitle15SceneGrandTitleFv - .byte4 updateUseGPU__Q33scn10grandtitle15SceneGrandTitleFv - .byte4 updateDebug__Q33scn10grandtitle15SceneGrandTitleFv - .byte4 draw__Q33scn10grandtitle15SceneGrandTitleFRCQ23scn11DrawReqInfo - .byte4 isSceneEnd__Q33scn10grandtitle15SceneGrandTitleCFv + .4byte GetRuntimeTypeInfo__Q33scn10grandtitle15SceneGrandTitleCFv + .4byte __dt__Q33scn10grandtitle15SceneGrandTitleFv + .4byte updateMain__Q33scn10grandtitle15SceneGrandTitleFv + .4byte updateUseGPU__Q33scn10grandtitle15SceneGrandTitleFv + .4byte updateDebug__Q33scn10grandtitle15SceneGrandTitleFv + .4byte draw__Q33scn10grandtitle15SceneGrandTitleFRCQ23scn11DrawReqInfo + .4byte isSceneEnd__Q33scn10grandtitle15SceneGrandTitleCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneHistory.s b/asm/src/SceneHistory.s index 693a0fbb..240dbb10 100644 --- a/asm/src/SceneHistory.s +++ b/asm/src/SceneHistory.s @@ -322,13 +322,13 @@ $$254221: __vt__Q33scn7history12SceneHistory: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q33scn7history12SceneHistoryCFv - .byte4 __dt__Q33scn7history12SceneHistoryFv - .byte4 updateMain__Q33scn7history12SceneHistoryFv - .byte4 updateUseGPU__Q33scn7history12SceneHistoryFv - .byte4 updateDebug__Q33scn7history12SceneHistoryFv - .byte4 draw__Q33scn7history12SceneHistoryFRCQ23scn11DrawReqInfo - .byte4 isSceneEnd__Q33scn7history12SceneHistoryCFv + .4byte GetRuntimeTypeInfo__Q33scn7history12SceneHistoryCFv + .4byte __dt__Q33scn7history12SceneHistoryFv + .4byte updateMain__Q33scn7history12SceneHistoryFv + .4byte updateUseGPU__Q33scn7history12SceneHistoryFv + .4byte updateDebug__Q33scn7history12SceneHistoryFv + .4byte draw__Q33scn7history12SceneHistoryFRCQ23scn11DrawReqInfo + .4byte isSceneEnd__Q33scn7history12SceneHistoryCFv .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2GUARD$$2RuntimeTypeInfoImpl$$0Q33scn7history12SceneHistory$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti diff --git a/asm/src/SceneInit.s b/asm/src/SceneInit.s index 162a11aa..0bfcfb7e 100644 --- a/asm/src/SceneInit.s +++ b/asm/src/SceneInit.s @@ -647,13 +647,13 @@ $$253298: __vt__Q33scn4init9SceneInit: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q33scn4init9SceneInitCFv - .byte4 __dt__Q33scn4init9SceneInitFv - .byte4 updateMain__Q33scn4init9SceneInitFv - .byte4 updateUseGPU__Q33scn4init9SceneInitFv - .byte4 updateDebug__Q33scn4init9SceneInitFv - .byte4 draw__Q33scn4init9SceneInitFRCQ23scn11DrawReqInfo - .byte4 isSceneEnd__Q33scn4init9SceneInitCFv + .4byte GetRuntimeTypeInfo__Q33scn4init9SceneInitCFv + .4byte __dt__Q33scn4init9SceneInitFv + .4byte updateMain__Q33scn4init9SceneInitFv + .4byte updateUseGPU__Q33scn4init9SceneInitFv + .4byte updateDebug__Q33scn4init9SceneInitFv + .4byte draw__Q33scn4init9SceneInitFRCQ23scn11DrawReqInfo + .4byte isSceneEnd__Q33scn4init9SceneInitCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/ScenePackageList.s b/asm/src/ScenePackageList.s index 02547cab..c904be85 100644 --- a/asm/src/ScenePackageList.s +++ b/asm/src/ScenePackageList.s @@ -285,13 +285,13 @@ $$252053: __vt__Q33scn11packagelist16ScenePackageList: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q33scn11packagelist16ScenePackageListCFv - .byte4 __dt__Q33scn11packagelist16ScenePackageListFv - .byte4 updateMain__Q33scn11packagelist16ScenePackageListFv - .byte4 updateUseGPU__Q33scn11packagelist16ScenePackageListFv - .byte4 updateDebug__Q33scn11packagelist16ScenePackageListFv - .byte4 draw__Q33scn11packagelist16ScenePackageListFRCQ23scn11DrawReqInfo - .byte4 isSceneEnd__Q33scn11packagelist16ScenePackageListCFv + .4byte GetRuntimeTypeInfo__Q33scn11packagelist16ScenePackageListCFv + .4byte __dt__Q33scn11packagelist16ScenePackageListFv + .4byte updateMain__Q33scn11packagelist16ScenePackageListFv + .4byte updateUseGPU__Q33scn11packagelist16ScenePackageListFv + .4byte updateDebug__Q33scn11packagelist16ScenePackageListFv + .4byte draw__Q33scn11packagelist16ScenePackageListFRCQ23scn11DrawReqInfo + .4byte isSceneEnd__Q33scn11packagelist16ScenePackageListCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneStaffCredit.s b/asm/src/SceneStaffCredit.s index 02e9ed46..fdbe7767 100644 --- a/asm/src/SceneStaffCredit.s +++ b/asm/src/SceneStaffCredit.s @@ -341,13 +341,13 @@ $$252497: __vt__Q33scn11staffcredit16SceneStaffCredit: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q33scn11staffcredit16SceneStaffCreditCFv - .byte4 __dt__Q33scn11staffcredit16SceneStaffCreditFv - .byte4 updateMain__Q33scn11staffcredit16SceneStaffCreditFv - .byte4 updateUseGPU__Q33scn11staffcredit16SceneStaffCreditFv - .byte4 updateDebug__Q33scn11staffcredit16SceneStaffCreditFv - .byte4 draw__Q33scn11staffcredit16SceneStaffCreditFRCQ23scn11DrawReqInfo - .byte4 isSceneEnd__Q33scn11staffcredit16SceneStaffCreditCFv + .4byte GetRuntimeTypeInfo__Q33scn11staffcredit16SceneStaffCreditCFv + .4byte __dt__Q33scn11staffcredit16SceneStaffCreditFv + .4byte updateMain__Q33scn11staffcredit16SceneStaffCreditFv + .4byte updateUseGPU__Q33scn11staffcredit16SceneStaffCreditFv + .4byte updateDebug__Q33scn11staffcredit16SceneStaffCreditFv + .4byte draw__Q33scn11staffcredit16SceneStaffCreditFRCQ23scn11DrawReqInfo + .4byte isSceneEnd__Q33scn11staffcredit16SceneStaffCreditCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneStep.s b/asm/src/SceneStep.s index cd7921ff..00bc2e86 100644 --- a/asm/src/SceneStep.s +++ b/asm/src/SceneStep.s @@ -554,13 +554,13 @@ $$252732: __vt__Q33scn4step9SceneStep: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q33scn4step9SceneStepCFv - .byte4 __dt__Q33scn4step9SceneStepFv - .byte4 updateMain__Q33scn4step9SceneStepFv - .byte4 updateUseGPU__Q33scn4step9SceneStepFv - .byte4 updateDebug__Q33scn4step9SceneStepFv - .byte4 draw__Q33scn4step9SceneStepFRCQ23scn11DrawReqInfo - .byte4 isSceneEnd__Q33scn4step9SceneStepCFv + .4byte GetRuntimeTypeInfo__Q33scn4step9SceneStepCFv + .4byte __dt__Q33scn4step9SceneStepFv + .4byte updateMain__Q33scn4step9SceneStepFv + .4byte updateUseGPU__Q33scn4step9SceneStepFv + .4byte updateDebug__Q33scn4step9SceneStepFv + .4byte draw__Q33scn4step9SceneStepFRCQ23scn11DrawReqInfo + .4byte isSceneEnd__Q33scn4step9SceneStepCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneStrap.s b/asm/src/SceneStrap.s index da52860a..94831983 100644 --- a/asm/src/SceneStrap.s +++ b/asm/src/SceneStrap.s @@ -572,13 +572,13 @@ $$253027: __vt__Q33scn5strap10SceneStrap: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q33scn5strap10SceneStrapCFv - .byte4 __dt__Q33scn5strap10SceneStrapFv - .byte4 updateMain__Q33scn5strap10SceneStrapFv - .byte4 updateUseGPU__Q33scn5strap10SceneStrapFv - .byte4 updateDebug__Q33scn5strap10SceneStrapFv - .byte4 draw__Q33scn5strap10SceneStrapFRCQ23scn11DrawReqInfo - .byte4 isSceneEnd__Q33scn5strap10SceneStrapCFv + .4byte GetRuntimeTypeInfo__Q33scn5strap10SceneStrapCFv + .4byte __dt__Q33scn5strap10SceneStrapFv + .4byte updateMain__Q33scn5strap10SceneStrapFv + .4byte updateUseGPU__Q33scn5strap10SceneStrapFv + .4byte updateDebug__Q33scn5strap10SceneStrapFv + .4byte draw__Q33scn5strap10SceneStrapFRCQ23scn11DrawReqInfo + .4byte isSceneEnd__Q33scn5strap10SceneStrapCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneVC.s b/asm/src/SceneVC.s index 33cc600d..912bed44 100644 --- a/asm/src/SceneVC.s +++ b/asm/src/SceneVC.s @@ -175,13 +175,13 @@ lbl_803F2B00: __vt__Q33scn2vc7SceneVC: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q33scn2vc7SceneVCCFv - .byte4 __dt__Q33scn2vc7SceneVCFv - .byte4 updateMain__Q33scn2vc7SceneVCFv - .byte4 updateUseGPU__Q33scn2vc7SceneVCFv - .byte4 updateDebug__Q33scn2vc7SceneVCFv - .byte4 draw__Q33scn2vc7SceneVCFRCQ23scn11DrawReqInfo - .byte4 isSceneEnd__Q33scn2vc7SceneVCCFv + .4byte GetRuntimeTypeInfo__Q33scn2vc7SceneVCCFv + .4byte __dt__Q33scn2vc7SceneVCFv + .4byte updateMain__Q33scn2vc7SceneVCFv + .4byte updateUseGPU__Q33scn2vc7SceneVCFv + .4byte updateDebug__Q33scn2vc7SceneVCFv + .4byte draw__Q33scn2vc7SceneVCFRCQ23scn11DrawReqInfo + .4byte isSceneEnd__Q33scn2vc7SceneVCCFv .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/Scn__ChallengeTitle__Chara.s b/asm/src/Scn__ChallengeTitle__Chara.s index a85144ba..86bd7a9a 100644 --- a/asm/src/Scn__ChallengeTitle__Chara.s +++ b/asm/src/Scn__ChallengeTitle__Chara.s @@ -691,57 +691,57 @@ $$256044: $$256046: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setRandomFrame__Q28mintglue26Scn__ChallengeTitle__CharaFv + .4byte setRandomFrame__Q28mintglue26Scn__ChallengeTitle__CharaFv .global $$256077 $$256077: .4byte 0 .4byte 0xFFFFFFFF - .byte4 flashReset__Q28mintglue26Scn__ChallengeTitle__CharaFv + .4byte flashReset__Q28mintglue26Scn__ChallengeTitle__CharaFv .global $$256082 $$256082: .4byte 0 .4byte 0xFFFFFFFF - .byte4 flashStart__Q28mintglue26Scn__ChallengeTitle__CharaFUlb + .4byte flashStart__Q28mintglue26Scn__ChallengeTitle__CharaFUlb .global $$256098 $$256098: .4byte 0 .4byte 0xFFFFFFFF - .byte4 clearSubAnim__Q28mintglue26Scn__ChallengeTitle__CharaFv + .4byte clearSubAnim__Q28mintglue26Scn__ChallengeTitle__CharaFv .global $$256103 $$256103: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setSubAnim__Q28mintglue26Scn__ChallengeTitle__CharaFv + .4byte setSubAnim__Q28mintglue26Scn__ChallengeTitle__CharaFv .global $$256108 $$256108: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setVisibility__Q28mintglue26Scn__ChallengeTitle__CharaFb + .4byte setVisibility__Q28mintglue26Scn__ChallengeTitle__CharaFb .global $$256111 $$256111: .4byte 0 .4byte 0xFFFFFFFF - .byte4 createEquip__Q28mintglue26Scn__ChallengeTitle__CharaFv + .4byte createEquip__Q28mintglue26Scn__ChallengeTitle__CharaFv .global $$256116 $$256116: .4byte 0 .4byte 0xFFFFFFFF - .byte4 releaseEffect__Q28mintglue26Scn__ChallengeTitle__CharaFv + .4byte releaseEffect__Q28mintglue26Scn__ChallengeTitle__CharaFv .global $$256121 $$256121: .4byte 0 .4byte 0xFFFFFFFF - .byte4 effectRequestN__Q28mintglue26Scn__ChallengeTitle__CharaFUlPCc + .4byte effectRequestN__Q28mintglue26Scn__ChallengeTitle__CharaFUlPCc .global $$256127 $$256127: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isAnimLooped__Q28mintglue26Scn__ChallengeTitle__CharaFv + .4byte isAnimLooped__Q28mintglue26Scn__ChallengeTitle__CharaFv .global $$256141 $$256141: .4byte 0 .4byte 0xFFFFFFFF - .byte4 changeAnim__Q28mintglue26Scn__ChallengeTitle__CharaFPCci + .4byte changeAnim__Q28mintglue26Scn__ChallengeTitle__CharaFPCci .global $$2STRING$$2ref__Q26mintvm37MintPtr$$0Q33scn14challengetitle5Chara$$1CFv $$2STRING$$2ref__Q26mintvm37MintPtr$$0Q33scn14challengetitle5Chara$$1CFv: .asciz "MintPtr is 0." diff --git a/asm/src/Scn__GrandTitle__Block.s b/asm/src/Scn__GrandTitle__Block.s index c77e2a77..53ee1ad7 100644 --- a/asm/src/Scn__GrandTitle__Block.s +++ b/asm/src/Scn__GrandTitle__Block.s @@ -181,12 +181,12 @@ $$254952: $$254954: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setVisibility__Q28mintglue22Scn__GrandTitle__BlockFb + .4byte setVisibility__Q28mintglue22Scn__GrandTitle__BlockFb .global $$254989 $$254989: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setVacuumed__Q28mintglue22Scn__GrandTitle__BlockFfi + .4byte setVacuumed__Q28mintglue22Scn__GrandTitle__BlockFfi .global $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Block$$1CFv $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Block$$1CFv: .asciz "MintPtr is 0." diff --git a/asm/src/Scn__GrandTitle__Chara.s b/asm/src/Scn__GrandTitle__Chara.s index 00add9cf..982b3ed6 100644 --- a/asm/src/Scn__GrandTitle__Chara.s +++ b/asm/src/Scn__GrandTitle__Chara.s @@ -948,72 +948,72 @@ $$256068: $$256070: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isCelebrateAnimPlayed__Q28mintglue22Scn__GrandTitle__CharaFv + .4byte isCelebrateAnimPlayed__Q28mintglue22Scn__GrandTitle__CharaFv .global $$256126 $$256126: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setLoopAnim__Q28mintglue22Scn__GrandTitle__CharaFPCcPCc + .4byte setLoopAnim__Q28mintglue22Scn__GrandTitle__CharaFPCcPCc .global $$256131 $$256131: .4byte 0 .4byte 0xFFFFFFFF - .byte4 stopWalkSE__Q28mintglue22Scn__GrandTitle__CharaFv + .4byte stopWalkSE__Q28mintglue22Scn__GrandTitle__CharaFv .global $$256139 $$256139: .4byte 0 .4byte 0xFFFFFFFF - .byte4 requestWalkSE__Q28mintglue22Scn__GrandTitle__CharaFUlUli + .4byte requestWalkSE__Q28mintglue22Scn__GrandTitle__CharaFUlUli .global $$256142 $$256142: .4byte 0 .4byte 0xFFFFFFFF - .byte4 flashReset__Q28mintglue22Scn__GrandTitle__CharaFv + .4byte flashReset__Q28mintglue22Scn__GrandTitle__CharaFv .global $$256147 $$256147: .4byte 0 .4byte 0xFFFFFFFF - .byte4 flashStart__Q28mintglue22Scn__GrandTitle__CharaFUl + .4byte flashStart__Q28mintglue22Scn__GrandTitle__CharaFUl .global $$256150 $$256150: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setBlockVisibility__Q28mintglue22Scn__GrandTitle__CharaFb + .4byte setBlockVisibility__Q28mintglue22Scn__GrandTitle__CharaFb .global $$256158 $$256158: .4byte 0 .4byte 0xFFFFFFFF - .byte4 setVisibility__Q28mintglue22Scn__GrandTitle__CharaFb + .4byte setVisibility__Q28mintglue22Scn__GrandTitle__CharaFb .global $$256163 $$256163: .4byte 0 .4byte 0xFFFFFFFF - .byte4 resetEffect__Q28mintglue22Scn__GrandTitle__CharaFv + .4byte resetEffect__Q28mintglue22Scn__GrandTitle__CharaFv .global $$256168 $$256168: .4byte 0 .4byte 0xFFFFFFFF - .byte4 effectWarpRequestN__Q28mintglue22Scn__GrandTitle__CharaFUlPCc + .4byte effectWarpRequestN__Q28mintglue22Scn__GrandTitle__CharaFUlPCc .global $$256176 $$256176: .4byte 0 .4byte 0xFFFFFFFF - .byte4 effectForeRequestN__Q28mintglue22Scn__GrandTitle__CharaFUlPCc + .4byte effectForeRequestN__Q28mintglue22Scn__GrandTitle__CharaFUlPCc .global $$256181 $$256181: .4byte 0 .4byte 0xFFFFFFFF - .byte4 effectRequestN__Q28mintglue22Scn__GrandTitle__CharaFUlPCc + .4byte effectRequestN__Q28mintglue22Scn__GrandTitle__CharaFUlPCc .global $$256186 $$256186: .4byte 0 .4byte 0xFFFFFFFF - .byte4 isAnimLooped__Q28mintglue22Scn__GrandTitle__CharaFv + .4byte isAnimLooped__Q28mintglue22Scn__GrandTitle__CharaFv .global $$256191 $$256191: .4byte 0 .4byte 0xFFFFFFFF - .byte4 changeAnim__Q28mintglue22Scn__GrandTitle__CharaFPCci + .4byte changeAnim__Q28mintglue22Scn__GrandTitle__CharaFPCci .global $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Chara$$1CFv $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Chara$$1CFv: .asciz "MintPtr is 0." diff --git a/asm/src/ScriptArchive.s b/asm/src/ScriptArchive.s index ec804781..64dcf7d2 100644 --- a/asm/src/ScriptArchive.s +++ b/asm/src/ScriptArchive.s @@ -113,5 +113,5 @@ $$248751: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_FILE_NAME__Q24mint27$$2unnamed$$2ScriptArchive_cpp$$2 T_FILE_NAME__Q24mint27$$2unnamed$$2ScriptArchive_cpp$$2: - .byte4 $$248751 + .4byte $$248751 .4byte 0 diff --git a/asm/src/ScriptCallback.s b/asm/src/ScriptCallback.s index cd406844..5d81b5b5 100644 --- a/asm/src/ScriptCallback.s +++ b/asm/src/ScriptCallback.s @@ -250,27 +250,27 @@ onScriptExecPost__Q43scn4step6weapon14ScriptCallbackFRCQ24gobj6Script: __vt__Q43scn4step4boss14ScriptCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4boss14ScriptCallbackFv - .byte4 onScriptRequested__Q43scn4step4boss14ScriptCallbackFRCQ24gobj6ScriptUlUl - .byte4 onScriptExecPre__Q43scn4step4boss14ScriptCallbackFRCQ24gobj6Script - .byte4 onScriptExecPost__Q43scn4step4boss14ScriptCallbackFRCQ24gobj6Script + .4byte __dt__Q43scn4step4boss14ScriptCallbackFv + .4byte onScriptRequested__Q43scn4step4boss14ScriptCallbackFRCQ24gobj6ScriptUlUl + .4byte onScriptExecPre__Q43scn4step4boss14ScriptCallbackFRCQ24gobj6Script + .4byte onScriptExecPost__Q43scn4step4boss14ScriptCallbackFRCQ24gobj6Script .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy14ScriptCallback __vt__Q43scn4step5enemy14ScriptCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step5enemy14ScriptCallbackFv - .byte4 onScriptRequested__Q43scn4step5enemy14ScriptCallbackFRCQ24gobj6ScriptUlUl - .byte4 onScriptExecPre__Q43scn4step5enemy14ScriptCallbackFRCQ24gobj6Script - .byte4 onScriptExecPost__Q43scn4step5enemy14ScriptCallbackFRCQ24gobj6Script + .4byte __dt__Q43scn4step5enemy14ScriptCallbackFv + .4byte onScriptRequested__Q43scn4step5enemy14ScriptCallbackFRCQ24gobj6ScriptUlUl + .4byte onScriptExecPre__Q43scn4step5enemy14ScriptCallbackFRCQ24gobj6Script + .4byte onScriptExecPost__Q43scn4step5enemy14ScriptCallbackFRCQ24gobj6Script .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon14ScriptCallback __vt__Q43scn4step6weapon14ScriptCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step6weapon14ScriptCallbackFv - .byte4 onScriptRequested__Q43scn4step6weapon14ScriptCallbackFRCQ24gobj6ScriptUlUl - .byte4 onScriptExecPre__Q43scn4step6weapon14ScriptCallbackFRCQ24gobj6Script - .byte4 onScriptExecPost__Q43scn4step6weapon14ScriptCallbackFRCQ24gobj6Script + .4byte __dt__Q43scn4step6weapon14ScriptCallbackFv + .4byte onScriptRequested__Q43scn4step6weapon14ScriptCallbackFRCQ24gobj6ScriptUlUl + .4byte onScriptExecPre__Q43scn4step6weapon14ScriptCallbackFRCQ24gobj6Script + .4byte onScriptExecPost__Q43scn4step6weapon14ScriptCallbackFRCQ24gobj6Script diff --git a/asm/src/Scroll.s b/asm/src/Scroll.s index f2156fa0..12cd655b 100644 --- a/asm/src/Scroll.s +++ b/asm/src/Scroll.s @@ -621,7 +621,7 @@ __sinit_$$3Scroll_cpp: /* 8020F2EC 0020B12C 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3Scroll_cpp + .4byte __sinit_$$3Scroll_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253103 diff --git a/asm/src/SearchAttack.s b/asm/src/SearchAttack.s index b1d21aba..26e934ae 100644 --- a/asm/src/SearchAttack.s +++ b/asm/src/SearchAttack.s @@ -517,5 +517,5 @@ getCollidedAttackTargetGimmick__Q25ocoll12SearchAttackCFUl: __vt__Q25ocoll12SearchAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q25ocoll12SearchAttackFv + .4byte __dt__Q25ocoll12SearchAttackFv .4byte 0 diff --git a/asm/src/SearchHit.s b/asm/src/SearchHit.s index bc55b394..e282e861 100644 --- a/asm/src/SearchHit.s +++ b/asm/src/SearchHit.s @@ -466,5 +466,5 @@ getCollidedHitOwnerUid__Q25ocoll9SearchHitCFUl: __vt__Q25ocoll9SearchHit: .4byte 0 .4byte 0 - .byte4 __dt__Q25ocoll9SearchHitFv + .4byte __dt__Q25ocoll9SearchHitFv .4byte 0 diff --git a/asm/src/SelectButtonContent.s b/asm/src/SelectButtonContent.s index 07335cc0..c90c28fc 100644 --- a/asm/src/SelectButtonContent.s +++ b/asm/src/SelectButtonContent.s @@ -299,86 +299,86 @@ $$251572: .balign 4 .global PANES__Q43scn7history6detail33$$2unnamed$$2SelectButtonContent_cpp$$2 PANES__Q43scn7history6detail33$$2unnamed$$2SelectButtonContent_cpp$$2: - .byte4 $$251546 - .byte4 $$251547 - .byte4 $$251548 - .byte4 $$251549 - .byte4 $$251550 - .byte4 $$251551 - .byte4 $$251552 - .byte4 $$251553 - .byte4 $$251554 - .byte4 $$251555 - .byte4 $$251556 - .byte4 $$251557 - .byte4 $$251558 - .byte4 $$251559 - .byte4 $$251560 - .byte4 $$251561 - .byte4 $$251562 - .byte4 $$251563 - .byte4 $$251564 - .byte4 $$251565 - .byte4 $$251566 - .byte4 $$251567 - .byte4 $$251568 - .byte4 $$251569 - .byte4 $$251570 - .byte4 $$251571 - .byte4 $$251572 - .byte4 $$251573 - .byte4 $$251574 + .4byte $$251546 + .4byte $$251547 + .4byte $$251548 + .4byte $$251549 + .4byte $$251550 + .4byte $$251551 + .4byte $$251552 + .4byte $$251553 + .4byte $$251554 + .4byte $$251555 + .4byte $$251556 + .4byte $$251557 + .4byte $$251558 + .4byte $$251559 + .4byte $$251560 + .4byte $$251561 + .4byte $$251562 + .4byte $$251563 + .4byte $$251564 + .4byte $$251565 + .4byte $$251566 + .4byte $$251567 + .4byte $$251568 + .4byte $$251569 + .4byte $$251570 + .4byte $$251571 + .4byte $$251572 + .4byte $$251573 + .4byte $$251574 .global TABLE__Q43scn7history6detail33$$2unnamed$$2SelectButtonContent_cpp$$2 TABLE__Q43scn7history6detail33$$2unnamed$$2SelectButtonContent_cpp$$2: - .byte4 $$251575 - .byte4 $$251547 - .byte4 $$251552 - .byte4 $$251554 - .byte4 $$251575 - .byte4 $$251553 - .byte4 $$251551 - .byte4 $$251548 - .byte4 $$251565 - .byte4 $$251546 - .byte4 $$251555 - .byte4 $$251549 - .byte4 $$251575 - .byte4 $$251575 - .byte4 $$251550 - .byte4 $$251564 - .byte4 $$251560 - .byte4 $$251567 - .byte4 $$251556 - .byte4 $$251561 - .byte4 $$251559 - .byte4 $$251562 - .byte4 $$251575 - .byte4 $$251558 - .byte4 $$251575 - .byte4 $$251563 - .byte4 $$251566 - .byte4 $$251557 - .byte4 $$251568 + .4byte $$251575 + .4byte $$251547 + .4byte $$251552 + .4byte $$251554 + .4byte $$251575 + .4byte $$251553 + .4byte $$251551 + .4byte $$251548 + .4byte $$251565 + .4byte $$251546 + .4byte $$251555 + .4byte $$251549 + .4byte $$251575 + .4byte $$251575 + .4byte $$251550 + .4byte $$251564 + .4byte $$251560 + .4byte $$251567 + .4byte $$251556 + .4byte $$251561 + .4byte $$251559 + .4byte $$251562 + .4byte $$251575 + .4byte $$251558 + .4byte $$251575 + .4byte $$251563 + .4byte $$251566 + .4byte $$251557 + .4byte $$251568 .global ICON_PANE_TABLE__Q43scn7history6detail33$$2unnamed$$2SelectButtonContent_cpp$$2 ICON_PANE_TABLE__Q43scn7history6detail33$$2unnamed$$2SelectButtonContent_cpp$$2: .4byte 0 - .byte4 $$251577 - .byte4 $$251577 + .4byte $$251577 + .4byte $$251577 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$251577 + .4byte $$251577 .4byte 0 - .byte4 $$251577 + .4byte $$251577 .4byte 0 - .byte4 $$251577 + .4byte $$251577 .4byte 0 .4byte 0 - .byte4 $$251577 + .4byte $$251577 .4byte 0 .4byte 0 - .byte4 $$251578 + .4byte $$251578 .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/Sequence.s b/asm/src/Sequence.s index 0159a5d6..e0392a67 100644 --- a/asm/src/Sequence.s +++ b/asm/src/Sequence.s @@ -1583,63 +1583,63 @@ __dt__Q34info8sequence11CommandWaitFv: $$255949: .4byte 0 .4byte 0xFFFFFFFF - .byte4 reset__Q34info8sequence7CommandFv + .4byte reset__Q34info8sequence7CommandFv .global __vt__Q34info8sequence11CommandWait __vt__Q34info8sequence11CommandWait: .4byte 0 .4byte 0 - .byte4 __dt__Q34info8sequence11CommandWaitFv - .byte4 start__Q34info8sequence11CommandWaitFv - .byte4 proc__Q34info8sequence11CommandWaitFv + .4byte __dt__Q34info8sequence11CommandWaitFv + .4byte start__Q34info8sequence11CommandWaitFv + .4byte proc__Q34info8sequence11CommandWaitFv .global __vt__Q34info8sequence11CommandProc __vt__Q34info8sequence11CommandProc: .4byte 0 .4byte 0 - .byte4 __dt__Q34info8sequence11CommandProcFv - .byte4 start__Q34info8sequence7CommandFv - .byte4 proc__Q34info8sequence11CommandProcFv + .4byte __dt__Q34info8sequence11CommandProcFv + .4byte start__Q34info8sequence7CommandFv + .4byte proc__Q34info8sequence11CommandProcFv .global __vt__Q34info8sequence15CommandInterval __vt__Q34info8sequence15CommandInterval: .4byte 0 .4byte 0 - .byte4 __dt__Q34info8sequence15CommandIntervalFv - .byte4 start__Q34info8sequence15CommandIntervalFv - .byte4 proc__Q34info8sequence15CommandIntervalFv + .4byte __dt__Q34info8sequence15CommandIntervalFv + .4byte start__Q34info8sequence15CommandIntervalFv + .4byte proc__Q34info8sequence15CommandIntervalFv .global __vt__Q34info8sequence11CommandCall __vt__Q34info8sequence11CommandCall: .4byte 0 .4byte 0 - .byte4 __dt__Q34info8sequence11CommandCallFv - .byte4 start__Q34info8sequence11CommandCallFv - .byte4 proc__Q34info8sequence7CommandFv + .4byte __dt__Q34info8sequence11CommandCallFv + .4byte start__Q34info8sequence11CommandCallFv + .4byte proc__Q34info8sequence7CommandFv .global __vt__Q34util17Delegate$$0Fv_v$$464$$112DelegateHeap __vt__Q34util17Delegate$$0Fv_v$$464$$112DelegateHeap: .4byte 0 .4byte 0 - .byte4 __dt__Q34util17Delegate$$0Fv_v$$464$$112DelegateHeapFv - .byte4 allocatorAlloc__Q34util17Delegate$$0Fv_v$$464$$112DelegateHeapFUll - .byte4 allocatorFree__Q34util17Delegate$$0Fv_v$$464$$112DelegateHeapFPv + .4byte __dt__Q34util17Delegate$$0Fv_v$$464$$112DelegateHeapFv + .4byte allocatorAlloc__Q34util17Delegate$$0Fv_v$$464$$112DelegateHeapFUll + .4byte allocatorFree__Q34util17Delegate$$0Fv_v$$464$$112DelegateHeapFPv .global __vt__Q34util17Delegate$$0Fv_b$$464$$112DelegateHeap __vt__Q34util17Delegate$$0Fv_b$$464$$112DelegateHeap: .4byte 0 .4byte 0 - .byte4 __dt__Q34util17Delegate$$0Fv_b$$464$$112DelegateHeapFv - .byte4 allocatorAlloc__Q34util17Delegate$$0Fv_b$$464$$112DelegateHeapFUll - .byte4 allocatorFree__Q34util17Delegate$$0Fv_b$$464$$112DelegateHeapFPv + .4byte __dt__Q34util17Delegate$$0Fv_b$$464$$112DelegateHeapFv + .4byte allocatorAlloc__Q34util17Delegate$$0Fv_b$$464$$112DelegateHeapFUll + .4byte allocatorFree__Q34util17Delegate$$0Fv_b$$464$$112DelegateHeapFPv .global __vt__Q34info8sequence11CommandAnim __vt__Q34info8sequence11CommandAnim: .4byte 0 .4byte 0 - .byte4 __dt__Q34info8sequence11CommandAnimFv - .byte4 start__Q34info8sequence11CommandAnimFv - .byte4 proc__Q34info8sequence11CommandAnimFv + .4byte __dt__Q34info8sequence11CommandAnimFv + .4byte start__Q34info8sequence11CommandAnimFv + .4byte proc__Q34info8sequence11CommandAnimFv .global __vt__Q34info8sequence7Command __vt__Q34info8sequence7Command: .4byte 0 .4byte 0 - .byte4 __dt__Q34info8sequence7CommandFv - .byte4 start__Q34info8sequence7CommandFv - .byte4 proc__Q34info8sequence7CommandFv + .4byte __dt__Q34info8sequence7CommandFv + .4byte start__Q34info8sequence7CommandFv + .4byte proc__Q34info8sequence7CommandFv .global $$256161 $$256161: .asciz "bad_function_call" diff --git a/asm/src/SequenceChallengeRoot.s b/asm/src/SequenceChallengeRoot.s index 6a905614..4574f61d 100644 --- a/asm/src/SequenceChallengeRoot.s +++ b/asm/src/SequenceChallengeRoot.s @@ -980,13 +980,13 @@ GetRuntimeTypeInfo__Q23seq21SequenceChallengeRootCFv: __vt__Q23seq21SequenceChallengeRoot: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q23seq21SequenceChallengeRootCFv - .byte4 __dt__Q23seq21SequenceChallengeRootFv - .byte4 nextAction__Q23seq21SequenceChallengeRootCFv - .byte4 createChildSequence__Q23seq21SequenceChallengeRootCFv - .byte4 onChildSequenceEnd__Q23seq21SequenceChallengeRootFRQ23seq9ISequence - .byte4 createScene__Q23seq21SequenceChallengeRootCFv - .byte4 onSceneEnd__Q23seq21SequenceChallengeRootFRQ23scn6IScene + .4byte GetRuntimeTypeInfo__Q23seq21SequenceChallengeRootCFv + .4byte __dt__Q23seq21SequenceChallengeRootFv + .4byte nextAction__Q23seq21SequenceChallengeRootCFv + .4byte createChildSequence__Q23seq21SequenceChallengeRootCFv + .4byte onChildSequenceEnd__Q23seq21SequenceChallengeRootFRQ23seq9ISequence + .4byte createScene__Q23seq21SequenceChallengeRootCFv + .4byte onSceneEnd__Q23seq21SequenceChallengeRootFRQ23scn6IScene .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/SequenceChallengeTitleRoot.s b/asm/src/SequenceChallengeTitleRoot.s index 3d8c71f8..7a09d752 100644 --- a/asm/src/SequenceChallengeTitleRoot.s +++ b/asm/src/SequenceChallengeTitleRoot.s @@ -508,13 +508,13 @@ __dt__Q23seq26SequenceChallengeTitleRootFv: __vt__Q23seq26SequenceChallengeTitleRoot: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q23seq26SequenceChallengeTitleRootCFv - .byte4 __dt__Q23seq26SequenceChallengeTitleRootFv - .byte4 nextAction__Q23seq26SequenceChallengeTitleRootCFv - .byte4 createChildSequence__Q23seq26SequenceChallengeTitleRootCFv - .byte4 onChildSequenceEnd__Q23seq26SequenceChallengeTitleRootFRQ23seq9ISequence - .byte4 createScene__Q23seq26SequenceChallengeTitleRootCFv - .byte4 onSceneEnd__Q23seq26SequenceChallengeTitleRootFRQ23scn6IScene + .4byte GetRuntimeTypeInfo__Q23seq26SequenceChallengeTitleRootCFv + .4byte __dt__Q23seq26SequenceChallengeTitleRootFv + .4byte nextAction__Q23seq26SequenceChallengeTitleRootCFv + .4byte createChildSequence__Q23seq26SequenceChallengeTitleRootCFv + .4byte onChildSequenceEnd__Q23seq26SequenceChallengeTitleRootFRQ23seq9ISequence + .4byte createScene__Q23seq26SequenceChallengeTitleRootCFv + .4byte onSceneEnd__Q23seq26SequenceChallengeTitleRootFRQ23scn6IScene .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/SequenceFirstDemo.s b/asm/src/SequenceFirstDemo.s index 081ea203..44c166a9 100644 --- a/asm/src/SequenceFirstDemo.s +++ b/asm/src/SequenceFirstDemo.s @@ -208,11 +208,11 @@ GetRuntimeTypeInfo__Q23seq17SequenceFirstDemoCFv: __vt__Q23seq17SequenceFirstDemo: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q23seq17SequenceFirstDemoCFv - .byte4 __dt__Q23seq17SequenceFirstDemoFv - .byte4 nextAction__Q23seq17SequenceFirstDemoCFv - .byte4 createChildSequence__Q23seq17SequenceFirstDemoCFv - .byte4 onChildSequenceEnd__Q23seq17SequenceFirstDemoFRQ23seq9ISequence - .byte4 createScene__Q23seq17SequenceFirstDemoCFv - .byte4 onSceneEnd__Q23seq17SequenceFirstDemoFRQ23scn6IScene + .4byte GetRuntimeTypeInfo__Q23seq17SequenceFirstDemoCFv + .4byte __dt__Q23seq17SequenceFirstDemoFv + .4byte nextAction__Q23seq17SequenceFirstDemoCFv + .4byte createChildSequence__Q23seq17SequenceFirstDemoCFv + .4byte onChildSequenceEnd__Q23seq17SequenceFirstDemoFRQ23seq9ISequence + .4byte createScene__Q23seq17SequenceFirstDemoCFv + .4byte onSceneEnd__Q23seq17SequenceFirstDemoFRQ23scn6IScene .4byte 0 diff --git a/asm/src/SequenceGrandMenu.s b/asm/src/SequenceGrandMenu.s index c5d4c16c..360cd43d 100644 --- a/asm/src/SequenceGrandMenu.s +++ b/asm/src/SequenceGrandMenu.s @@ -358,13 +358,13 @@ GetRuntimeTypeInfo__Q23seq17SequenceGrandMenuCFv: __vt__Q23seq17SequenceGrandMenu: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q23seq17SequenceGrandMenuCFv - .byte4 __dt__Q23seq17SequenceGrandMenuFv - .byte4 nextAction__Q23seq17SequenceGrandMenuCFv - .byte4 createChildSequence__Q23seq17SequenceGrandMenuCFv - .byte4 onChildSequenceEnd__Q23seq17SequenceGrandMenuFRQ23seq9ISequence - .byte4 createScene__Q23seq17SequenceGrandMenuCFv - .byte4 onSceneEnd__Q23seq17SequenceGrandMenuFRQ23scn6IScene + .4byte GetRuntimeTypeInfo__Q23seq17SequenceGrandMenuCFv + .4byte __dt__Q23seq17SequenceGrandMenuFv + .4byte nextAction__Q23seq17SequenceGrandMenuCFv + .4byte createChildSequence__Q23seq17SequenceGrandMenuCFv + .4byte onChildSequenceEnd__Q23seq17SequenceGrandMenuFRQ23seq9ISequence + .4byte createScene__Q23seq17SequenceGrandMenuCFv + .4byte onSceneEnd__Q23seq17SequenceGrandMenuFRQ23scn6IScene .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/SequenceHistory.s b/asm/src/SequenceHistory.s index d3d26885..55976ccf 100644 --- a/asm/src/SequenceHistory.s +++ b/asm/src/SequenceHistory.s @@ -368,11 +368,11 @@ __dt__Q23seq15SequenceHistoryFv: __vt__Q23seq15SequenceHistory: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q23seq15SequenceHistoryCFv - .byte4 __dt__Q23seq15SequenceHistoryFv - .byte4 nextAction__Q23seq15SequenceHistoryCFv - .byte4 createChildSequence__Q23seq15SequenceHistoryCFv - .byte4 onChildSequenceEnd__Q23seq15SequenceHistoryFRQ23seq9ISequence - .byte4 createScene__Q23seq15SequenceHistoryCFv - .byte4 onSceneEnd__Q23seq15SequenceHistoryFRQ23scn6IScene + .4byte GetRuntimeTypeInfo__Q23seq15SequenceHistoryCFv + .4byte __dt__Q23seq15SequenceHistoryFv + .4byte nextAction__Q23seq15SequenceHistoryCFv + .4byte createChildSequence__Q23seq15SequenceHistoryCFv + .4byte onChildSequenceEnd__Q23seq15SequenceHistoryFRQ23seq9ISequence + .4byte createScene__Q23seq15SequenceHistoryCFv + .4byte onSceneEnd__Q23seq15SequenceHistoryFRQ23scn6IScene .4byte 0 diff --git a/asm/src/SequenceLvMapRoot.s b/asm/src/SequenceLvMapRoot.s index 6b582f90..345766ea 100644 --- a/asm/src/SequenceLvMapRoot.s +++ b/asm/src/SequenceLvMapRoot.s @@ -605,11 +605,11 @@ GetRuntimeTypeInfo__Q23seq17SequenceLvMapRootCFv: __vt__Q23seq17SequenceLvMapRoot: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q23seq17SequenceLvMapRootCFv - .byte4 __dt__Q23seq17SequenceLvMapRootFv - .byte4 nextAction__Q23seq17SequenceLvMapRootCFv - .byte4 createChildSequence__Q23seq17SequenceLvMapRootCFv - .byte4 onChildSequenceEnd__Q23seq17SequenceLvMapRootFRQ23seq9ISequence - .byte4 createScene__Q23seq17SequenceLvMapRootCFv - .byte4 onSceneEnd__Q23seq17SequenceLvMapRootFRQ23scn6IScene + .4byte GetRuntimeTypeInfo__Q23seq17SequenceLvMapRootCFv + .4byte __dt__Q23seq17SequenceLvMapRootFv + .4byte nextAction__Q23seq17SequenceLvMapRootCFv + .4byte createChildSequence__Q23seq17SequenceLvMapRootCFv + .4byte onChildSequenceEnd__Q23seq17SequenceLvMapRootFRQ23seq9ISequence + .4byte createScene__Q23seq17SequenceLvMapRootCFv + .4byte onSceneEnd__Q23seq17SequenceLvMapRootFRQ23scn6IScene .4byte 0 diff --git a/asm/src/SequenceProductRoot.s b/asm/src/SequenceProductRoot.s index 94bc638a..ec939efd 100644 --- a/asm/src/SequenceProductRoot.s +++ b/asm/src/SequenceProductRoot.s @@ -404,13 +404,13 @@ __dt__Q23seq19SequenceProductRootFv: __vt__Q23seq19SequenceProductRoot: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q23seq19SequenceProductRootCFv - .byte4 __dt__Q23seq19SequenceProductRootFv - .byte4 nextAction__Q23seq19SequenceProductRootCFv - .byte4 createChildSequence__Q23seq19SequenceProductRootCFv - .byte4 onChildSequenceEnd__Q23seq19SequenceProductRootFRQ23seq9ISequence - .byte4 createScene__Q23seq19SequenceProductRootCFv - .byte4 onSceneEnd__Q23seq19SequenceProductRootFRQ23scn6IScene + .4byte GetRuntimeTypeInfo__Q23seq19SequenceProductRootCFv + .4byte __dt__Q23seq19SequenceProductRootFv + .4byte nextAction__Q23seq19SequenceProductRootCFv + .4byte createChildSequence__Q23seq19SequenceProductRootCFv + .4byte onChildSequenceEnd__Q23seq19SequenceProductRootFRQ23seq9ISequence + .4byte createScene__Q23seq19SequenceProductRootCFv + .4byte onSceneEnd__Q23seq19SequenceProductRootFRQ23scn6IScene .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/SequenceRoot.s b/asm/src/SequenceRoot.s index 00eca678..4eb0f799 100644 --- a/asm/src/SequenceRoot.s +++ b/asm/src/SequenceRoot.s @@ -92,11 +92,11 @@ lbl_803FFA40: __vt__Q23seq12SequenceRoot: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q23seq12SequenceRootCFv - .byte4 __dt__Q23seq12SequenceRootFv - .byte4 nextAction__Q23seq12SequenceRootCFv - .byte4 createChildSequence__Q23seq12SequenceRootCFv - .byte4 onChildSequenceEnd__Q23seq12SequenceRootFRQ23seq9ISequence - .byte4 createScene__Q23seq12SequenceRootCFv - .byte4 onSceneEnd__Q23seq12SequenceRootFRQ23scn6IScene + .4byte GetRuntimeTypeInfo__Q23seq12SequenceRootCFv + .4byte __dt__Q23seq12SequenceRootFv + .4byte nextAction__Q23seq12SequenceRootCFv + .4byte createChildSequence__Q23seq12SequenceRootCFv + .4byte onChildSequenceEnd__Q23seq12SequenceRootFRQ23seq9ISequence + .4byte createScene__Q23seq12SequenceRootCFv + .4byte onSceneEnd__Q23seq12SequenceRootFRQ23scn6IScene .4byte 0 diff --git a/asm/src/SequenceStaffCredit.s b/asm/src/SequenceStaffCredit.s index d2ef2f72..1cf9201f 100644 --- a/asm/src/SequenceStaffCredit.s +++ b/asm/src/SequenceStaffCredit.s @@ -133,11 +133,11 @@ GetRuntimeTypeInfo__Q23seq19SequenceStaffCreditCFv: __vt__Q23seq19SequenceStaffCredit: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q23seq19SequenceStaffCreditCFv - .byte4 __dt__Q23seq19SequenceStaffCreditFv - .byte4 nextAction__Q23seq19SequenceStaffCreditCFv - .byte4 createChildSequence__Q23seq19SequenceStaffCreditCFv - .byte4 onChildSequenceEnd__Q23seq19SequenceStaffCreditFRQ23seq9ISequence - .byte4 createScene__Q23seq19SequenceStaffCreditCFv - .byte4 onSceneEnd__Q23seq19SequenceStaffCreditFRQ23scn6IScene + .4byte GetRuntimeTypeInfo__Q23seq19SequenceStaffCreditCFv + .4byte __dt__Q23seq19SequenceStaffCreditFv + .4byte nextAction__Q23seq19SequenceStaffCreditCFv + .4byte createChildSequence__Q23seq19SequenceStaffCreditCFv + .4byte onChildSequenceEnd__Q23seq19SequenceStaffCreditFRQ23seq9ISequence + .4byte createScene__Q23seq19SequenceStaffCreditCFv + .4byte onSceneEnd__Q23seq19SequenceStaffCreditFRQ23scn6IScene .4byte 0 diff --git a/asm/src/SequenceStep.s b/asm/src/SequenceStep.s index 2ed06a7e..debc5a8a 100644 --- a/asm/src/SequenceStep.s +++ b/asm/src/SequenceStep.s @@ -488,13 +488,13 @@ __dt__Q23seq12SequenceStepFv: __vt__Q23seq12SequenceStep: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q23seq12SequenceStepCFv - .byte4 __dt__Q23seq12SequenceStepFv - .byte4 nextAction__Q23seq12SequenceStepCFv - .byte4 createChildSequence__Q23seq12SequenceStepCFv - .byte4 onChildSequenceEnd__Q23seq12SequenceStepFRQ23seq9ISequence - .byte4 createScene__Q23seq12SequenceStepCFv - .byte4 onSceneEnd__Q23seq12SequenceStepFRQ23scn6IScene + .4byte GetRuntimeTypeInfo__Q23seq12SequenceStepCFv + .4byte __dt__Q23seq12SequenceStepFv + .4byte nextAction__Q23seq12SequenceStepCFv + .4byte createChildSequence__Q23seq12SequenceStepCFv + .4byte onChildSequenceEnd__Q23seq12SequenceStepFRQ23seq9ISequence + .4byte createScene__Q23seq12SequenceStepCFv + .4byte onSceneEnd__Q23seq12SequenceStepFRQ23scn6IScene .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/SequenceVC.s b/asm/src/SequenceVC.s index bdf36ff0..8f86215c 100644 --- a/asm/src/SequenceVC.s +++ b/asm/src/SequenceVC.s @@ -83,11 +83,11 @@ __dt__Q23seq10SequenceVCFv: __vt__Q23seq10SequenceVC: .4byte 0 .4byte 0 - .byte4 GetRuntimeTypeInfo__Q23seq10SequenceVCCFv - .byte4 __dt__Q23seq10SequenceVCFv - .byte4 nextAction__Q23seq10SequenceVCCFv - .byte4 createChildSequence__Q23seq10SequenceVCCFv - .byte4 onChildSequenceEnd__Q23seq10SequenceVCFRQ23seq9ISequence - .byte4 createScene__Q23seq10SequenceVCCFv - .byte4 onSceneEnd__Q23seq10SequenceVCFRQ23scn6IScene + .4byte GetRuntimeTypeInfo__Q23seq10SequenceVCCFv + .4byte __dt__Q23seq10SequenceVCFv + .4byte nextAction__Q23seq10SequenceVCCFv + .4byte createChildSequence__Q23seq10SequenceVCCFv + .4byte onChildSequenceEnd__Q23seq10SequenceVCFRQ23seq9ISequence + .4byte createScene__Q23seq10SequenceVCCFv + .4byte onSceneEnd__Q23seq10SequenceVCFRQ23scn6IScene .4byte 0 diff --git a/asm/src/Shadow.s b/asm/src/Shadow.s index 791f68c3..f1622714 100644 --- a/asm/src/Shadow.s +++ b/asm/src/Shadow.s @@ -1084,7 +1084,7 @@ $$252351: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn14challengetitle20$$2unnamed$$2Shadow_cpp$$2 G3D_RES_FILE_PATH__Q33scn14challengetitle20$$2unnamed$$2Shadow_cpp$$2: - .byte4 $$251778 + .4byte $$251778 .global $$252224 $$252224: .asciz "Shadow" @@ -1098,7 +1098,7 @@ $$252232: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn10grandtitle20$$2unnamed$$2Shadow_cpp$$2 G3D_RES_FILE_PATH__Q33scn10grandtitle20$$2unnamed$$2Shadow_cpp$$2: - .byte4 $$252146 + .4byte $$252146 .global $$252859 $$252859: .asciz "Shadow" diff --git a/asm/src/Shake.s b/asm/src/Shake.s index b5e07cd1..28af93eb 100644 --- a/asm/src/Shake.s +++ b/asm/src/Shake.s @@ -109,17 +109,17 @@ T_SHAKE_OFFS_TABLE_LL__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2: .global T_TABLE__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 T_TABLE__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2: .4byte 0x00000002 - .byte4 T_SHAKE_OFFS_TABLE_SSS__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 + .4byte T_SHAKE_OFFS_TABLE_SSS__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 .4byte 0x00000002 - .byte4 T_SHAKE_OFFS_TABLE_SS__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 + .4byte T_SHAKE_OFFS_TABLE_SS__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 .4byte 0x00000004 - .byte4 T_SHAKE_OFFS_TABLE_S__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 + .4byte T_SHAKE_OFFS_TABLE_S__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 .4byte 0x00000004 - .byte4 T_SHAKE_OFFS_TABLE_M__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 + .4byte T_SHAKE_OFFS_TABLE_M__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 .4byte 0x00000006 - .byte4 T_SHAKE_OFFS_TABLE_L__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 + .4byte T_SHAKE_OFFS_TABLE_L__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 .4byte 0x0000000C - .byte4 T_SHAKE_OFFS_TABLE_LL__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 + .4byte T_SHAKE_OFFS_TABLE_LL__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_SHAKE_OFFS_TABLE_SSS__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 diff --git a/asm/src/ShipEvent.s b/asm/src/ShipEvent.s index 7716aff6..45e06965 100644 --- a/asm/src/ShipEvent.s +++ b/asm/src/ShipEvent.s @@ -3843,48 +3843,48 @@ lbl_80322CB8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$260977 $$260977: - .byte4 $$260970 - .byte4 $$260971 - .byte4 $$260972 - .byte4 $$260973 - .byte4 $$260974 - .byte4 $$260975 - .byte4 $$260976 + .4byte $$260970 + .4byte $$260971 + .4byte $$260972 + .4byte $$260973 + .4byte $$260974 + .4byte $$260975 + .4byte $$260976 .4byte 0 .global $$261005 $$261005: - .byte4 $$260970 - .byte4 $$260980 - .byte4 $$260981 - .byte4 $$260982 - .byte4 $$260983 - .byte4 $$260984 - .byte4 $$260985 - .byte4 $$260986 - .byte4 $$260987 - .byte4 $$260988 - .byte4 $$260989 - .byte4 $$260990 - .byte4 $$260991 - .byte4 $$260989 - .byte4 $$260992 - .byte4 $$260983 - .byte4 $$260980 - .byte4 $$260993 - .byte4 $$260994 - .byte4 $$260973 - .byte4 $$260981 - .byte4 $$260995 - .byte4 $$260996 - .byte4 $$260997 - .byte4 $$260998 - .byte4 $$260999 - .byte4 $$261000 - .byte4 $$261001 - .byte4 $$261002 - .byte4 $$260970 - .byte4 $$261003 - .byte4 $$261004 + .4byte $$260970 + .4byte $$260980 + .4byte $$260981 + .4byte $$260982 + .4byte $$260983 + .4byte $$260984 + .4byte $$260985 + .4byte $$260986 + .4byte $$260987 + .4byte $$260988 + .4byte $$260989 + .4byte $$260990 + .4byte $$260991 + .4byte $$260989 + .4byte $$260992 + .4byte $$260983 + .4byte $$260980 + .4byte $$260993 + .4byte $$260994 + .4byte $$260973 + .4byte $$260981 + .4byte $$260995 + .4byte $$260996 + .4byte $$260997 + .4byte $$260998 + .4byte $$260999 + .4byte $$261000 + .4byte $$261001 + .4byte $$261002 + .4byte $$260970 + .4byte $$261003 + .4byte $$261004 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$264598 @@ -3899,7 +3899,7 @@ $$264599: $$264706: .4byte 0 .4byte 0xFFFFFFFF - .byte4 actionCallback__Q53scn4step7gimmick9shipevent9ShipEventFPCcPCc + .4byte actionCallback__Q53scn4step7gimmick9shipevent9ShipEventFPCcPCc .global $$264779 $$264779: .asciz "Scn.Step.Gimmick.ShipEvent.FirstDemoEvent.Exec" @@ -4036,15 +4036,15 @@ $$265156: __vt__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$$1: .4byte 0 .4byte 0 - .byte4 __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 - .byte4 clone__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$$1CFv - .byte4 clone__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$$1CFPv - .byte4 __cl__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$$1FPCcPCc + .4byte __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 + .4byte clone__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$$1CFv + .4byte clone__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$$1CFPv + .4byte __cl__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$$1FPCcPCc .global __vt__Q43std3tr16detail25function_base$$0PFPCcPCc_v$$1 __vt__Q43std3tr16detail25function_base$$0PFPCcPCc_v$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q43std3tr16detail25function_base$$0PFPCcPCc_v$$1Fv + .4byte __dt__Q43std3tr16detail25function_base$$0PFPCcPCc_v$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -4052,9 +4052,9 @@ __vt__Q43std3tr16detail25function_base$$0PFPCcPCc_v$$1: __vt__Q34util22Delegate$$0FPCcPCc_v$$464$$112DelegateHeap: .4byte 0 .4byte 0 - .byte4 __dt__Q34util22Delegate$$0FPCcPCc_v$$464$$112DelegateHeapFv - .byte4 allocatorAlloc__Q34util22Delegate$$0FPCcPCc_v$$464$$112DelegateHeapFUll - .byte4 allocatorFree__Q34util22Delegate$$0FPCcPCc_v$$464$$112DelegateHeapFPv + .4byte __dt__Q34util22Delegate$$0FPCcPCc_v$$464$$112DelegateHeapFv + .4byte allocatorAlloc__Q34util22Delegate$$0FPCcPCc_v$$464$$112DelegateHeapFUll + .4byte allocatorFree__Q34util22Delegate$$0FPCcPCc_v$$464$$112DelegateHeapFPv .global $$265268 $$265268: .asciz "basic_string::reserve length_error" diff --git a/asm/src/Shooting.s b/asm/src/Shooting.s index 998927e4..75443f8a 100644 --- a/asm/src/Shooting.s +++ b/asm/src/Shooting.s @@ -44,5 +44,5 @@ __dt__Q53scn4step7gimmick8shooting8ShootingFv: __vt__Q53scn4step7gimmick8shooting8Shooting: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick8shooting8ShootingFv + .4byte __dt__Q53scn4step7gimmick8shooting8ShootingFv .4byte 0 diff --git a/asm/src/ShuffleManager.s b/asm/src/ShuffleManager.s index c11b4edc..d8bb8d74 100644 --- a/asm/src/ShuffleManager.s +++ b/asm/src/ShuffleManager.s @@ -609,68 +609,68 @@ lbl_80386268: .global T_ABILITY_SET__Q53scn4step4hero3mix28$$2unnamed$$2ShuffleManager_cpp$$2 T_ABILITY_SET__Q53scn4step4hero3mix28$$2unnamed$$2ShuffleManager_cpp$$2: .4byte 0x00000001 - .byte4 $$252280 - .byte4 $$252281 + .4byte $$252280 + .4byte $$252281 .4byte 0x00000002 - .byte4 $$252282 - .byte4 $$252283 + .4byte $$252282 + .4byte $$252283 .4byte 0x00000003 - .byte4 $$252284 - .byte4 $$252285 + .4byte $$252284 + .4byte $$252285 .4byte 0x00000004 - .byte4 $$252286 - .byte4 $$252287 + .4byte $$252286 + .4byte $$252287 .4byte 0x00000005 - .byte4 $$252288 - .byte4 $$252289 + .4byte $$252288 + .4byte $$252289 .4byte 0x00000006 - .byte4 $$252290 - .byte4 $$252291 + .4byte $$252290 + .4byte $$252291 .4byte 0x00000007 - .byte4 $$252292 - .byte4 $$252293 + .4byte $$252292 + .4byte $$252293 .4byte 0x00000008 - .byte4 $$252294 - .byte4 $$252295 + .4byte $$252294 + .4byte $$252295 .4byte 0x00000009 - .byte4 $$252296 - .byte4 $$252297 + .4byte $$252296 + .4byte $$252297 .4byte 0x0000000A - .byte4 $$252298 - .byte4 $$252299 + .4byte $$252298 + .4byte $$252299 .4byte 0x0000000B - .byte4 $$252300 - .byte4 $$252301 + .4byte $$252300 + .4byte $$252301 .4byte 0x0000000C - .byte4 $$252302 - .byte4 $$252303 + .4byte $$252302 + .4byte $$252303 .4byte 0x0000000D - .byte4 $$252304 - .byte4 $$252305 + .4byte $$252304 + .4byte $$252305 .4byte 0x0000000E - .byte4 $$252306 - .byte4 $$252307 + .4byte $$252306 + .4byte $$252307 .4byte 0x0000000F - .byte4 $$252308 - .byte4 $$252309 + .4byte $$252308 + .4byte $$252309 .4byte 0x00000010 - .byte4 $$252310 - .byte4 $$252311 + .4byte $$252310 + .4byte $$252311 .4byte 0x00000011 - .byte4 $$252312 - .byte4 $$252313 + .4byte $$252312 + .4byte $$252313 .4byte 0x00000012 - .byte4 $$252314 - .byte4 $$252315 + .4byte $$252314 + .4byte $$252315 .4byte 0x00000013 - .byte4 $$252316 - .byte4 $$252317 + .4byte $$252316 + .4byte $$252317 .4byte 0x00000014 - .byte4 $$252318 - .byte4 $$252319 + .4byte $$252318 + .4byte $$252319 .4byte 0x00000015 - .byte4 $$252320 - .byte4 $$252321 + .4byte $$252320 + .4byte $$252321 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/src/Shutter.s b/asm/src/Shutter.s index ce91c11f..639f1a32 100644 --- a/asm/src/Shutter.s +++ b/asm/src/Shutter.s @@ -2071,10 +2071,10 @@ $$254633: .section .data, "wa" # 0x80421040 - 0x80496700 .global SUB_KIND_POSTFIX__21$$2unnamed$$2Shutter_cpp$$2 SUB_KIND_POSTFIX__21$$2unnamed$$2Shutter_cpp$$2: - .byte4 $$253500 - .byte4 $$253501 - .byte4 $$253502 - .byte4 $$253503 + .4byte $$253500 + .4byte $$253501 + .4byte $$253502 + .4byte $$253503 .global $$256118 $$256118: .asciz "step/gimmick/Shutter" @@ -2093,12 +2093,12 @@ $$256218: __vt__Q53scn4step7gimmick7shutter7Shutter: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick7shutter7ShutterFv - .byte4 onSwitchOn__Q53scn4step7gimmick7shutter7ShutterFv - .byte4 onSwitchOff__Q53scn4step7gimmick7shutter7ShutterFv - .byte4 onSwitchToggle__Q53scn4step7gimmick7shutter7ShutterFv - .byte4 onSwitchOnFromSuperBeamSwitch__Q53scn4step7gimmick7shutter7ShutterFv - .byte4 checkDemoPos__Q53scn4step7gimmick7shutter7ShutterCFRQ33hel4math7Vector2 + .4byte __dt__Q53scn4step7gimmick7shutter7ShutterFv + .4byte onSwitchOn__Q53scn4step7gimmick7shutter7ShutterFv + .4byte onSwitchOff__Q53scn4step7gimmick7shutter7ShutterFv + .4byte onSwitchToggle__Q53scn4step7gimmick7shutter7ShutterFv + .4byte onSwitchOnFromSuperBeamSwitch__Q53scn4step7gimmick7shutter7ShutterFv + .4byte checkDemoPos__Q53scn4step7gimmick7shutter7ShutterCFRQ33hel4math7Vector2 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253500 diff --git a/asm/src/Smash.s b/asm/src/Smash.s index 0240f3bc..0d979b88 100644 --- a/asm/src/Smash.s +++ b/asm/src/Smash.s @@ -677,22 +677,22 @@ $$255941: .4byte 0 .global STONEBODY_MODEL_TABLE__Q53scn4step4hero5smash19$$2unnamed$$2Smash_cpp$$2 STONEBODY_MODEL_TABLE__Q53scn4step4hero5smash19$$2unnamed$$2Smash_cpp$$2: - .byte4 $$255926 - .byte4 $$255927 - .byte4 $$255928 - .byte4 $$255929 - .byte4 $$255930 - .byte4 $$255931 - .byte4 $$255932 - .byte4 $$255933 - .byte4 $$255934 - .byte4 $$255935 - .byte4 $$255936 - .byte4 $$255937 - .byte4 $$255938 - .byte4 $$255939 - .byte4 $$255940 - .byte4 $$255941 + .4byte $$255926 + .4byte $$255927 + .4byte $$255928 + .4byte $$255929 + .4byte $$255930 + .4byte $$255931 + .4byte $$255932 + .4byte $$255933 + .4byte $$255934 + .4byte $$255935 + .4byte $$255936 + .4byte $$255937 + .4byte $$255938 + .4byte $$255939 + .4byte $$255940 + .4byte $$255941 .global $$257442 $$257442: .asciz "HrStoneBody" @@ -730,27 +730,27 @@ $$257571: __vt__Q53scn4step4hero5smash5Smash: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5smash5SmashFv - .byte4 setup__Q53scn4step4hero5smash5SmashFv - .byte4 tryToChangeStateOnCarry__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeStateOnInterval__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeStateOnDamage__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeState__Q53scn4step4hero5smash5SmashFv - .byte4 onStateEndCleanUp__Q53scn4step4hero5smash5SmashFv - .byte4 onGetEventItem__Q43scn4step4hero11AbilityBaseFv - .byte4 onGimmickReactChangeState__Q43scn4step4hero11AbilityBaseFv - .byte4 onStartClearDanceExternal__Q43scn4step4hero11AbilityBaseFv - .byte4 onEnterWarpLowper__Q43scn4step4hero11AbilityBaseFv - .byte4 onShowHero__Q43scn4step4hero11AbilityBaseFv - .byte4 onHideHero__Q43scn4step4hero11AbilityBaseFv - .byte4 onDead__Q43scn4step4hero11AbilityBaseFv - .byte4 onCaptured__Q43scn4step4hero11AbilityBaseFv - .byte4 onVacuumed__Q43scn4step4hero11AbilityBaseFv - .byte4 onStartDemo__Q43scn4step4hero11AbilityBaseFv - .byte4 procAnim__Q43scn4step4hero11AbilityBaseFv - .byte4 procMove__Q43scn4step4hero11AbilityBaseFv - .byte4 procObjCollReact__Q43scn4step4hero11AbilityBaseFv - .byte4 isDepleted__Q43scn4step4hero11AbilityBaseCFv + .4byte __dt__Q53scn4step4hero5smash5SmashFv + .4byte setup__Q53scn4step4hero5smash5SmashFv + .4byte tryToChangeStateOnCarry__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeStateOnInterval__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeStateOnDamage__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeState__Q53scn4step4hero5smash5SmashFv + .4byte onStateEndCleanUp__Q53scn4step4hero5smash5SmashFv + .4byte onGetEventItem__Q43scn4step4hero11AbilityBaseFv + .4byte onGimmickReactChangeState__Q43scn4step4hero11AbilityBaseFv + .4byte onStartClearDanceExternal__Q43scn4step4hero11AbilityBaseFv + .4byte onEnterWarpLowper__Q43scn4step4hero11AbilityBaseFv + .4byte onShowHero__Q43scn4step4hero11AbilityBaseFv + .4byte onHideHero__Q43scn4step4hero11AbilityBaseFv + .4byte onDead__Q43scn4step4hero11AbilityBaseFv + .4byte onCaptured__Q43scn4step4hero11AbilityBaseFv + .4byte onVacuumed__Q43scn4step4hero11AbilityBaseFv + .4byte onStartDemo__Q43scn4step4hero11AbilityBaseFv + .4byte procAnim__Q43scn4step4hero11AbilityBaseFv + .4byte procMove__Q43scn4step4hero11AbilityBaseFv + .4byte procObjCollReact__Q43scn4step4hero11AbilityBaseFv + .4byte isDepleted__Q43scn4step4hero11AbilityBaseCFv .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" diff --git a/asm/src/SoundManager.s b/asm/src/SoundManager.s index 33015a72..a4f20e39 100644 --- a/asm/src/SoundManager.s +++ b/asm/src/SoundManager.s @@ -600,7 +600,7 @@ $$250548: __vt__Q23snd12SoundManager: .4byte 0 .4byte 0 - .byte4 __dt__Q23snd12SoundManagerFv + .4byte __dt__Q23snd12SoundManagerFv .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: .asciz "NW4R:Pointer must not be NULL (p)" diff --git a/asm/src/Spark.s b/asm/src/Spark.s index 3b0023b2..2ae9c1ce 100644 --- a/asm/src/Spark.s +++ b/asm/src/Spark.s @@ -1175,27 +1175,27 @@ $$259458: __vt__Q53scn4step4hero5spark5Spark: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5spark5SparkFv - .byte4 setup__Q53scn4step4hero5spark5SparkFv - .byte4 tryToChangeStateOnCarry__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeStateOnInterval__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeStateOnDamage__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeState__Q53scn4step4hero5spark5SparkFv - .byte4 onStateEndCleanUp__Q53scn4step4hero5spark5SparkFv - .byte4 onGetEventItem__Q43scn4step4hero11AbilityBaseFv - .byte4 onGimmickReactChangeState__Q43scn4step4hero11AbilityBaseFv - .byte4 onStartClearDanceExternal__Q43scn4step4hero11AbilityBaseFv - .byte4 onEnterWarpLowper__Q43scn4step4hero11AbilityBaseFv - .byte4 onShowHero__Q53scn4step4hero5spark5SparkFv - .byte4 onHideHero__Q53scn4step4hero5spark5SparkFv - .byte4 onDead__Q43scn4step4hero11AbilityBaseFv - .byte4 onCaptured__Q43scn4step4hero11AbilityBaseFv - .byte4 onVacuumed__Q43scn4step4hero11AbilityBaseFv - .byte4 onStartDemo__Q43scn4step4hero11AbilityBaseFv - .byte4 procAnim__Q53scn4step4hero5spark5SparkFv - .byte4 procMove__Q43scn4step4hero11AbilityBaseFv - .byte4 procObjCollReact__Q53scn4step4hero5spark5SparkFv - .byte4 isDepleted__Q43scn4step4hero11AbilityBaseCFv + .4byte __dt__Q53scn4step4hero5spark5SparkFv + .4byte setup__Q53scn4step4hero5spark5SparkFv + .4byte tryToChangeStateOnCarry__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeStateOnInterval__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeStateOnDamage__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeState__Q53scn4step4hero5spark5SparkFv + .4byte onStateEndCleanUp__Q53scn4step4hero5spark5SparkFv + .4byte onGetEventItem__Q43scn4step4hero11AbilityBaseFv + .4byte onGimmickReactChangeState__Q43scn4step4hero11AbilityBaseFv + .4byte onStartClearDanceExternal__Q43scn4step4hero11AbilityBaseFv + .4byte onEnterWarpLowper__Q43scn4step4hero11AbilityBaseFv + .4byte onShowHero__Q53scn4step4hero5spark5SparkFv + .4byte onHideHero__Q53scn4step4hero5spark5SparkFv + .4byte onDead__Q43scn4step4hero11AbilityBaseFv + .4byte onCaptured__Q43scn4step4hero11AbilityBaseFv + .4byte onVacuumed__Q43scn4step4hero11AbilityBaseFv + .4byte onStartDemo__Q43scn4step4hero11AbilityBaseFv + .4byte procAnim__Q53scn4step4hero5spark5SparkFv + .4byte procMove__Q43scn4step4hero11AbilityBaseFv + .4byte procObjCollReact__Q53scn4step4hero5spark5SparkFv + .4byte isDepleted__Q43scn4step4hero11AbilityBaseCFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248732 @@ -1204,8 +1204,8 @@ $$248732: .balign 4 .global $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc5SparkFv$$2names$$21 $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc5SparkFv$$2names$$21: - .byte4 $$248732 - .byte4 $$248733 + .4byte $$248732 + .4byte $$248733 .global $$248831 $$248831: .asciz "TopL" @@ -1218,7 +1218,7 @@ $$248766: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2HatAnim__Q53scn4step4hero9modeldesc5SparkFv$$2entries$$22 $$2LOCAL$$2HatAnim__Q53scn4step4hero9modeldesc5SparkFv$$2entries$$22: - .byte4 $$248766 + .4byte $$248766 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/StaffCredit.s b/asm/src/StaffCredit.s index a0101257..92c96e05 100644 --- a/asm/src/StaffCredit.s +++ b/asm/src/StaffCredit.s @@ -221,15 +221,15 @@ $$252124: __vt__Q33scn19challengefileselect11StaffCredit: .4byte 0 .4byte 0 - .byte4 __dt__Q33scn19challengefileselect11StaffCreditFv - .byte4 updateFrame__Q33scn19challengefileselect11StaffCreditFv - .byte4 appear__Q33scn19challengefileselect11StaffCreditFv - .byte4 focus__Q33scn19challengefileselect11StaffCreditFv - .byte4 unfocus__Q33scn19challengefileselect11StaffCreditFv - .byte4 decide__Q33scn19challengefileselect11StaffCreditFv - .byte4 isAnimEnd__Q33scn19challengefileselect11StaffCreditCFv - .byte4 kind__Q33scn19challengefileselect11StaffCreditCFv - .byte4 cursorPane__Q33scn19challengefileselect11StaffCreditFv + .4byte __dt__Q33scn19challengefileselect11StaffCreditFv + .4byte updateFrame__Q33scn19challengefileselect11StaffCreditFv + .4byte appear__Q33scn19challengefileselect11StaffCreditFv + .4byte focus__Q33scn19challengefileselect11StaffCreditFv + .4byte unfocus__Q33scn19challengefileselect11StaffCreditFv + .4byte decide__Q33scn19challengefileselect11StaffCreditFv + .4byte isAnimEnd__Q33scn19challengefileselect11StaffCreditCFv + .4byte kind__Q33scn19challengefileselect11StaffCreditCFv + .4byte cursorPane__Q33scn19challengefileselect11StaffCreditFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/StaffRoll.s b/asm/src/StaffRoll.s index f57805c6..b6b9f55a 100644 --- a/asm/src/StaffRoll.s +++ b/asm/src/StaffRoll.s @@ -2245,31 +2245,31 @@ logoScrollOutTime__Q33scn11staffcredit9StaffRollCFv: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2 POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: - .byte4 $$251814 + .4byte $$251814 .4byte 0 - .byte4 $$251815 + .4byte $$251815 .4byte 0 - .byte4 $$251816 + .4byte $$251816 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$251817 + .4byte $$251817 .4byte 0 - .byte4 $$251818 + .4byte $$251818 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$251819 + .4byte $$251819 .4byte 0 - .byte4 $$251820 + .4byte $$251820 .4byte 0x00000001 - .byte4 $$251821 + .4byte $$251821 .4byte 0x00000001 .4byte 0 .4byte 0 - .byte4 $$251822 + .4byte $$251822 .4byte 0x00000001 .4byte 0 .4byte 0 @@ -2277,23 +2277,23 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$251823 + .4byte $$251823 .4byte 0x00000001 - .byte4 $$251824 + .4byte $$251824 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$251825 + .4byte $$251825 .4byte 0x00000001 - .byte4 $$251826 + .4byte $$251826 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .byte4 $$251827 + .4byte $$251827 .4byte 0x00000001 .4byte 0 .4byte 0 @@ -2301,15 +2301,15 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$251828 + .4byte $$251828 .4byte 0x00000001 - .byte4 $$251829 + .4byte $$251829 .4byte 0x00000001 - .byte4 $$251830 + .4byte $$251830 .4byte 0x00000001 .4byte 0 .4byte 0 - .byte4 $$251831 + .4byte $$251831 .4byte 0x00000001 .4byte 0 .4byte 0 @@ -2317,7 +2317,7 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$251832 + .4byte $$251832 .4byte 0x00000001 .4byte 0 .4byte 0 @@ -2325,15 +2325,15 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$251833 + .4byte $$251833 .4byte 0 - .byte4 $$251834 + .4byte $$251834 .4byte 0x00000001 - .byte4 $$251835 + .4byte $$251835 .4byte 0 - .byte4 $$251836 + .4byte $$251836 .4byte 0x00000001 - .byte4 $$251837 + .4byte $$251837 .4byte 0x00000002 .4byte 0 .4byte 0 @@ -2341,7 +2341,7 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$251838 + .4byte $$251838 .4byte 0x00000001 .4byte 0 .4byte 0 @@ -2349,7 +2349,7 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$251839 + .4byte $$251839 .4byte 0x00000001 .4byte 0 .4byte 0 @@ -2357,7 +2357,7 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$251840 + .4byte $$251840 .4byte 0 .4byte 0 .4byte 0 @@ -2365,7 +2365,7 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$251841 + .4byte $$251841 .4byte 0 .4byte 0 .4byte 0 @@ -2373,7 +2373,7 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 $$251842 + .4byte $$251842 .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/Stage.s b/asm/src/Stage.s index 4984ef2b..cac1af30 100644 --- a/asm/src/Stage.s +++ b/asm/src/Stage.s @@ -1105,7 +1105,7 @@ __sinit_$$3Stage_cpp: /* 80210A70 0020C8B0 4B EA D6 50 */ b __ct__Q34nw4r4math4VEC3Ffff .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3Stage_cpp + .4byte __sinit_$$3Stage_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254734 diff --git a/asm/src/StateAbilityCrash.s b/asm/src/StateAbilityCrash.s index 60fcfe13..7e2f91c5 100644 --- a/asm/src/StateAbilityCrash.s +++ b/asm/src/StateAbilityCrash.s @@ -224,19 +224,19 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage17Stat __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage17StateAbilityCrash$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage17StateAbilityCrash$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage17StateAbilityCrash$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage17StateAbilityCrash$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage17StateAbilityCrash$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6damage17StateAbilityCrash __vt__Q53scn4step4hero6damage17StateAbilityCrash: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6damage17StateAbilityCrashFv - .byte4 procAnim__Q53scn4step4hero6damage17StateAbilityCrashFv - .byte4 procMove__Q53scn4step4hero6damage17StateAbilityCrashFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6damage17StateAbilityCrashFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6damage17StateAbilityCrashFv + .4byte procAnim__Q53scn4step4hero6damage17StateAbilityCrashFv + .4byte procMove__Q53scn4step4hero6damage17StateAbilityCrashFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6damage17StateAbilityCrashFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateAgony.s b/asm/src/StateAgony.s index 7fde475d..b151ba68 100644 --- a/asm/src/StateAgony.s +++ b/asm/src/StateAgony.s @@ -330,12 +330,12 @@ __dt__Q53scn4step5enemy6flamer10StateAgonyFv: __vt__Q53scn4step5enemy6flamer10StateAgony: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6flamer10StateAgonyFv - .byte4 procAnim__Q53scn4step5enemy6flamer10StateAgonyFv - .byte4 procMove__Q53scn4step5enemy6flamer10StateAgonyFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6flamer10StateAgonyFv + .4byte procAnim__Q53scn4step5enemy6flamer10StateAgonyFv + .4byte procMove__Q53scn4step5enemy6flamer10StateAgonyFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257328 diff --git a/asm/src/StateAim.s b/asm/src/StateAim.s index 5408aff0..b2f1b95f 100644 --- a/asm/src/StateAim.s +++ b/asm/src/StateAim.s @@ -515,24 +515,24 @@ __dt__Q53scn4step5enemy6shotzo8StateAimFv: __vt__Q53scn4step5enemy7gigatzo8StateAim: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7gigatzo8StateAimFv - .byte4 procAnim__Q53scn4step5enemy7gigatzo8StateAimFv - .byte4 procMove__Q53scn4step5enemy7gigatzo8StateAimFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7gigatzo8StateAimFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7gigatzo8StateAimFv + .4byte procAnim__Q53scn4step5enemy7gigatzo8StateAimFv + .4byte procMove__Q53scn4step5enemy7gigatzo8StateAimFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7gigatzo8StateAimFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo8StateAim __vt__Q53scn4step5enemy6shotzo8StateAim: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6shotzo8StateAimFv - .byte4 procAnim__Q53scn4step5enemy6shotzo8StateAimFv - .byte4 procMove__Q53scn4step5enemy6shotzo8StateAimFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6shotzo8StateAimFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6shotzo8StateAimFv + .4byte procAnim__Q53scn4step5enemy6shotzo8StateAimFv + .4byte procMove__Q53scn4step5enemy6shotzo8StateAimFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6shotzo8StateAimFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256000 diff --git a/asm/src/StateAirJump.s b/asm/src/StateAirJump.s index 8ff1eb56..34e9c0e8 100644 --- a/asm/src/StateAirJump.s +++ b/asm/src/StateAirJump.s @@ -356,19 +356,19 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12Stat __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateAirJump$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateAirJump$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateAirJump$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateAirJump$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateAirJump$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common12StateAirJump __vt__Q53scn4step4hero6common12StateAirJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common12StateAirJumpFv - .byte4 procAnim__Q53scn4step4hero6common12StateAirJumpFv - .byte4 procMove__Q53scn4step4hero6common12StateAirJumpFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common12StateAirJumpFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common12StateAirJumpFv + .4byte procAnim__Q53scn4step4hero6common12StateAirJumpFv + .4byte procMove__Q53scn4step4hero6common12StateAirJumpFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common12StateAirJumpFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateAirSpin.s b/asm/src/StateAirSpin.s index dadd3e8f..6f417a25 100644 --- a/asm/src/StateAirSpin.s +++ b/asm/src/StateAirSpin.s @@ -198,19 +198,19 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash12State __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash12StateAirSpin$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash12StateAirSpin$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash12StateAirSpin$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash12StateAirSpin$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash12StateAirSpin$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5smash12StateAirSpin __vt__Q53scn4step4hero5smash12StateAirSpin: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5smash12StateAirSpinFv - .byte4 procAnim__Q53scn4step4hero5smash12StateAirSpinFv - .byte4 procMove__Q53scn4step4hero5smash12StateAirSpinFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5smash12StateAirSpinFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5smash12StateAirSpinFv + .4byte procAnim__Q53scn4step4hero5smash12StateAirSpinFv + .4byte procMove__Q53scn4step4hero5smash12StateAirSpinFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5smash12StateAirSpinFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateAllStageClear.s b/asm/src/StateAllStageClear.s index f4ab6f62..000798bc 100644 --- a/asm/src/StateAllStageClear.s +++ b/asm/src/StateAllStageClear.s @@ -230,17 +230,17 @@ __dt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick16St __vt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChangeGrade$$4PQ43scn4step4hero4Hero$$4i$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChangeGrade$$4PQ43scn4step4hero4Hero$$4i$$1Fv - .byte4 create__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChangeGrade$$4PQ43scn4step4hero4Hero$$4i$$1Fv + .4byte __dt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChangeGrade$$4PQ43scn4step4hero4Hero$$4i$$1Fv + .4byte create__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChangeGrade$$4PQ43scn4step4hero4Hero$$4i$$1Fv .global __vt__Q53scn4step4hero7gimmick18StateAllStageClear __vt__Q53scn4step4hero7gimmick18StateAllStageClear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick18StateAllStageClearFv - .byte4 procAnim__Q53scn4step4hero7gimmick18StateAllStageClearFv - .byte4 procMove__Q53scn4step4hero7gimmick18StateAllStageClearFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick18StateAllStageClearFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick18StateAllStageClearFv + .4byte procAnim__Q53scn4step4hero7gimmick18StateAllStageClearFv + .4byte procMove__Q53scn4step4hero7gimmick18StateAllStageClearFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick18StateAllStageClearFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateAngerChase.s b/asm/src/StateAngerChase.s index add262af..f8b4735f 100644 --- a/asm/src/StateAngerChase.s +++ b/asm/src/StateAngerChase.s @@ -578,12 +578,12 @@ lbl_802DA688: __vt__Q53scn4step5enemy6scarfy15StateAngerChase: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6scarfy15StateAngerChaseFv - .byte4 procAnim__Q53scn4step5enemy6scarfy15StateAngerChaseFv - .byte4 procMove__Q53scn4step5enemy6scarfy15StateAngerChaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6scarfy15StateAngerChaseFv + .4byte procAnim__Q53scn4step5enemy6scarfy15StateAngerChaseFv + .4byte procMove__Q53scn4step5enemy6scarfy15StateAngerChaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257207 diff --git a/asm/src/StateAnyWhereIn.s b/asm/src/StateAnyWhereIn.s index b0b329d2..c344d71f 100644 --- a/asm/src/StateAnyWhereIn.s +++ b/asm/src/StateAnyWhereIn.s @@ -699,13 +699,13 @@ lbl_8035F2AC: __vt__Q53scn4step4hero6common15StateAnyWhereIn: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common15StateAnyWhereInFv - .byte4 procAnim__Q53scn4step4hero6common15StateAnyWhereInFv - .byte4 procMove__Q53scn4step4hero6common15StateAnyWhereInFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common15StateAnyWhereInFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common15StateAnyWhereInFv + .4byte procAnim__Q53scn4step4hero6common15StateAnyWhereInFv + .4byte procMove__Q53scn4step4hero6common15StateAnyWhereInFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common15StateAnyWhereInFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/StateAppear.s b/asm/src/StateAppear.s index 425aae73..757de690 100644 --- a/asm/src/StateAppear.s +++ b/asm/src/StateAppear.s @@ -1203,72 +1203,72 @@ $$257483: __vt__Q53scn4step4boss6common11StateAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common11StateAppearFv - .byte4 procAnim__Q53scn4step4boss6common11StateAppearFv - .byte4 procMove__Q53scn4step4boss6common11StateAppearFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common11StateAppearFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6common11StateAppearFv + .4byte procAnim__Q53scn4step4boss6common11StateAppearFv + .4byte procMove__Q53scn4step4boss6common11StateAppearFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common11StateAppearFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah11StateAppear$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah11StateAppear$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss10creditroah11StateAppear __vt__Q53scn4step4boss10creditroah11StateAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss10creditroah11StateAppearFv - .byte4 procAnim__Q53scn4step4boss10creditroah11StateAppearFv - .byte4 procMove__Q53scn4step4boss10creditroah11StateAppearFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss10creditroah11StateAppearFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss10creditroah11StateAppearFv + .4byte procAnim__Q53scn4step4boss10creditroah11StateAppearFv + .4byte procMove__Q53scn4step4boss10creditroah11StateAppearFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss10creditroah11StateAppearFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateWait$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateWait$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateWait$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateWait$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateWait$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateWait$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6whispy11StateAppear __vt__Q53scn4step4boss6whispy11StateAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy11StateAppearFv - .byte4 procAnim__Q53scn4step4boss6whispy11StateAppearFv - .byte4 procMove__Q53scn4step4boss6whispy11StateAppearFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy11StateAppearFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6whispy11StateAppearFv + .4byte procAnim__Q53scn4step4boss6whispy11StateAppearFv + .4byte procMove__Q53scn4step4boss6whispy11StateAppearFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy11StateAppearFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4como11StateAppear __vt__Q53scn4step5enemy4como11StateAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4como11StateAppearFv - .byte4 procAnim__Q53scn4step5enemy4como11StateAppearFv - .byte4 procMove__Q53scn4step5enemy4como11StateAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4como11StateAppearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy4como11StateAppearFv + .4byte procAnim__Q53scn4step5enemy4como11StateAppearFv + .4byte procMove__Q53scn4step5enemy4como11StateAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4como11StateAppearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11whispyapple11StateAppear __vt__Q53scn4step5enemy11whispyapple11StateAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11whispyapple11StateAppearFv - .byte4 procAnim__Q53scn4step5enemy11whispyapple11StateAppearFv - .byte4 procMove__Q53scn4step5enemy11whispyapple11StateAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11whispyapple11StateAppearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11whispyapple11StateAppearFv + .4byte procAnim__Q53scn4step5enemy11whispyapple11StateAppearFv + .4byte procMove__Q53scn4step5enemy11whispyapple11StateAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11whispyapple11StateAppearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257435 diff --git a/asm/src/StateApproach.s b/asm/src/StateApproach.s index c30817d1..00f98a74 100644 --- a/asm/src/StateApproach.s +++ b/asm/src/StateApproach.s @@ -138,10 +138,10 @@ lbl_803C7448: __vt__Q53scn4step4item5state13StateApproach: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4item5state13StateApproachFv - .byte4 procAnim__Q53scn4step4item5state13StateApproachFv - .byte4 procMove__Q53scn4step4item5state13StateApproachFv - .byte4 procFixPos__Q43scn4step4item9StateBaseFv + .4byte __dt__Q53scn4step4item5state13StateApproachFv + .4byte procAnim__Q53scn4step4item5state13StateApproachFv + .4byte procMove__Q53scn4step4item5state13StateApproachFv + .4byte procFixPos__Q43scn4step4item9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255066 diff --git a/asm/src/StateAreaMapDemoFirstPlay.s b/asm/src/StateAreaMapDemoFirstPlay.s index 6921c7f3..754d0a5a 100644 --- a/asm/src/StateAreaMapDemoFirstPlay.s +++ b/asm/src/StateAreaMapDemoFirstPlay.s @@ -162,11 +162,11 @@ procFixPos__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv: __vt__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv - .byte4 procAnim__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv - .byte4 procMove__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv + .4byte procAnim__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv + .4byte procMove__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateAttack.s b/asm/src/StateAttack.s index 0d68a26b..7395d8a7 100644 --- a/asm/src/StateAttack.s +++ b/asm/src/StateAttack.s @@ -7709,391 +7709,391 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14State __vt__Q53scn4step4boss6common11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common11StateAttackFv - .byte4 procAnim__Q53scn4step4boss6common11StateAttackFv - .byte4 procMove__Q53scn4step4boss6common11StateAttackFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common11StateAttackFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6common11StateAttackFv + .4byte procAnim__Q53scn4step4boss6common11StateAttackFv + .4byte procMove__Q53scn4step4boss6common11StateAttackFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common11StateAttackFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss13watergalboros11StateAttack __vt__Q53scn4step4boss13watergalboros11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss13watergalboros11StateAttackFv - .byte4 procAnim__Q53scn4step4boss13watergalboros11StateAttackFv - .byte4 procMove__Q53scn4step4boss13watergalboros11StateAttackFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss13watergalboros11StateAttackFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss13watergalboros11StateAttackFv + .4byte procAnim__Q53scn4step4boss13watergalboros11StateAttackFv + .4byte procMove__Q53scn4step4boss13watergalboros11StateAttackFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss13watergalboros11StateAttackFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble10StateCatch$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble10StateCatch$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble10StateCatch$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble10StateCatch$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble10StateCatch$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble10StateCatch$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9zankibble11StateAttack __vt__Q53scn4step4boss9zankibble11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9zankibble11StateAttackFv - .byte4 procAnim__Q53scn4step4boss9zankibble11StateAttackFv - .byte4 procMove__Q53scn4step4boss9zankibble11StateAttackFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9zankibble11StateAttackFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9zankibble11StateAttackFv + .4byte procAnim__Q53scn4step4boss9zankibble11StateAttackFv + .4byte procMove__Q53scn4step4boss9zankibble11StateAttackFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9zankibble11StateAttackFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight11StateAttack __vt__Q53scn4step5enemy11bladeknight11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11bladeknight11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy11bladeknight11StateAttackFv - .byte4 procMove__Q53scn4step5enemy11bladeknight11StateAttackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11bladeknight11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11bladeknight11StateAttackFv + .4byte procAnim__Q53scn4step5enemy11bladeknight11StateAttackFv + .4byte procMove__Q53scn4step5enemy11bladeknight11StateAttackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11bladeknight11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5bowby11StateAttack __vt__Q53scn4step5enemy5bowby11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5bowby11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy5bowby11StateAttackFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5bowby11StateAttackFv + .4byte procAnim__Q53scn4step5enemy5bowby11StateAttackFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8cappyhat10StateThrow$$4PQ43scn4step5enemy5Enemy$$4Ux$$1 __vt__Q24util99StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8cappyhat10StateThrow$$4PQ43scn4step5enemy5Enemy$$4Ux$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8cappyhat10StateThrow$$4PQ43scn4step5enemy5Enemy$$4Ux$$1Fv - .byte4 create__Q24util99StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8cappyhat10StateThrow$$4PQ43scn4step5enemy5Enemy$$4Ux$$1Fv + .4byte __dt__Q24util99StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8cappyhat10StateThrow$$4PQ43scn4step5enemy5Enemy$$4Ux$$1Fv + .4byte create__Q24util99StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8cappyhat10StateThrow$$4PQ43scn4step5enemy5Enemy$$4Ux$$1Fv .global __vt__Q53scn4step5enemy5cappy11StateAttack __vt__Q53scn4step5enemy5cappy11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5cappy11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy5cappy11StateAttackFv - .byte4 procMove__Q53scn4step5enemy5cappy11StateAttackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5cappy11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5cappy11StateAttackFv + .4byte procAnim__Q53scn4step5enemy5cappy11StateAttackFv + .4byte procMove__Q53scn4step5enemy5cappy11StateAttackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5cappy11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly11StateAttack __vt__Q53scn4step5enemy6chilly11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6chilly11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy6chilly11StateAttackFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6chilly11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6chilly11StateAttackFv + .4byte procAnim__Q53scn4step5enemy6chilly11StateAttackFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6chilly11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4elec11StateAttack __vt__Q53scn4step5enemy4elec11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4elec11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy4elec11StateAttackFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy4elec11StateAttackFv + .4byte procAnim__Q53scn4step5enemy4elec11StateAttackFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer11StateAttack __vt__Q53scn4step5enemy6flamer11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6flamer11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy6flamer11StateAttackFv - .byte4 procMove__Q53scn4step5enemy6flamer11StateAttackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6flamer11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6flamer11StateAttackFv + .4byte procAnim__Q53scn4step5enemy6flamer11StateAttackFv + .4byte procMove__Q53scn4step5enemy6flamer11StateAttackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6flamer11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5foley11StateAttack __vt__Q53scn4step5enemy5foley11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5foley11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy5foley11StateAttackFv - .byte4 procMove__Q53scn4step5enemy5foley11StateAttackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5foley11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5foley11StateAttackFv + .4byte procAnim__Q53scn4step5enemy5foley11StateAttackFv + .4byte procMove__Q53scn4step5enemy5foley11StateAttackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5foley11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gemra11StateAttack __vt__Q53scn4step5enemy5gemra11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5gemra11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy5gemra11StateAttackFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5gemra11StateAttackFv + .4byte procAnim__Q53scn4step5enemy5gemra11StateAttackFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7gigatzo11StateAttack __vt__Q53scn4step5enemy7gigatzo11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7gigatzo11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy7gigatzo11StateAttackFv - .byte4 procMove__Q53scn4step5enemy7gigatzo11StateAttackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7gigatzo11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7gigatzo11StateAttackFv + .4byte procAnim__Q53scn4step5enemy7gigatzo11StateAttackFv + .4byte procMove__Q53scn4step5enemy7gigatzo11StateAttackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7gigatzo11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6juckle11StateAttack __vt__Q53scn4step5enemy6juckle11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6juckle11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy6juckle11StateAttackFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6juckle11StateAttackFv + .4byte procAnim__Q53scn4step5enemy6juckle11StateAttackFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe10StateHadou$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe10StateHadou$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe10StateHadou$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe10StateHadou$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe10StateHadou$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe10StateHadou$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateVulcan$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateVulcan$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateVulcan$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateVulcan$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateVulcan$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateVulcan$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateRising$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateRising$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateRising$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateRising$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateRising$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateRising$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateSpin$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateSpin$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateSpin$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateSpin$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateSpin$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateSpin$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10knucklejoe11StateAttack __vt__Q53scn4step5enemy10knucklejoe11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10knucklejoe11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy10knucklejoe11StateAttackFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10knucklejoe11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10knucklejoe11StateAttackFv + .4byte procAnim__Q53scn4step5enemy10knucklejoe11StateAttackFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10knucklejoe11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer11StateAttack __vt__Q53scn4step5enemy6lanzer11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6lanzer11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy6lanzer11StateAttackFv - .byte4 procMove__Q53scn4step5enemy6lanzer11StateAttackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6lanzer11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6lanzer11StateAttackFv + .4byte procAnim__Q53scn4step5enemy6lanzer11StateAttackFv + .4byte procMove__Q53scn4step5enemy6lanzer11StateAttackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6lanzer11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6leafan11StateAttack __vt__Q53scn4step5enemy6leafan11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6leafan11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy6leafan11StateAttackFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6leafan11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6leafan11StateAttackFv + .4byte procAnim__Q53scn4step5enemy6leafan11StateAttackFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6leafan11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateIdling$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateIdling$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateIdling$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateIdling$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateIdling$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateIdling$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8needlous11StateAttack __vt__Q53scn4step5enemy8needlous11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8needlous11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy8needlous11StateAttackFv - .byte4 procMove__Q53scn4step5enemy8needlous11StateAttackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy8needlous11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8needlous11StateAttackFv + .4byte procAnim__Q53scn4step5enemy8needlous11StateAttackFv + .4byte procMove__Q53scn4step5enemy8needlous11StateAttackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy8needlous11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5rocky11StateAttack __vt__Q53scn4step5enemy5rocky11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5rocky11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy5rocky11StateAttackFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5rocky11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5rocky11StateAttackFv + .4byte procAnim__Q53scn4step5enemy5rocky11StateAttackFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5rocky11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8searches11StateAttack __vt__Q53scn4step5enemy8searches11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8searches11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy8searches11StateAttackFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8searches11StateAttackFv + .4byte procAnim__Q53scn4step5enemy8searches11StateAttackFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9sirkibble11StateAttack __vt__Q53scn4step5enemy9sirkibble11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9sirkibble11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy9sirkibble11StateAttackFv - .byte4 procMove__Q53scn4step5enemy9sirkibble11StateAttackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9sirkibble11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9sirkibble11StateAttackFv + .4byte procAnim__Q53scn4step5enemy9sirkibble11StateAttackFv + .4byte procMove__Q53scn4step5enemy9sirkibble11StateAttackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9sirkibble11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory11StateAttack __vt__Q53scn4step5enemy6sodory11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6sodory11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy6sodory11StateAttackFv - .byte4 procMove__Q53scn4step5enemy6sodory11StateAttackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6sodory11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6sodory11StateAttackFv + .4byte procAnim__Q53scn4step5enemy6sodory11StateAttackFv + .4byte procMove__Q53scn4step5enemy6sodory11StateAttackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6sodory11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sparky11StateAttack __vt__Q53scn4step5enemy6sparky11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6sparky11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy6sparky11StateAttackFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6sparky11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6sparky11StateAttackFv + .4byte procAnim__Q53scn4step5enemy6sparky11StateAttackFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6sparky11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage11StateAttack __vt__Q53scn4step5enemy9tsukikage11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9tsukikage11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy9tsukikage11StateAttackFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9tsukikage11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9tsukikage11StateAttackFv + .4byte procAnim__Q53scn4step5enemy9tsukikage11StateAttackFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9tsukikage11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledoo11StateAttack __vt__Q53scn4step5enemy9waddledoo11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledoo11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy9waddledoo11StateAttackFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9waddledoo11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9waddledoo11StateAttackFv + .4byte procAnim__Q53scn4step5enemy9waddledoo11StateAttackFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9waddledoo11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10watergalbo11StateAttack __vt__Q53scn4step5enemy10watergalbo11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10watergalbo11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy10watergalbo11StateAttackFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10watergalbo11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10watergalbo11StateAttackFv + .4byte procAnim__Q53scn4step5enemy10watergalbo11StateAttackFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10watergalbo11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6whippy11StateAttack __vt__Q53scn4step5enemy6whippy11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6whippy11StateAttackFv - .byte4 procAnim__Q53scn4step5enemy6whippy11StateAttackFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6whippy11StateAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6whippy11StateAttackFv + .4byte procAnim__Q53scn4step5enemy6whippy11StateAttackFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6whippy11StateAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14StateAttackEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14StateAttackEnd$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14StateAttackEnd$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14StateAttackEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14StateAttackEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14StateAttackEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark11StateAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark11StateAttack$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark11StateAttack$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark11StateAttack$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark11StateAttack$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark11StateAttack$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5spark11StateAttack __vt__Q53scn4step4hero5spark11StateAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5spark11StateAttackFv - .byte4 procAnim__Q53scn4step4hero5spark11StateAttackFv - .byte4 procMove__Q53scn4step4hero5spark11StateAttackFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5spark11StateAttackFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5spark11StateAttackFv + .4byte procAnim__Q53scn4step4hero5spark11StateAttackFv + .4byte procMove__Q53scn4step4hero5spark11StateAttackFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5spark11StateAttackFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateAttack1Way.s b/asm/src/StateAttack1Way.s index 97afee40..6d386134 100644 --- a/asm/src/StateAttack1Way.s +++ b/asm/src/StateAttack1Way.s @@ -242,12 +242,12 @@ __dt__Q53scn4step5enemy6owgulf15StateAttack1WayFv: __vt__Q53scn4step5enemy6owgulf15StateAttack1Way: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6owgulf15StateAttack1WayFv - .byte4 procAnim__Q53scn4step5enemy6owgulf15StateAttack1WayFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6owgulf15StateAttack1WayFv + .4byte procAnim__Q53scn4step5enemy6owgulf15StateAttack1WayFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255607 diff --git a/asm/src/StateAttack3Way.s b/asm/src/StateAttack3Way.s index 1d95385b..a97c7caf 100644 --- a/asm/src/StateAttack3Way.s +++ b/asm/src/StateAttack3Way.s @@ -267,12 +267,12 @@ __dt__Q53scn4step5enemy6owgulf15StateAttack3WayFv: __vt__Q53scn4step5enemy6owgulf15StateAttack3Way: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6owgulf15StateAttack3WayFv - .byte4 procAnim__Q53scn4step5enemy6owgulf15StateAttack3WayFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6owgulf15StateAttack3WayFv + .4byte procAnim__Q53scn4step5enemy6owgulf15StateAttack3WayFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255579 diff --git a/asm/src/StateAttackBreath.s b/asm/src/StateAttackBreath.s index 816b2755..d8600916 100644 --- a/asm/src/StateAttackBreath.s +++ b/asm/src/StateAttackBreath.s @@ -159,9 +159,9 @@ lbl_802BA944: __vt__Q53scn4step5enemy7hothead17StateAttackBreath: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7hothead17StateAttackBreathFv - .byte4 procAnim__Q53scn4step5enemy7hothead17StateAttackBreathFv - .byte4 procMove__Q53scn4step5enemy7hothead17StateAttackBreathFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7hothead17StateAttackBreathFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7hothead17StateAttackBreathFv + .4byte procAnim__Q53scn4step5enemy7hothead17StateAttackBreathFv + .4byte procMove__Q53scn4step5enemy7hothead17StateAttackBreathFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7hothead17StateAttackBreathFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateAttackEnd.s b/asm/src/StateAttackEnd.s index afe256ff..82252b2b 100644 --- a/asm/src/StateAttackEnd.s +++ b/asm/src/StateAttackEnd.s @@ -140,11 +140,11 @@ procFixPos__Q53scn4step4hero5spark14StateAttackEndFv: __vt__Q53scn4step4hero5spark14StateAttackEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5spark14StateAttackEndFv - .byte4 procAnim__Q53scn4step4hero5spark14StateAttackEndFv - .byte4 procMove__Q53scn4step4hero5spark14StateAttackEndFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5spark14StateAttackEndFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5spark14StateAttackEndFv + .4byte procAnim__Q53scn4step4hero5spark14StateAttackEndFv + .4byte procMove__Q53scn4step4hero5spark14StateAttackEndFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5spark14StateAttackEndFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateAttackJoint.s b/asm/src/StateAttackJoint.s index b5bb4095..a6e8b0a8 100644 --- a/asm/src/StateAttackJoint.s +++ b/asm/src/StateAttackJoint.s @@ -52,9 +52,9 @@ procFixPos__Q53scn4step4boss13watergalboros16StateAttackJointFv: __vt__Q53scn4step4boss13watergalboros16StateAttackJoint: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss13watergalboros16StateAttackJointFv - .byte4 procAnim__Q53scn4step4boss13watergalboros16StateAttackJointFv - .byte4 procMove__Q53scn4step4boss13watergalboros16StateAttackJointFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss13watergalboros16StateAttackJointFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss13watergalboros16StateAttackJointFv + .4byte procAnim__Q53scn4step4boss13watergalboros16StateAttackJointFv + .4byte procMove__Q53scn4step4boss13watergalboros16StateAttackJointFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss13watergalboros16StateAttackJointFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateAttackOver.s b/asm/src/StateAttackOver.s index 19716301..06cd6c6a 100644 --- a/asm/src/StateAttackOver.s +++ b/asm/src/StateAttackOver.s @@ -388,25 +388,25 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark18State __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark18StateAttackOverEnd$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark18StateAttackOverEnd$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark18StateAttackOverEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark18StateAttackOverEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark18StateAttackOverEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark15StateAttackOver$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark15StateAttackOver$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark15StateAttackOver$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark15StateAttackOver$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark15StateAttackOver$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark15StateAttackOver$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5spark15StateAttackOver __vt__Q53scn4step4hero5spark15StateAttackOver: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5spark15StateAttackOverFv - .byte4 procAnim__Q53scn4step4hero5spark15StateAttackOverFv - .byte4 procMove__Q53scn4step4hero5spark15StateAttackOverFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5spark15StateAttackOverFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5spark15StateAttackOverFv + .4byte procAnim__Q53scn4step4hero5spark15StateAttackOverFv + .4byte procMove__Q53scn4step4hero5spark15StateAttackOverFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5spark15StateAttackOverFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateAttackOverEnd.s b/asm/src/StateAttackOverEnd.s index e7a8c708..65b8d85b 100644 --- a/asm/src/StateAttackOverEnd.s +++ b/asm/src/StateAttackOverEnd.s @@ -84,11 +84,11 @@ procFixPos__Q53scn4step4hero5spark18StateAttackOverEndFv: __vt__Q53scn4step4hero5spark18StateAttackOverEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5spark18StateAttackOverEndFv - .byte4 procAnim__Q53scn4step4hero5spark18StateAttackOverEndFv - .byte4 procMove__Q53scn4step4hero5spark18StateAttackOverEndFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5spark18StateAttackOverEndFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5spark18StateAttackOverEndFv + .4byte procAnim__Q53scn4step4hero5spark18StateAttackOverEndFv + .4byte procMove__Q53scn4step4hero5spark18StateAttackOverEndFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5spark18StateAttackOverEndFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateAttackShot.s b/asm/src/StateAttackShot.s index 372f9de8..417d28f1 100644 --- a/asm/src/StateAttackShot.s +++ b/asm/src/StateAttackShot.s @@ -354,12 +354,12 @@ reqWeapon__Q53scn4step5enemy7hothead15StateAttackShotFv: __vt__Q53scn4step5enemy7hothead15StateAttackShot: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7hothead15StateAttackShotFv - .byte4 procAnim__Q53scn4step5enemy7hothead15StateAttackShotFv - .byte4 procMove__Q53scn4step5enemy7hothead15StateAttackShotFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7hothead15StateAttackShotFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7hothead15StateAttackShotFv + .4byte procAnim__Q53scn4step5enemy7hothead15StateAttackShotFv + .4byte procMove__Q53scn4step5enemy7hothead15StateAttackShotFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7hothead15StateAttackShotFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257616 diff --git a/asm/src/StateAttackUnder.s b/asm/src/StateAttackUnder.s index 6c1b50ed..3af0c08f 100644 --- a/asm/src/StateAttackUnder.s +++ b/asm/src/StateAttackUnder.s @@ -398,25 +398,25 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark19State __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark19StateAttackUnderEnd$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark19StateAttackUnderEnd$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark19StateAttackUnderEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark19StateAttackUnderEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark19StateAttackUnderEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark16StateAttackUnder$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark16StateAttackUnder$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark16StateAttackUnder$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark16StateAttackUnder$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark16StateAttackUnder$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark16StateAttackUnder$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5spark16StateAttackUnder __vt__Q53scn4step4hero5spark16StateAttackUnder: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5spark16StateAttackUnderFv - .byte4 procAnim__Q53scn4step4hero5spark16StateAttackUnderFv - .byte4 procMove__Q53scn4step4hero5spark16StateAttackUnderFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5spark16StateAttackUnderFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5spark16StateAttackUnderFv + .4byte procAnim__Q53scn4step4hero5spark16StateAttackUnderFv + .4byte procMove__Q53scn4step4hero5spark16StateAttackUnderFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5spark16StateAttackUnderFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateAttackUnderEnd.s b/asm/src/StateAttackUnderEnd.s index 26f7138e..b6aeaaed 100644 --- a/asm/src/StateAttackUnderEnd.s +++ b/asm/src/StateAttackUnderEnd.s @@ -84,11 +84,11 @@ procFixPos__Q53scn4step4hero5spark19StateAttackUnderEndFv: __vt__Q53scn4step4hero5spark19StateAttackUnderEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5spark19StateAttackUnderEndFv - .byte4 procAnim__Q53scn4step4hero5spark19StateAttackUnderEndFv - .byte4 procMove__Q53scn4step4hero5spark19StateAttackUnderEndFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5spark19StateAttackUnderEndFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5spark19StateAttackUnderEndFv + .4byte procAnim__Q53scn4step4hero5spark19StateAttackUnderEndFv + .4byte procMove__Q53scn4step4hero5spark19StateAttackUnderEndFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5spark19StateAttackUnderEndFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateBack.s b/asm/src/StateBack.s index 5ebb2838..d4cd26f8 100644 --- a/asm/src/StateBack.s +++ b/asm/src/StateBack.s @@ -394,24 +394,24 @@ procFixPos__Q53scn4step5enemy8dubiorjr9StateBackFv: __vt__Q53scn4step5enemy4como9StateBack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4como9StateBackFv - .byte4 procAnim__Q53scn4step5enemy4como9StateBackFv - .byte4 procMove__Q53scn4step5enemy4como9StateBackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4como9StateBackFv - .byte4 procObjCollReact__Q53scn4step5enemy4como9StateBackFv + .4byte __dt__Q53scn4step5enemy4como9StateBackFv + .4byte procAnim__Q53scn4step5enemy4como9StateBackFv + .4byte procMove__Q53scn4step5enemy4como9StateBackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4como9StateBackFv + .4byte procObjCollReact__Q53scn4step5enemy4como9StateBackFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8dubiorjr9StateBack __vt__Q53scn4step5enemy8dubiorjr9StateBack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8dubiorjr9StateBackFv - .byte4 procAnim__Q53scn4step5enemy8dubiorjr9StateBackFv - .byte4 procMove__Q53scn4step5enemy8dubiorjr9StateBackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy8dubiorjr9StateBackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8dubiorjr9StateBackFv + .4byte procAnim__Q53scn4step5enemy8dubiorjr9StateBackFv + .4byte procMove__Q53scn4step5enemy8dubiorjr9StateBackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy8dubiorjr9StateBackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255315 diff --git a/asm/src/StateBackCircle.s b/asm/src/StateBackCircle.s index a942d97f..b0d433fb 100644 --- a/asm/src/StateBackCircle.s +++ b/asm/src/StateBackCircle.s @@ -367,12 +367,12 @@ lbl_802F2B28: __vt__Q53scn4step5enemy15zankibblecutter15StateBackCircle: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy15zankibblecutter15StateBackCircleFv - .byte4 procAnim__Q53scn4step5enemy15zankibblecutter15StateBackCircleFv - .byte4 procMove__Q53scn4step5enemy15zankibblecutter15StateBackCircleFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy15zankibblecutter15StateBackCircleFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy15zankibblecutter15StateBackCircleFv + .4byte procAnim__Q53scn4step5enemy15zankibblecutter15StateBackCircleFv + .4byte procMove__Q53scn4step5enemy15zankibblecutter15StateBackCircleFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy15zankibblecutter15StateBackCircleFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256131 diff --git a/asm/src/StateBase.s b/asm/src/StateBase.s index d2f01be8..d8e68bb7 100644 --- a/asm/src/StateBase.s +++ b/asm/src/StateBase.s @@ -281,37 +281,37 @@ lbl_803D89A8: __vt__Q43scn4step4boss9StateBase: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4boss9StateBaseFv - .byte4 procAnim__Q43scn4step4boss9StateBaseFv - .byte4 procMove__Q43scn4step4boss9StateBaseFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q43scn4step4boss9StateBaseFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q43scn4step4boss9StateBaseFv + .4byte procAnim__Q43scn4step4boss9StateBaseFv + .4byte procMove__Q43scn4step4boss9StateBaseFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q43scn4step4boss9StateBaseFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy9StateBase __vt__Q43scn4step5enemy9StateBase: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step5enemy9StateBaseFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q43scn4step5enemy9StateBaseFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero9StateBase __vt__Q43scn4step4hero9StateBase: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4hero9StateBaseFv - .byte4 procAnim__Q43scn4step4hero9StateBaseFv - .byte4 procMove__Q43scn4step4hero9StateBaseFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q43scn4step4hero9StateBaseFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q43scn4step4hero9StateBaseFv + .4byte procAnim__Q43scn4step4hero9StateBaseFv + .4byte procMove__Q43scn4step4hero9StateBaseFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q43scn4step4hero9StateBaseFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -319,19 +319,19 @@ __vt__Q43scn4step4hero9StateBase: __vt__Q43scn4step4item9StateBase: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4item9StateBaseFv - .byte4 procAnim__Q43scn4step4item9StateBaseFv - .byte4 procMove__Q43scn4step4item9StateBaseFv - .byte4 procFixPos__Q43scn4step4item9StateBaseFv + .4byte __dt__Q43scn4step4item9StateBaseFv + .4byte procAnim__Q43scn4step4item9StateBaseFv + .4byte procMove__Q43scn4step4item9StateBaseFv + .4byte procFixPos__Q43scn4step4item9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon9StateBase __vt__Q43scn4step6weapon9StateBase: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step6weapon9StateBaseFv - .byte4 procAnim__Q43scn4step6weapon9StateBaseFv - .byte4 procMove__Q43scn4step6weapon9StateBaseFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q43scn4step6weapon9StateBaseFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q43scn4step6weapon9StateBaseFv + .4byte procAnim__Q43scn4step6weapon9StateBaseFv + .4byte procMove__Q43scn4step6weapon9StateBaseFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q43scn4step6weapon9StateBaseFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv diff --git a/asm/src/StateBodyHit.s b/asm/src/StateBodyHit.s index 3bf6424e..b04054d7 100644 --- a/asm/src/StateBodyHit.s +++ b/asm/src/StateBodyHit.s @@ -179,13 +179,13 @@ lbl_80375AC0: __vt__Q53scn4step4hero6damage12StateBodyHit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6damage12StateBodyHitFv - .byte4 procAnim__Q53scn4step4hero6damage12StateBodyHitFv - .byte4 procMove__Q53scn4step4hero6damage12StateBodyHitFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6damage12StateBodyHitFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6damage12StateBodyHitFv + .4byte procAnim__Q53scn4step4hero6damage12StateBodyHitFv + .4byte procMove__Q53scn4step4hero6damage12StateBodyHitFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6damage12StateBodyHitFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateBomb.s b/asm/src/StateBomb.s index 8ad3d7df..d6e13801 100644 --- a/asm/src/StateBomb.s +++ b/asm/src/StateBomb.s @@ -270,9 +270,9 @@ lbl_80238104: __vt__Q53scn4step4boss7bonkers9StateBomb: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss7bonkers9StateBombFv - .byte4 procAnim__Q53scn4step4boss7bonkers9StateBombFv - .byte4 procMove__Q53scn4step4boss7bonkers9StateBombFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss7bonkers9StateBombFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss7bonkers9StateBombFv + .4byte procAnim__Q53scn4step4boss7bonkers9StateBombFv + .4byte procMove__Q53scn4step4boss7bonkers9StateBombFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss7bonkers9StateBombFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateBombStart.s b/asm/src/StateBombStart.s index 3429e2b2..9969984d 100644 --- a/asm/src/StateBombStart.s +++ b/asm/src/StateBombStart.s @@ -68,9 +68,9 @@ procFixPos__Q53scn4step4boss7bonkers14StateBombStartFv: __vt__Q53scn4step4boss7bonkers14StateBombStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss7bonkers14StateBombStartFv - .byte4 procAnim__Q53scn4step4boss7bonkers14StateBombStartFv - .byte4 procMove__Q53scn4step4boss7bonkers14StateBombStartFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss7bonkers14StateBombStartFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss7bonkers14StateBombStartFv + .4byte procAnim__Q53scn4step4boss7bonkers14StateBombStartFv + .4byte procMove__Q53scn4step4boss7bonkers14StateBombStartFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss7bonkers14StateBombStartFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateBossDemoStart.s b/asm/src/StateBossDemoStart.s index 262feddc..60c37d21 100644 --- a/asm/src/StateBossDemoStart.s +++ b/asm/src/StateBossDemoStart.s @@ -20,5 +20,5 @@ __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo17S __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo17StateBossDemoWait$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo17StateBossDemoWait$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo17StateBossDemoWait$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo17StateBossDemoWait$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo17StateBossDemoWait$$4PQ43scn4step4hero4Hero$$1Fv diff --git a/asm/src/StateBossDemoWait.s b/asm/src/StateBossDemoWait.s index 31334c15..54b5ab9d 100644 --- a/asm/src/StateBossDemoWait.s +++ b/asm/src/StateBossDemoWait.s @@ -1140,13 +1140,13 @@ $$260245: __vt__Q53scn4step4hero8bossdemo17StateBossDemoWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero8bossdemo17StateBossDemoWaitFv - .byte4 procAnim__Q53scn4step4hero8bossdemo17StateBossDemoWaitFv - .byte4 procMove__Q53scn4step4hero8bossdemo17StateBossDemoWaitFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero8bossdemo17StateBossDemoWaitFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero8bossdemo17StateBossDemoWaitFv + .4byte procAnim__Q53scn4step4hero8bossdemo17StateBossDemoWaitFv + .4byte procMove__Q53scn4step4hero8bossdemo17StateBossDemoWaitFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero8bossdemo17StateBossDemoWaitFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateBound.s b/asm/src/StateBound.s index 043829b9..bae19e63 100644 --- a/asm/src/StateBound.s +++ b/asm/src/StateBound.s @@ -687,22 +687,22 @@ lbl_803C7884: __vt__Q53scn4step5enemy10stareffect10StateBound: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10stareffect10StateBoundFv - .byte4 procAnim__Q53scn4step5enemy10stareffect10StateBoundFv - .byte4 procMove__Q53scn4step5enemy10stareffect10StateBoundFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10stareffect10StateBoundFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10stareffect10StateBoundFv + .4byte procAnim__Q53scn4step5enemy10stareffect10StateBoundFv + .4byte procMove__Q53scn4step5enemy10stareffect10StateBoundFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10stareffect10StateBoundFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state10StateBound __vt__Q53scn4step4item5state10StateBound: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4item5state10StateBoundFv - .byte4 procAnim__Q53scn4step4item5state10StateBoundFv - .byte4 procMove__Q53scn4step4item5state10StateBoundFv - .byte4 procFixPos__Q53scn4step4item5state10StateBoundFv + .4byte __dt__Q53scn4step4item5state10StateBoundFv + .4byte procAnim__Q53scn4step4item5state10StateBoundFv + .4byte procMove__Q53scn4step4item5state10StateBoundFv + .4byte procFixPos__Q53scn4step4item5state10StateBoundFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257606 diff --git a/asm/src/StateBound1.s b/asm/src/StateBound1.s index 7b4daf84..09dee443 100644 --- a/asm/src/StateBound1.s +++ b/asm/src/StateBound1.s @@ -341,24 +341,24 @@ __dt__Q24util106StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy11whispyapp __vt__Q24util106StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple14StateBoundNear$$4PQ43scn4step5enemy5Enemy$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple14StateBoundNear$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv - .byte4 create__Q24util106StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple14StateBoundNear$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv + .4byte __dt__Q24util106StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple14StateBoundNear$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv + .4byte create__Q24util106StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple14StateBoundNear$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv .global __vt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound2$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1 __vt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound2$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound2$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1Fv - .byte4 create__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound2$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1Fv + .4byte __dt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound2$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1Fv + .4byte create__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound2$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1Fv .global __vt__Q53scn4step5enemy11whispyapple11StateBound1 __vt__Q53scn4step5enemy11whispyapple11StateBound1: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11whispyapple11StateBound1Fv - .byte4 procAnim__Q53scn4step5enemy11whispyapple11StateBound1Fv - .byte4 procMove__Q53scn4step5enemy11whispyapple11StateBound1Fv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11whispyapple11StateBound1Fv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11whispyapple11StateBound1Fv + .4byte procAnim__Q53scn4step5enemy11whispyapple11StateBound1Fv + .4byte procMove__Q53scn4step5enemy11whispyapple11StateBound1Fv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11whispyapple11StateBound1Fv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256704 diff --git a/asm/src/StateBound2.s b/asm/src/StateBound2.s index 6249d066..a27bf3d4 100644 --- a/asm/src/StateBound2.s +++ b/asm/src/StateBound2.s @@ -224,12 +224,12 @@ lbl_802F1AC4: __vt__Q53scn4step5enemy11whispyapple11StateBound2: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11whispyapple11StateBound2Fv - .byte4 procAnim__Q53scn4step5enemy11whispyapple11StateBound2Fv - .byte4 procMove__Q53scn4step5enemy11whispyapple11StateBound2Fv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11whispyapple11StateBound2Fv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11whispyapple11StateBound2Fv + .4byte procAnim__Q53scn4step5enemy11whispyapple11StateBound2Fv + .4byte procMove__Q53scn4step5enemy11whispyapple11StateBound2Fv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11whispyapple11StateBound2Fv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256621 diff --git a/asm/src/StateBoundNear.s b/asm/src/StateBoundNear.s index 10a6d488..3ad89343 100644 --- a/asm/src/StateBoundNear.s +++ b/asm/src/StateBoundNear.s @@ -291,12 +291,12 @@ lbl_802F1EC8: __vt__Q53scn4step5enemy11whispyapple14StateBoundNear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11whispyapple14StateBoundNearFv - .byte4 procAnim__Q53scn4step5enemy11whispyapple14StateBoundNearFv - .byte4 procMove__Q53scn4step5enemy11whispyapple14StateBoundNearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11whispyapple14StateBoundNearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11whispyapple14StateBoundNearFv + .4byte procAnim__Q53scn4step5enemy11whispyapple14StateBoundNearFv + .4byte procMove__Q53scn4step5enemy11whispyapple14StateBoundNearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11whispyapple14StateBoundNearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256802 diff --git a/asm/src/StateCall.s b/asm/src/StateCall.s index ab3a6b95..af5f9c9b 100644 --- a/asm/src/StateCall.s +++ b/asm/src/StateCall.s @@ -536,12 +536,12 @@ lbl_8024DFD4: __vt__Q53scn4step4boss6dubior9StateCall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6dubior9StateCallFv - .byte4 procAnim__Q53scn4step4boss6dubior9StateCallFv - .byte4 procMove__Q53scn4step4boss6dubior9StateCallFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6dubior9StateCallFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6dubior9StateCallFv + .4byte procAnim__Q53scn4step4boss6dubior9StateCallFv + .4byte procMove__Q53scn4step4boss6dubior9StateCallFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6dubior9StateCallFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256053 diff --git a/asm/src/StateCallback.s b/asm/src/StateCallback.s index 45ce8c98..3076c943 100644 --- a/asm/src/StateCallback.s +++ b/asm/src/StateCallback.s @@ -376,37 +376,37 @@ __dt__Q43scn4step6weapon13StateCallbackFv: __vt__Q43scn4step4boss13StateCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4boss13StateCallbackFv - .byte4 onStateChanged__Q43scn4step4boss13StateCallbackFRCQ24util13IStateChanger + .4byte __dt__Q43scn4step4boss13StateCallbackFv + .4byte onStateChanged__Q43scn4step4boss13StateCallbackFRCQ24util13IStateChanger .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy13StateCallback __vt__Q43scn4step5enemy13StateCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step5enemy13StateCallbackFv - .byte4 onStateChanged__Q43scn4step5enemy13StateCallbackFRCQ24util13IStateChanger + .4byte __dt__Q43scn4step5enemy13StateCallbackFv + .4byte onStateChanged__Q43scn4step5enemy13StateCallbackFRCQ24util13IStateChanger .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero13StateCallback __vt__Q43scn4step4hero13StateCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4hero13StateCallbackFv - .byte4 onStateChanged__Q43scn4step4hero13StateCallbackFRCQ24util13IStateChanger + .4byte __dt__Q43scn4step4hero13StateCallbackFv + .4byte onStateChanged__Q43scn4step4hero13StateCallbackFRCQ24util13IStateChanger .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4item13StateCallback __vt__Q43scn4step4item13StateCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4item13StateCallbackFv - .byte4 onStateChanged__Q43scn4step4item13StateCallbackFRCQ24util13IStateChanger + .4byte __dt__Q43scn4step4item13StateCallbackFv + .4byte onStateChanged__Q43scn4step4item13StateCallbackFRCQ24util13IStateChanger .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon13StateCallback __vt__Q43scn4step6weapon13StateCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step6weapon13StateCallbackFv - .byte4 onStateChanged__Q43scn4step6weapon13StateCallbackFRCQ24util13IStateChanger + .4byte __dt__Q43scn4step6weapon13StateCallbackFv + .4byte onStateChanged__Q43scn4step6weapon13StateCallbackFRCQ24util13IStateChanger diff --git a/asm/src/StateCapture.s b/asm/src/StateCapture.s index 830b02cb..0763a1df 100644 --- a/asm/src/StateCapture.s +++ b/asm/src/StateCapture.s @@ -334,33 +334,33 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12Stat __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1Fv - .byte4 create__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1Fv + .4byte __dt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1Fv + .4byte create__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1Fv .global __vt__Q53scn4step4boss13watergalboros12StateCapture __vt__Q53scn4step4boss13watergalboros12StateCapture: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss13watergalboros12StateCaptureFv - .byte4 procAnim__Q53scn4step4boss13watergalboros12StateCaptureFv - .byte4 procMove__Q53scn4step4boss13watergalboros12StateCaptureFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss13watergalboros12StateCaptureFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss13watergalboros12StateCaptureFv + .4byte procAnim__Q53scn4step4boss13watergalboros12StateCaptureFv + .4byte procMove__Q53scn4step4boss13watergalboros12StateCaptureFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss13watergalboros12StateCaptureFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateChewing$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateChewing$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateChewing$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateChewing$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateChewing$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateChewing$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6whispy12StateCapture __vt__Q53scn4step4boss6whispy12StateCapture: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy12StateCaptureFv - .byte4 procAnim__Q53scn4step4boss6whispy12StateCaptureFv - .byte4 procMove__Q53scn4step4boss6whispy12StateCaptureFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy12StateCaptureFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6whispy12StateCaptureFv + .4byte procAnim__Q53scn4step4boss6whispy12StateCaptureFv + .4byte procMove__Q53scn4step4boss6whispy12StateCaptureFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy12StateCaptureFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateCaptureAttack.s b/asm/src/StateCaptureAttack.s index 3f28a145..fb321593 100644 --- a/asm/src/StateCaptureAttack.s +++ b/asm/src/StateCaptureAttack.s @@ -290,15 +290,15 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalbo __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateCapture$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateCapture$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateCapture$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateCapture$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateCapture$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss13watergalboros18StateCaptureAttack __vt__Q53scn4step4boss13watergalboros18StateCaptureAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss13watergalboros18StateCaptureAttackFv - .byte4 procAnim__Q53scn4step4boss13watergalboros18StateCaptureAttackFv - .byte4 procMove__Q53scn4step4boss13watergalboros18StateCaptureAttackFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q43scn4step4boss9StateBaseFv - .byte4 procObjCollReact__Q53scn4step4boss13watergalboros18StateCaptureAttackFv + .4byte __dt__Q53scn4step4boss13watergalboros18StateCaptureAttackFv + .4byte procAnim__Q53scn4step4boss13watergalboros18StateCaptureAttackFv + .4byte procMove__Q53scn4step4boss13watergalboros18StateCaptureAttackFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q43scn4step4boss9StateBaseFv + .4byte procObjCollReact__Q53scn4step4boss13watergalboros18StateCaptureAttackFv diff --git a/asm/src/StateCapturedFighter.s b/asm/src/StateCapturedFighter.s index cd5c8dfb..f9811d2a 100644 --- a/asm/src/StateCapturedFighter.s +++ b/asm/src/StateCapturedFighter.s @@ -303,24 +303,24 @@ __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage18St __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateThrownFighter$$4PQ43scn4step5enemy5Enemy$$4Ux$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateThrownFighter$$4PQ43scn4step5enemy5Enemy$$4Ux$$1Fv - .byte4 create__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateThrownFighter$$4PQ43scn4step5enemy5Enemy$$4Ux$$1Fv + .4byte __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateThrownFighter$$4PQ43scn4step5enemy5Enemy$$4Ux$$1Fv + .4byte create__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateThrownFighter$$4PQ43scn4step5enemy5Enemy$$4Ux$$1Fv .global __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage23StateDeadCaptureRelease$$4PQ43scn4step5enemy5Enemy$$4b$$1 __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage23StateDeadCaptureRelease$$4PQ43scn4step5enemy5Enemy$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage23StateDeadCaptureRelease$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv - .byte4 create__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage23StateDeadCaptureRelease$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv + .4byte __dt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage23StateDeadCaptureRelease$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv + .4byte create__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage23StateDeadCaptureRelease$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv .global __vt__Q53scn4step5enemy8captured20StateCapturedFighter __vt__Q53scn4step5enemy8captured20StateCapturedFighter: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8captured20StateCapturedFighterFv - .byte4 procAnim__Q53scn4step5enemy8captured20StateCapturedFighterFv - .byte4 procMove__Q53scn4step5enemy8captured20StateCapturedFighterFv - .byte4 procConstraint__Q53scn4step5enemy8captured20StateCapturedFighterFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8captured20StateCapturedFighterFv + .4byte procAnim__Q53scn4step5enemy8captured20StateCapturedFighterFv + .4byte procMove__Q53scn4step5enemy8captured20StateCapturedFighterFv + .4byte procConstraint__Q53scn4step5enemy8captured20StateCapturedFighterFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255917 diff --git a/asm/src/StateCapturedParasol.s b/asm/src/StateCapturedParasol.s index da8a45fd..c5cdcc3c 100644 --- a/asm/src/StateCapturedParasol.s +++ b/asm/src/StateCapturedParasol.s @@ -388,18 +388,18 @@ __dt__Q24util109StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6damage19St __vt__Q24util109StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateParasolRelease$$4PQ43scn4step5enemy5Enemy$$4Ux$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util109StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateParasolRelease$$4PQ43scn4step5enemy5Enemy$$4Ux$$4Ul$$1Fv - .byte4 create__Q24util109StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateParasolRelease$$4PQ43scn4step5enemy5Enemy$$4Ux$$4Ul$$1Fv + .4byte __dt__Q24util109StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateParasolRelease$$4PQ43scn4step5enemy5Enemy$$4Ux$$4Ul$$1Fv + .4byte create__Q24util109StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateParasolRelease$$4PQ43scn4step5enemy5Enemy$$4Ux$$4Ul$$1Fv .global __vt__Q53scn4step5enemy8captured20StateCapturedParasol __vt__Q53scn4step5enemy8captured20StateCapturedParasol: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8captured20StateCapturedParasolFv - .byte4 procAnim__Q53scn4step5enemy8captured20StateCapturedParasolFv - .byte4 procMove__Q53scn4step5enemy8captured20StateCapturedParasolFv - .byte4 procConstraint__Q53scn4step5enemy8captured20StateCapturedParasolFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8captured20StateCapturedParasolFv + .4byte procAnim__Q53scn4step5enemy8captured20StateCapturedParasolFv + .4byte procMove__Q53scn4step5enemy8captured20StateCapturedParasolFv + .4byte procConstraint__Q53scn4step5enemy8captured20StateCapturedParasolFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256967 diff --git a/asm/src/StateCapturedWaterGalborosEat.s b/asm/src/StateCapturedWaterGalborosEat.s index 9e8ec909..e93c67b0 100644 --- a/asm/src/StateCapturedWaterGalborosEat.s +++ b/asm/src/StateCapturedWaterGalborosEat.s @@ -215,13 +215,13 @@ procFixPos__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv: __vt__Q53scn4step4hero8captured29StateCapturedWaterGalborosEat: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv - .byte4 procAnim__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv - .byte4 procMove__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv + .4byte procAnim__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv + .4byte procMove__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateCapturedWaterGalborosVomit.s b/asm/src/StateCapturedWaterGalborosVomit.s index 442fd3ec..7fd09a0f 100644 --- a/asm/src/StateCapturedWaterGalborosVomit.s +++ b/asm/src/StateCapturedWaterGalborosVomit.s @@ -317,13 +317,13 @@ lbl_803845A0: __vt__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomitFv - .byte4 procAnim__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomitFv - .byte4 procMove__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomitFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomitFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomitFv + .4byte procAnim__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomitFv + .4byte procMove__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomitFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomitFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateCapturedWhip.s b/asm/src/StateCapturedWhip.s index b0c3f145..a3edf820 100644 --- a/asm/src/StateCapturedWhip.s +++ b/asm/src/StateCapturedWhip.s @@ -339,18 +339,18 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18St __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageCapture$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageCapture$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageCapture$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageCapture$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageCapture$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8captured17StateCapturedWhip __vt__Q53scn4step5enemy8captured17StateCapturedWhip: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8captured17StateCapturedWhipFv - .byte4 procAnim__Q53scn4step5enemy8captured17StateCapturedWhipFv - .byte4 procMove__Q53scn4step5enemy8captured17StateCapturedWhipFv - .byte4 procConstraint__Q53scn4step5enemy8captured17StateCapturedWhipFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8captured17StateCapturedWhipFv + .4byte procAnim__Q53scn4step5enemy8captured17StateCapturedWhipFv + .4byte procMove__Q53scn4step5enemy8captured17StateCapturedWhipFv + .4byte procConstraint__Q53scn4step5enemy8captured17StateCapturedWhipFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256311 diff --git a/asm/src/StateCapturedWhispyChewing.s b/asm/src/StateCapturedWhispyChewing.s index 89ba8376..fc365925 100644 --- a/asm/src/StateCapturedWhispyChewing.s +++ b/asm/src/StateCapturedWhispyChewing.s @@ -116,11 +116,11 @@ procFixPos__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv: __vt__Q53scn4step4hero8captured26StateCapturedWhispyChewing: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv - .byte4 procAnim__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv - .byte4 procMove__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv + .4byte procAnim__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv + .4byte procMove__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateCapturedWhispyRelease.s b/asm/src/StateCapturedWhispyRelease.s index 118b1055..1ff98820 100644 --- a/asm/src/StateCapturedWhispyRelease.s +++ b/asm/src/StateCapturedWhispyRelease.s @@ -181,11 +181,11 @@ procFixPos__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv: __vt__Q53scn4step4hero8captured26StateCapturedWhispyRelease: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv - .byte4 procAnim__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv - .byte4 procMove__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv + .4byte procAnim__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv + .4byte procMove__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateCapturedWhispyVacuum.s b/asm/src/StateCapturedWhispyVacuum.s index ac7b4c30..d0267be0 100644 --- a/asm/src/StateCapturedWhispyVacuum.s +++ b/asm/src/StateCapturedWhispyVacuum.s @@ -267,19 +267,19 @@ __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26S __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyChewing$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyChewing$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyChewing$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyChewing$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyChewing$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero8captured25StateCapturedWhispyVacuum __vt__Q53scn4step4hero8captured25StateCapturedWhispyVacuum: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero8captured25StateCapturedWhispyVacuumFv - .byte4 procAnim__Q53scn4step4hero8captured25StateCapturedWhispyVacuumFv - .byte4 procMove__Q53scn4step4hero8captured25StateCapturedWhispyVacuumFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero8captured25StateCapturedWhispyVacuumFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero8captured25StateCapturedWhispyVacuumFv + .4byte procAnim__Q53scn4step4hero8captured25StateCapturedWhispyVacuumFv + .4byte procMove__Q53scn4step4hero8captured25StateCapturedWhispyVacuumFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero8captured25StateCapturedWhispyVacuumFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateCapturedWhispyVomit.s b/asm/src/StateCapturedWhispyVomit.s index 8189a3a8..1d27c050 100644 --- a/asm/src/StateCapturedWhispyVomit.s +++ b/asm/src/StateCapturedWhispyVomit.s @@ -251,17 +251,17 @@ __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29S __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWhispyVomitBound$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWhispyVomitBound$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWhispyVomitBound$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWhispyVomitBound$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWhispyVomitBound$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero8captured24StateCapturedWhispyVomit __vt__Q53scn4step4hero8captured24StateCapturedWhispyVomit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero8captured24StateCapturedWhispyVomitFv - .byte4 procAnim__Q53scn4step4hero8captured24StateCapturedWhispyVomitFv - .byte4 procMove__Q53scn4step4hero8captured24StateCapturedWhispyVomitFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero8captured24StateCapturedWhispyVomitFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero8captured24StateCapturedWhispyVomitFv + .4byte procAnim__Q53scn4step4hero8captured24StateCapturedWhispyVomitFv + .4byte procMove__Q53scn4step4hero8captured24StateCapturedWhispyVomitFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero8captured24StateCapturedWhispyVomitFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateCapturedWhispyVomitBound.s b/asm/src/StateCapturedWhispyVomitBound.s index 1aa1cb7e..bafb2e8d 100644 --- a/asm/src/StateCapturedWhispyVomitBound.s +++ b/asm/src/StateCapturedWhispyVomitBound.s @@ -379,13 +379,13 @@ lbl_80385614: __vt__Q53scn4step4hero8captured29StateCapturedWhispyVomitBound: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero8captured29StateCapturedWhispyVomitBoundFv - .byte4 procAnim__Q53scn4step4hero8captured29StateCapturedWhispyVomitBoundFv - .byte4 procMove__Q53scn4step4hero8captured29StateCapturedWhispyVomitBoundFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero8captured29StateCapturedWhispyVomitBoundFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero8captured29StateCapturedWhispyVomitBoundFv + .4byte procAnim__Q53scn4step4hero8captured29StateCapturedWhispyVomitBoundFv + .4byte procMove__Q53scn4step4hero8captured29StateCapturedWhispyVomitBoundFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero8captured29StateCapturedWhispyVomitBoundFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateCapturedWhispyVomitSoft.s b/asm/src/StateCapturedWhispyVomitSoft.s index 61086ee6..132e0211 100644 --- a/asm/src/StateCapturedWhispyVomitSoft.s +++ b/asm/src/StateCapturedWhispyVomitSoft.s @@ -309,13 +309,13 @@ lbl_80385A8C: __vt__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoftFv - .byte4 procAnim__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoftFv - .byte4 procMove__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoftFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoftFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoftFv + .4byte procAnim__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoftFv + .4byte procMove__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoftFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoftFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateCatch.s b/asm/src/StateCatch.s index b6d37edb..588508eb 100644 --- a/asm/src/StateCatch.s +++ b/asm/src/StateCatch.s @@ -785,55 +785,55 @@ __dt__Q24util96StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7fighter10Sta __vt__Q53scn4step4boss9zankibble10StateCatch: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9zankibble10StateCatchFv - .byte4 procAnim__Q53scn4step4boss9zankibble10StateCatchFv - .byte4 procMove__Q53scn4step4boss9zankibble10StateCatchFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9zankibble10StateCatchFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9zankibble10StateCatchFv + .4byte procAnim__Q53scn4step4boss9zankibble10StateCatchFv + .4byte procMove__Q53scn4step4boss9zankibble10StateCatchFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9zankibble10StateCatchFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9sirkibble10StateCatch __vt__Q53scn4step5enemy9sirkibble10StateCatch: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9sirkibble10StateCatchFv - .byte4 procAnim__Q53scn4step5enemy9sirkibble10StateCatchFv - .byte4 procMove__Q53scn4step5enemy9sirkibble10StateCatchFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9sirkibble10StateCatchFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9sirkibble10StateCatchFv + .4byte procAnim__Q53scn4step5enemy9sirkibble10StateCatchFv + .4byte procMove__Q53scn4step5enemy9sirkibble10StateCatchFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9sirkibble10StateCatchFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateThrow$$4PQ43scn4step4hero4Hero$$4b$$4b$$1 __vt__Q24util96StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateThrow$$4PQ43scn4step4hero4Hero$$4b$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateThrow$$4PQ43scn4step4hero4Hero$$4b$$4b$$1Fv - .byte4 create__Q24util96StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateThrow$$4PQ43scn4step4hero4Hero$$4b$$4b$$1Fv + .4byte __dt__Q24util96StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateThrow$$4PQ43scn4step4hero4Hero$$4b$$4b$$1Fv + .4byte create__Q24util96StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateThrow$$4PQ43scn4step4hero4Hero$$4b$$4b$$1Fv .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedFighter$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedFighter$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedFighter$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedFighter$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedFighter$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedFighter$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateCatch$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateCatch$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateCatch$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateCatch$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateCatch$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateCatch$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7fighter10StateCatch __vt__Q53scn4step4hero7fighter10StateCatch: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter10StateCatchFv - .byte4 procAnim__Q53scn4step4hero7fighter10StateCatchFv - .byte4 procMove__Q53scn4step4hero7fighter10StateCatchFv - .byte4 procConstraint__Q53scn4step4hero7fighter10StateCatchFv - .byte4 procFixPos__Q53scn4step4hero7fighter10StateCatchFv - .byte4 procObjCollReact__Q53scn4step4hero7fighter10StateCatchFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter10StateCatchFv + .4byte procAnim__Q53scn4step4hero7fighter10StateCatchFv + .4byte procMove__Q53scn4step4hero7fighter10StateCatchFv + .4byte procConstraint__Q53scn4step4hero7fighter10StateCatchFv + .4byte procFixPos__Q53scn4step4hero7fighter10StateCatchFv + .4byte procObjCollReact__Q53scn4step4hero7fighter10StateCatchFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateChallengeBattleLose.s b/asm/src/StateChallengeBattleLose.s index c624fbca..4f5829f8 100644 --- a/asm/src/StateChallengeBattleLose.s +++ b/asm/src/StateChallengeBattleLose.s @@ -1075,13 +1075,13 @@ lbl_80379E84: __vt__Q53scn4step4hero7gimmick24StateChallengeBattleLose: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick24StateChallengeBattleLoseFv - .byte4 procAnim__Q53scn4step4hero7gimmick24StateChallengeBattleLoseFv - .byte4 procMove__Q53scn4step4hero7gimmick24StateChallengeBattleLoseFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick24StateChallengeBattleLoseFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick24StateChallengeBattleLoseFv + .4byte procAnim__Q53scn4step4hero7gimmick24StateChallengeBattleLoseFv + .4byte procMove__Q53scn4step4hero7gimmick24StateChallengeBattleLoseFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick24StateChallengeBattleLoseFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateChallengeBattleWin.s b/asm/src/StateChallengeBattleWin.s index fbc0bdef..1aac5c1a 100644 --- a/asm/src/StateChallengeBattleWin.s +++ b/asm/src/StateChallengeBattleWin.s @@ -619,13 +619,13 @@ sceneChange__Q53scn4step4hero7gimmick23StateChallengeBattleWinFv: __vt__Q53scn4step4hero7gimmick23StateChallengeBattleWin: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick23StateChallengeBattleWinFv - .byte4 procAnim__Q53scn4step4hero7gimmick23StateChallengeBattleWinFv - .byte4 procMove__Q53scn4step4hero7gimmick23StateChallengeBattleWinFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick23StateChallengeBattleWinFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick23StateChallengeBattleWinFv + .4byte procAnim__Q53scn4step4hero7gimmick23StateChallengeBattleWinFv + .4byte procMove__Q53scn4step4hero7gimmick23StateChallengeBattleWinFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick23StateChallengeBattleWinFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/StateChallengeBattleWinPre.s b/asm/src/StateChallengeBattleWinPre.s index 2432f9ad..c22e1e1f 100644 --- a/asm/src/StateChallengeBattleWinPre.s +++ b/asm/src/StateChallengeBattleWinPre.s @@ -937,25 +937,25 @@ __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23St __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$4b$$1Fv - .byte4 create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q24util167StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateChallengeBattleWinPre$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero7gimmick26StateChallengeBattleWinPre5Phase$$1 __vt__Q24util167StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateChallengeBattleWinPre$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero7gimmick26StateChallengeBattleWinPre5Phase$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util167StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateChallengeBattleWinPre$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero7gimmick26StateChallengeBattleWinPre5Phase$$1Fv - .byte4 create__Q24util167StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateChallengeBattleWinPre$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero7gimmick26StateChallengeBattleWinPre5Phase$$1Fv + .4byte __dt__Q24util167StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateChallengeBattleWinPre$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero7gimmick26StateChallengeBattleWinPre5Phase$$1Fv + .4byte create__Q24util167StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateChallengeBattleWinPre$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero7gimmick26StateChallengeBattleWinPre5Phase$$1Fv .global __vt__Q53scn4step4hero7gimmick26StateChallengeBattleWinPre __vt__Q53scn4step4hero7gimmick26StateChallengeBattleWinPre: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick26StateChallengeBattleWinPreFv - .byte4 procAnim__Q53scn4step4hero7gimmick26StateChallengeBattleWinPreFv - .byte4 procMove__Q53scn4step4hero7gimmick26StateChallengeBattleWinPreFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick26StateChallengeBattleWinPreFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick26StateChallengeBattleWinPreFv + .4byte procAnim__Q53scn4step4hero7gimmick26StateChallengeBattleWinPreFv + .4byte procMove__Q53scn4step4hero7gimmick26StateChallengeBattleWinPreFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick26StateChallengeBattleWinPreFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/StateChallengeConfirm.s b/asm/src/StateChallengeConfirm.s index ea9548da..0b9a0504 100644 --- a/asm/src/StateChallengeConfirm.s +++ b/asm/src/StateChallengeConfirm.s @@ -327,17 +327,17 @@ __dt__Q24util181StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21St __vt__Q24util181StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateChallengeConfirm$$4PQ43scn4step4hero4Hero$$4Q33scn4step13ChallengeKind$$4PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util181StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateChallengeConfirm$$4PQ43scn4step4hero4Hero$$4Q33scn4step13ChallengeKind$$4PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$1Fv - .byte4 create__Q24util181StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateChallengeConfirm$$4PQ43scn4step4hero4Hero$$4Q33scn4step13ChallengeKind$$4PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$1Fv + .4byte __dt__Q24util181StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateChallengeConfirm$$4PQ43scn4step4hero4Hero$$4Q33scn4step13ChallengeKind$$4PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$1Fv + .4byte create__Q24util181StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateChallengeConfirm$$4PQ43scn4step4hero4Hero$$4Q33scn4step13ChallengeKind$$4PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$1Fv .global __vt__Q53scn4step4hero7gimmick21StateChallengeConfirm __vt__Q53scn4step4hero7gimmick21StateChallengeConfirm: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick21StateChallengeConfirmFv - .byte4 procAnim__Q53scn4step4hero7gimmick21StateChallengeConfirmFv - .byte4 procMove__Q53scn4step4hero7gimmick21StateChallengeConfirmFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick21StateChallengeConfirmFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick21StateChallengeConfirmFv + .4byte procAnim__Q53scn4step4hero7gimmick21StateChallengeConfirmFv + .4byte procMove__Q53scn4step4hero7gimmick21StateChallengeConfirmFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick21StateChallengeConfirmFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateChallengeIn.s b/asm/src/StateChallengeIn.s index e96789f4..cac909bc 100644 --- a/asm/src/StateChallengeIn.s +++ b/asm/src/StateChallengeIn.s @@ -597,13 +597,13 @@ lbl_8037C1C0: __vt__Q53scn4step4hero7gimmick16StateChallengeIn: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick16StateChallengeInFv - .byte4 procAnim__Q53scn4step4hero7gimmick16StateChallengeInFv - .byte4 procMove__Q53scn4step4hero7gimmick16StateChallengeInFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick16StateChallengeInFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick16StateChallengeInFv + .4byte procAnim__Q53scn4step4hero7gimmick16StateChallengeInFv + .4byte procMove__Q53scn4step4hero7gimmick16StateChallengeInFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick16StateChallengeInFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateChange.s b/asm/src/StateChange.s index 3d495ac2..f4931f10 100644 --- a/asm/src/StateChange.s +++ b/asm/src/StateChange.s @@ -465,37 +465,37 @@ __dt__Q24util161StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone19Stat __vt__Q24util161StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone19StateFallScrewStart$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util161StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone19StateFallScrewStart$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv - .byte4 create__Q24util161StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone19StateFallScrewStart$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .4byte __dt__Q24util161StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone19StateFallScrewStart$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .4byte create__Q24util161StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone19StateFallScrewStart$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv .global __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateSlip$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1 __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateSlip$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateSlip$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv - .byte4 create__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateSlip$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .4byte __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateSlip$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .4byte create__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateSlip$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv .global __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateFall$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1 __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateFall$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateFall$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv - .byte4 create__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateFall$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .4byte __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateFall$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .4byte create__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateFall$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv .global __vt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone11StateChange$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1 __vt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone11StateChange$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone11StateChange$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv - .byte4 create__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone11StateChange$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .4byte __dt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone11StateChange$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .4byte create__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone11StateChange$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv .global __vt__Q53scn4step4hero5stone11StateChange __vt__Q53scn4step4hero5stone11StateChange: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5stone11StateChangeFv - .byte4 procAnim__Q53scn4step4hero5stone11StateChangeFv - .byte4 procMove__Q53scn4step4hero5stone11StateChangeFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5stone11StateChangeFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5stone11StateChangeFv + .4byte procAnim__Q53scn4step4hero5stone11StateChangeFv + .4byte procMove__Q53scn4step4hero5stone11StateChangeFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5stone11StateChangeFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateChangeGrade.s b/asm/src/StateChangeGrade.s index c35766a7..6c33cb67 100644 --- a/asm/src/StateChangeGrade.s +++ b/asm/src/StateChangeGrade.s @@ -127,11 +127,11 @@ procFixPos__Q53scn4step4hero7gimmick16StateChangeGradeFv: __vt__Q53scn4step4hero7gimmick16StateChangeGrade: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick16StateChangeGradeFv - .byte4 procAnim__Q53scn4step4hero7gimmick16StateChangeGradeFv - .byte4 procMove__Q53scn4step4hero7gimmick16StateChangeGradeFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick16StateChangeGradeFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick16StateChangeGradeFv + .4byte procAnim__Q53scn4step4hero7gimmick16StateChangeGradeFv + .4byte procMove__Q53scn4step4hero7gimmick16StateChangeGradeFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick16StateChangeGradeFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateChanger.s b/asm/src/StateChanger.s index 224cef9c..6692992e 100644 --- a/asm/src/StateChanger.s +++ b/asm/src/StateChanger.s @@ -181,5 +181,5 @@ onSetNextStateFactory__Q24util16StateChangerBaseFv: __vt__Q24util16StateChangerBase: .4byte 0 .4byte 0 - .byte4 __dt__Q24util16StateChangerBaseFv + .4byte __dt__Q24util16StateChangerBaseFv .4byte 0 diff --git a/asm/src/StateCharge.s b/asm/src/StateCharge.s index 5bfa9e7b..a30e9d4c 100644 --- a/asm/src/StateCharge.s +++ b/asm/src/StateCharge.s @@ -560,49 +560,49 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10Sta __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateStamp$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateStamp$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateStamp$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateStamp$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateStamp$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateVulcan$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateVulcan$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateVulcan$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateVulcan$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateVulcan$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateVulcan$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateDoubleKick$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateDoubleKick$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateDoubleKick$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateDoubleKick$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateDoubleKick$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateDoubleKick$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateSmash$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateSmash$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateSmash$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateSmash$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateSmash$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateSmash$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util128StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter9StateShot$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero7fighter11ChargeLevel$$1 __vt__Q24util128StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter9StateShot$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero7fighter11ChargeLevel$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util128StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter9StateShot$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero7fighter11ChargeLevel$$1Fv - .byte4 create__Q24util128StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter9StateShot$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero7fighter11ChargeLevel$$1Fv + .4byte __dt__Q24util128StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter9StateShot$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero7fighter11ChargeLevel$$1Fv + .4byte create__Q24util128StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter9StateShot$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero7fighter11ChargeLevel$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateCharge$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateCharge$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateCharge$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateCharge$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateCharge$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateCharge$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7fighter11StateCharge __vt__Q53scn4step4hero7fighter11StateCharge: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter11StateChargeFv - .byte4 procAnim__Q53scn4step4hero7fighter11StateChargeFv - .byte4 procMove__Q53scn4step4hero7fighter11StateChargeFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter11StateChargeFv - .byte4 procObjCollReact__Q53scn4step4hero7fighter11StateChargeFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter11StateChargeFv + .4byte procAnim__Q53scn4step4hero7fighter11StateChargeFv + .4byte procMove__Q53scn4step4hero7fighter11StateChargeFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter11StateChargeFv + .4byte procObjCollReact__Q53scn4step4hero7fighter11StateChargeFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateChargeAttack.s b/asm/src/StateChargeAttack.s index ba6272ee..69f0e4a7 100644 --- a/asm/src/StateChargeAttack.s +++ b/asm/src/StateChargeAttack.s @@ -334,12 +334,12 @@ lbl_80253D54: __vt__Q53scn4step4boss8kingsdoo17StateChargeAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss8kingsdoo17StateChargeAttackFv - .byte4 procAnim__Q53scn4step4boss8kingsdoo17StateChargeAttackFv - .byte4 procMove__Q53scn4step4boss8kingsdoo17StateChargeAttackFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss8kingsdoo17StateChargeAttackFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss8kingsdoo17StateChargeAttackFv + .4byte procAnim__Q53scn4step4boss8kingsdoo17StateChargeAttackFv + .4byte procMove__Q53scn4step4boss8kingsdoo17StateChargeAttackFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss8kingsdoo17StateChargeAttackFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256691 diff --git a/asm/src/StateChargeAttackStart.s b/asm/src/StateChargeAttackStart.s index 5613d1f1..7d2ae50d 100644 --- a/asm/src/StateChargeAttackStart.s +++ b/asm/src/StateChargeAttackStart.s @@ -56,9 +56,9 @@ procFixPos__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv: __vt__Q53scn4step4boss8kingsdoo22StateChargeAttackStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv - .byte4 procAnim__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv - .byte4 procMove__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv + .4byte procAnim__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv + .4byte procMove__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateChase.s b/asm/src/StateChase.s index e874ba56..ace164fa 100644 --- a/asm/src/StateChase.s +++ b/asm/src/StateChase.s @@ -3214,102 +3214,102 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14Stat __vt__Q53scn4step5enemy7blipper10StateChase: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7blipper10StateChaseFv - .byte4 procAnim__Q53scn4step5enemy7blipper10StateChaseFv - .byte4 procMove__Q53scn4step5enemy7blipper10StateChaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7blipper10StateChaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7blipper10StateChaseFv + .4byte procAnim__Q53scn4step5enemy7blipper10StateChaseFv + .4byte procMove__Q53scn4step5enemy7blipper10StateChaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7blipper10StateChaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6degout10StateChase __vt__Q53scn4step5enemy6degout10StateChase: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6degout10StateChaseFv - .byte4 procAnim__Q53scn4step5enemy6degout10StateChaseFv - .byte4 procMove__Q53scn4step5enemy6degout10StateChaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6degout10StateChaseFv + .4byte procAnim__Q53scn4step5enemy6degout10StateChaseFv + .4byte procMove__Q53scn4step5enemy6degout10StateChaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4elec10StateChase __vt__Q53scn4step5enemy4elec10StateChase: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4elec10StateChaseFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy4elec10StateChaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy4elec10StateChaseFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy4elec10StateChaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer10StateChase __vt__Q53scn4step5enemy6flamer10StateChase: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6flamer10StateChaseFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy6flamer10StateChaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6flamer10StateChaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6flamer10StateChaseFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy6flamer10StateChaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6flamer10StateChaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7mumbies10StateChase __vt__Q53scn4step5enemy7mumbies10StateChase: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7mumbies10StateChaseFv - .byte4 procAnim__Q53scn4step5enemy7mumbies10StateChaseFv - .byte4 procMove__Q53scn4step5enemy7mumbies10StateChaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7mumbies10StateChaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7mumbies10StateChaseFv + .4byte procAnim__Q53scn4step5enemy7mumbies10StateChaseFv + .4byte procMove__Q53scn4step5enemy7mumbies10StateChaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7mumbies10StateChaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy10StateChase __vt__Q53scn4step5enemy6scarfy10StateChase: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6scarfy10StateChaseFv - .byte4 procAnim__Q53scn4step5enemy6scarfy10StateChaseFv - .byte4 procMove__Q53scn4step5enemy6scarfy10StateChaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6scarfy10StateChaseFv + .4byte procAnim__Q53scn4step5enemy6scarfy10StateChaseFv + .4byte procMove__Q53scn4step5enemy6scarfy10StateChaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5sheld10StateChase __vt__Q53scn4step5enemy5sheld10StateChase: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5sheld10StateChaseFv - .byte4 procAnim__Q53scn4step5enemy5sheld10StateChaseFv - .byte4 procMove__Q53scn4step5enemy5sheld10StateChaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5sheld10StateChaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5sheld10StateChaseFv + .4byte procAnim__Q53scn4step5enemy5sheld10StateChaseFv + .4byte procMove__Q53scn4step5enemy5sheld10StateChaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5sheld10StateChaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257807 diff --git a/asm/src/StateChewing.s b/asm/src/StateChewing.s index 0d4f5dbd..0372dfe6 100644 --- a/asm/src/StateChewing.s +++ b/asm/src/StateChewing.s @@ -193,15 +193,15 @@ __dt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6whispy10Stat __vt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1Fv - .byte4 create__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1Fv + .4byte __dt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1Fv + .4byte create__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1Fv .global __vt__Q53scn4step4boss6whispy12StateChewing __vt__Q53scn4step4boss6whispy12StateChewing: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy12StateChewingFv - .byte4 procAnim__Q53scn4step4boss6whispy12StateChewingFv - .byte4 procMove__Q53scn4step4boss6whispy12StateChewingFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy12StateChewingFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6whispy12StateChewingFv + .4byte procAnim__Q53scn4step4boss6whispy12StateChewingFv + .4byte procMove__Q53scn4step4boss6whispy12StateChewingFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy12StateChewingFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateCircle.s b/asm/src/StateCircle.s index 5516fef1..75be25d8 100644 --- a/asm/src/StateCircle.s +++ b/asm/src/StateCircle.s @@ -386,12 +386,12 @@ lbl_802F309C: __vt__Q53scn4step5enemy15zankibblecutter11StateCircle: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy15zankibblecutter11StateCircleFv - .byte4 procAnim__Q53scn4step5enemy15zankibblecutter11StateCircleFv - .byte4 procMove__Q53scn4step5enemy15zankibblecutter11StateCircleFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy15zankibblecutter11StateCircleFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy15zankibblecutter11StateCircleFv + .4byte procAnim__Q53scn4step5enemy15zankibblecutter11StateCircleFv + .4byte procMove__Q53scn4step5enemy15zankibblecutter11StateCircleFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy15zankibblecutter11StateCircleFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257063 diff --git a/asm/src/StateClearDance.s b/asm/src/StateClearDance.s index 63eab079..0577dc2c 100644 --- a/asm/src/StateClearDance.s +++ b/asm/src/StateClearDance.s @@ -207,13 +207,13 @@ procFixPos__Q53scn4step4hero6common15StateClearDanceFv: __vt__Q53scn4step4hero6common15StateClearDance: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common15StateClearDanceFv - .byte4 procAnim__Q53scn4step4hero6common15StateClearDanceFv - .byte4 procMove__Q53scn4step4hero6common15StateClearDanceFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common15StateClearDanceFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common15StateClearDanceFv + .4byte procAnim__Q53scn4step4hero6common15StateClearDanceFv + .4byte procMove__Q53scn4step4hero6common15StateClearDanceFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common15StateClearDanceFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateClearDanceFall.s b/asm/src/StateClearDanceFall.s index 416d50b0..281e0139 100644 --- a/asm/src/StateClearDanceFall.s +++ b/asm/src/StateClearDanceFall.s @@ -256,17 +256,17 @@ __dt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common19Sta __vt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceWalk$$4PQ43scn4step4hero4Hero$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceWalk$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv - .byte4 create__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceWalk$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte __dt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceWalk$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte create__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceWalk$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q53scn4step4hero6common19StateClearDanceFall __vt__Q53scn4step4hero6common19StateClearDanceFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common19StateClearDanceFallFv - .byte4 procAnim__Q53scn4step4hero6common19StateClearDanceFallFv - .byte4 procMove__Q53scn4step4hero6common19StateClearDanceFallFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common19StateClearDanceFallFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common19StateClearDanceFallFv + .4byte procAnim__Q53scn4step4hero6common19StateClearDanceFallFv + .4byte procMove__Q53scn4step4hero6common19StateClearDanceFallFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common19StateClearDanceFallFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateClearDancePre.s b/asm/src/StateClearDancePre.s index 5b85b8f9..3f6c64dd 100644 --- a/asm/src/StateClearDancePre.s +++ b/asm/src/StateClearDancePre.s @@ -193,17 +193,17 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15Stat __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateClearDance$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateClearDance$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateClearDance$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateClearDance$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateClearDance$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common18StateClearDancePre __vt__Q53scn4step4hero6common18StateClearDancePre: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common18StateClearDancePreFv - .byte4 procAnim__Q53scn4step4hero6common18StateClearDancePreFv - .byte4 procMove__Q53scn4step4hero6common18StateClearDancePreFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common18StateClearDancePreFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common18StateClearDancePreFv + .4byte procAnim__Q53scn4step4hero6common18StateClearDancePreFv + .4byte procMove__Q53scn4step4hero6common18StateClearDancePreFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common18StateClearDancePreFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateClearDanceWalk.s b/asm/src/StateClearDanceWalk.s index 08f495a6..8af6724f 100644 --- a/asm/src/StateClearDanceWalk.s +++ b/asm/src/StateClearDanceWalk.s @@ -287,19 +287,19 @@ __dt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common18Sta __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common18StateClearDancePre$$4PQ43scn4step4hero4Hero$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common18StateClearDancePre$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv - .byte4 create__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common18StateClearDancePre$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte __dt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common18StateClearDancePre$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte create__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common18StateClearDancePre$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q53scn4step4hero6common19StateClearDanceWalk __vt__Q53scn4step4hero6common19StateClearDanceWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common19StateClearDanceWalkFv - .byte4 procAnim__Q53scn4step4hero6common19StateClearDanceWalkFv - .byte4 procMove__Q53scn4step4hero6common19StateClearDanceWalkFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common19StateClearDanceWalkFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common19StateClearDanceWalkFv + .4byte procAnim__Q53scn4step4hero6common19StateClearDanceWalkFv + .4byte procMove__Q53scn4step4hero6common19StateClearDanceWalkFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common19StateClearDanceWalkFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateCliffAttack.s b/asm/src/StateCliffAttack.s index 0eb34801..0a5bb099 100644 --- a/asm/src/StateCliffAttack.s +++ b/asm/src/StateCliffAttack.s @@ -119,18 +119,18 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14Stat __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateCliffJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateCliffJump$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateCliffJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateCliffJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateCliffJump$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5rocky16StateCliffAttack __vt__Q53scn4step5enemy5rocky16StateCliffAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5rocky16StateCliffAttackFv - .byte4 procAnim__Q53scn4step5enemy5rocky16StateCliffAttackFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5rocky16StateCliffAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5rocky16StateCliffAttackFv + .4byte procAnim__Q53scn4step5enemy5rocky16StateCliffAttackFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5rocky16StateCliffAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255825 diff --git a/asm/src/StateCliffJump.s b/asm/src/StateCliffJump.s index 88e2cd96..e3fb6908 100644 --- a/asm/src/StateCliffJump.s +++ b/asm/src/StateCliffJump.s @@ -222,9 +222,9 @@ procFixPos__Q53scn4step5enemy5rocky14StateCliffJumpFv: __vt__Q53scn4step5enemy5rocky14StateCliffJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5rocky14StateCliffJumpFv - .byte4 procAnim__Q53scn4step5enemy5rocky14StateCliffJumpFv - .byte4 procMove__Q53scn4step5enemy5rocky14StateCliffJumpFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5rocky14StateCliffJumpFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5rocky14StateCliffJumpFv + .4byte procAnim__Q53scn4step5enemy5rocky14StateCliffJumpFv + .4byte procMove__Q53scn4step5enemy5rocky14StateCliffJumpFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5rocky14StateCliffJumpFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateCombinationAttack.s b/asm/src/StateCombinationAttack.s index ab31ded8..d01e2cae 100644 --- a/asm/src/StateCombinationAttack.s +++ b/asm/src/StateCombinationAttack.s @@ -1045,19 +1045,19 @@ __dt__Q24util113StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interferen __vt__Q24util113StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference22StateCombinationAttack$$4PQ43scn4step4hero4Hero$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util113StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference22StateCombinationAttack$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv - .byte4 create__Q24util113StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference22StateCombinationAttack$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte __dt__Q24util113StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference22StateCombinationAttack$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte create__Q24util113StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference22StateCombinationAttack$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q53scn4step4hero12interference22StateCombinationAttack __vt__Q53scn4step4hero12interference22StateCombinationAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero12interference22StateCombinationAttackFv - .byte4 procAnim__Q53scn4step4hero12interference22StateCombinationAttackFv - .byte4 procMove__Q53scn4step4hero12interference22StateCombinationAttackFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero12interference22StateCombinationAttackFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero12interference22StateCombinationAttackFv + .4byte procAnim__Q53scn4step4hero12interference22StateCombinationAttackFv + .4byte procMove__Q53scn4step4hero12interference22StateCombinationAttackFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero12interference22StateCombinationAttackFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateCopy.s b/asm/src/StateCopy.s index 2cfa1588..2548238f 100644 --- a/asm/src/StateCopy.s +++ b/asm/src/StateCopy.s @@ -612,13 +612,13 @@ procFixPos__Q53scn4step4hero6common9StateCopyFv: __vt__Q53scn4step4hero6common9StateCopy: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common9StateCopyFv - .byte4 procAnim__Q53scn4step4hero6common9StateCopyFv - .byte4 procMove__Q53scn4step4hero6common9StateCopyFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common9StateCopyFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common9StateCopyFv + .4byte procAnim__Q53scn4step4hero6common9StateCopyFv + .4byte procMove__Q53scn4step4hero6common9StateCopyFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common9StateCopyFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateCopyPre.s b/asm/src/StateCopyPre.s index 92bcbd7a..ba4dc212 100644 --- a/asm/src/StateCopyPre.s +++ b/asm/src/StateCopyPre.s @@ -289,17 +289,17 @@ __dt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9Stat __vt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateCopy$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateCopy$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv - .byte4 create__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateCopy$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv + .4byte __dt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateCopy$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv + .4byte create__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateCopy$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv .global __vt__Q53scn4step4hero6common12StateCopyPre __vt__Q53scn4step4hero6common12StateCopyPre: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common12StateCopyPreFv - .byte4 procAnim__Q53scn4step4hero6common12StateCopyPreFv - .byte4 procMove__Q43scn4step4hero9StateBaseFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q43scn4step4hero9StateBaseFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common12StateCopyPreFv + .4byte procAnim__Q53scn4step4hero6common12StateCopyPreFv + .4byte procMove__Q43scn4step4hero9StateBaseFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q43scn4step4hero9StateBaseFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateCreditMove.s b/asm/src/StateCreditMove.s index 6ef978ad..da8064c8 100644 --- a/asm/src/StateCreditMove.s +++ b/asm/src/StateCreditMove.s @@ -181,12 +181,12 @@ __dt__Q53scn4step5enemy6chilly15StateCreditMoveFv: __vt__Q53scn4step5enemy6chilly15StateCreditMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6chilly15StateCreditMoveFv - .byte4 procAnim__Q53scn4step5enemy6chilly15StateCreditMoveFv - .byte4 procMove__Q53scn4step5enemy6chilly15StateCreditMoveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6chilly15StateCreditMoveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6chilly15StateCreditMoveFv + .4byte procAnim__Q53scn4step5enemy6chilly15StateCreditMoveFv + .4byte procMove__Q53scn4step5enemy6chilly15StateCreditMoveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6chilly15StateCreditMoveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256565 diff --git a/asm/src/StateCreditWalk.s b/asm/src/StateCreditWalk.s index 5f257de5..6a2c1caf 100644 --- a/asm/src/StateCreditWalk.s +++ b/asm/src/StateCreditWalk.s @@ -402,24 +402,24 @@ __dt__Q53scn4step5enemy11broomhatter15StateCreditWalkFv: __vt__Q53scn4step5enemy6common15StateCreditWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common15StateCreditWalkFv - .byte4 procAnim__Q53scn4step5enemy6common15StateCreditWalkFv - .byte4 procMove__Q53scn4step5enemy6common15StateCreditWalkFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common15StateCreditWalkFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common15StateCreditWalkFv + .4byte procAnim__Q53scn4step5enemy6common15StateCreditWalkFv + .4byte procMove__Q53scn4step5enemy6common15StateCreditWalkFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common15StateCreditWalkFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter15StateCreditWalk __vt__Q53scn4step5enemy11broomhatter15StateCreditWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11broomhatter15StateCreditWalkFv - .byte4 procAnim__Q53scn4step5enemy11broomhatter15StateCreditWalkFv - .byte4 procMove__Q53scn4step5enemy11broomhatter15StateCreditWalkFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11broomhatter15StateCreditWalkFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11broomhatter15StateCreditWalkFv + .4byte procAnim__Q53scn4step5enemy11broomhatter15StateCreditWalkFv + .4byte procMove__Q53scn4step5enemy11broomhatter15StateCreditWalkFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11broomhatter15StateCreditWalkFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256619 diff --git a/asm/src/StateCutFall.s b/asm/src/StateCutFall.s index 0a4334df..2b164488 100644 --- a/asm/src/StateCutFall.s +++ b/asm/src/StateCutFall.s @@ -187,18 +187,18 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como15State __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como15StateCutLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como15StateCutLanding$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como15StateCutLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como15StateCutLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como15StateCutLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4como12StateCutFall __vt__Q53scn4step5enemy4como12StateCutFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4como12StateCutFallFv - .byte4 procAnim__Q53scn4step5enemy4como12StateCutFallFv - .byte4 procMove__Q53scn4step5enemy4como12StateCutFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4como12StateCutFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy4como12StateCutFallFv + .4byte procAnim__Q53scn4step5enemy4como12StateCutFallFv + .4byte procMove__Q53scn4step5enemy4como12StateCutFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4como12StateCutFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256668 diff --git a/asm/src/StateCutLanding.s b/asm/src/StateCutLanding.s index 2aaa5ec8..cbac3632 100644 --- a/asm/src/StateCutLanding.s +++ b/asm/src/StateCutLanding.s @@ -125,12 +125,12 @@ procFixPos__Q53scn4step5enemy4como15StateCutLandingFv: __vt__Q53scn4step5enemy4como15StateCutLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4como15StateCutLandingFv - .byte4 procAnim__Q53scn4step5enemy4como15StateCutLandingFv - .byte4 procMove__Q53scn4step5enemy4como15StateCutLandingFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4como15StateCutLandingFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy4como15StateCutLandingFv + .4byte procAnim__Q53scn4step5enemy4como15StateCutLandingFv + .4byte procMove__Q53scn4step5enemy4como15StateCutLandingFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4como15StateCutLandingFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256544 diff --git a/asm/src/StateDamage.s b/asm/src/StateDamage.s index f3ad939d..8ac25bed 100644 --- a/asm/src/StateDamage.s +++ b/asm/src/StateDamage.s @@ -168,9 +168,9 @@ __dt__Q53scn4step5enemy8rollball11StateDamageFv: __vt__Q53scn4step5enemy8rollball11StateDamage: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8rollball11StateDamageFv - .byte4 procAnim__Q53scn4step5enemy8rollball11StateDamageFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8rollball11StateDamageFv + .4byte procAnim__Q53scn4step5enemy8rollball11StateDamageFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateDamageCapture.s b/asm/src/StateDamageCapture.s index 79d8ead7..b02ede79 100644 --- a/asm/src/StateDamageCapture.s +++ b/asm/src/StateDamageCapture.s @@ -464,12 +464,12 @@ lbl_802A94A8: __vt__Q53scn4step5enemy6damage18StateDamageCapture: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6damage18StateDamageCaptureFv - .byte4 procAnim__Q53scn4step5enemy6damage18StateDamageCaptureFv - .byte4 procMove__Q53scn4step5enemy6damage18StateDamageCaptureFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6damage18StateDamageCaptureFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6damage18StateDamageCaptureFv + .4byte procAnim__Q53scn4step5enemy6damage18StateDamageCaptureFv + .4byte procMove__Q53scn4step5enemy6damage18StateDamageCaptureFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6damage18StateDamageCaptureFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257027 diff --git a/asm/src/StateDamageExtreme.s b/asm/src/StateDamageExtreme.s index 32492a76..a4bbab7a 100644 --- a/asm/src/StateDamageExtreme.s +++ b/asm/src/StateDamageExtreme.s @@ -365,12 +365,12 @@ lbl_802A99C4: __vt__Q53scn4step5enemy6damage18StateDamageExtreme: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6damage18StateDamageExtremeFv - .byte4 procAnim__Q53scn4step5enemy6damage18StateDamageExtremeFv - .byte4 procMove__Q53scn4step5enemy6damage18StateDamageExtremeFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6damage18StateDamageExtremeFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6damage18StateDamageExtremeFv + .4byte procAnim__Q53scn4step5enemy6damage18StateDamageExtremeFv + .4byte procMove__Q53scn4step5enemy6damage18StateDamageExtremeFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6damage18StateDamageExtremeFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256978 diff --git a/asm/src/StateDamageL.s b/asm/src/StateDamageL.s index 5bfbe96a..b4cb28f6 100644 --- a/asm/src/StateDamageL.s +++ b/asm/src/StateDamageL.s @@ -116,15 +116,15 @@ __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9State __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateGrow$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateGrow$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateGrow$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateGrow$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateGrow$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6whispy12StateDamageL __vt__Q53scn4step4boss6whispy12StateDamageL: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy12StateDamageLFv - .byte4 procAnim__Q53scn4step4boss6whispy12StateDamageLFv - .byte4 procMove__Q53scn4step4boss6whispy12StateDamageLFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy12StateDamageLFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6whispy12StateDamageLFv + .4byte procAnim__Q53scn4step4boss6whispy12StateDamageLFv + .4byte procMove__Q53scn4step4boss6whispy12StateDamageLFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy12StateDamageLFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateDamageNormal.s b/asm/src/StateDamageNormal.s index 095ed3f4..f790642b 100644 --- a/asm/src/StateDamageNormal.s +++ b/asm/src/StateDamageNormal.s @@ -289,12 +289,12 @@ procFixPos__Q53scn4step5enemy6damage17StateDamageNormalFv: __vt__Q53scn4step5enemy6damage17StateDamageNormal: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6damage17StateDamageNormalFv - .byte4 procAnim__Q53scn4step5enemy6damage17StateDamageNormalFv - .byte4 procMove__Q53scn4step5enemy6damage17StateDamageNormalFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6damage17StateDamageNormalFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6damage17StateDamageNormalFv + .4byte procAnim__Q53scn4step5enemy6damage17StateDamageNormalFv + .4byte procMove__Q53scn4step5enemy6damage17StateDamageNormalFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6damage17StateDamageNormalFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256803 diff --git a/asm/src/StateDamageWingToss.s b/asm/src/StateDamageWingToss.s index 4cb3974a..939c602e 100644 --- a/asm/src/StateDamageWingToss.s +++ b/asm/src/StateDamageWingToss.s @@ -317,12 +317,12 @@ lbl_802AA21C: __vt__Q53scn4step5enemy6damage19StateDamageWingToss: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6damage19StateDamageWingTossFv - .byte4 procAnim__Q53scn4step5enemy6damage19StateDamageWingTossFv - .byte4 procMove__Q53scn4step5enemy6damage19StateDamageWingTossFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6damage19StateDamageWingTossFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6damage19StateDamageWingTossFv + .4byte procAnim__Q53scn4step5enemy6damage19StateDamageWingTossFv + .4byte procMove__Q53scn4step5enemy6damage19StateDamageWingTossFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6damage19StateDamageWingTossFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256724 diff --git a/asm/src/StateDash.s b/asm/src/StateDash.s index 72abbd67..ff153310 100644 --- a/asm/src/StateDash.s +++ b/asm/src/StateDash.s @@ -1320,78 +1320,78 @@ lbl_802DE244: __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateDash$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateDash$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateDash$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateDash$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateDash$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateDash$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster9StateDash __vt__Q53scn4step4boss15challengemaster9StateDash: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster9StateDashFv - .byte4 procAnim__Q53scn4step4boss15challengemaster9StateDashFv - .byte4 procMove__Q53scn4step4boss15challengemaster9StateDashFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster9StateDashFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster9StateDashFv + .4byte procAnim__Q53scn4step4boss15challengemaster9StateDashFv + .4byte procMove__Q53scn4step4boss15challengemaster9StateDashFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster9StateDashFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util139StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateDashWallHit$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1 __vt__Q24util139StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateDashWallHit$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util139StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateDashWallHit$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1Fv - .byte4 create__Q24util139StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateDashWallHit$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1Fv + .4byte __dt__Q24util139StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateDashWallHit$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1Fv + .4byte create__Q24util139StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateDashWallHit$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1Fv .global __vt__Q24util135StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common12StateDashEnd$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1 __vt__Q24util135StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common12StateDashEnd$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util135StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common12StateDashEnd$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1Fv - .byte4 create__Q24util135StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common12StateDashEnd$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1Fv + .4byte __dt__Q24util135StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common12StateDashEnd$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1Fv + .4byte create__Q24util135StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common12StateDashEnd$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1Fv .global __vt__Q53scn4step4boss6common9StateDash __vt__Q53scn4step4boss6common9StateDash: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common9StateDashFv - .byte4 procAnim__Q53scn4step4boss6common9StateDashFv - .byte4 procMove__Q53scn4step4boss6common9StateDashFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common9StateDashFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6common9StateDashFv + .4byte procAnim__Q53scn4step4boss6common9StateDashFv + .4byte procMove__Q53scn4step4boss6common9StateDashFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common9StateDashFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateDashWallHit$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateDashWallHit$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateDashWallHit$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateDashWallHit$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateDashWallHit$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateDashWallHit$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6dubior9StateDash __vt__Q53scn4step4boss6dubior9StateDash: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6dubior9StateDashFv - .byte4 procAnim__Q53scn4step4boss6dubior9StateDashFv - .byte4 procMove__Q53scn4step4boss6dubior9StateDashFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6dubior9StateDashFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6dubior9StateDashFv + .4byte procAnim__Q53scn4step4boss6dubior9StateDashFv + .4byte procMove__Q53scn4step4boss6dubior9StateDashFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6dubior9StateDashFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld9StateDash __vt__Q53scn4step5enemy5sheld9StateDash: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5sheld9StateDashFv - .byte4 procAnim__Q53scn4step5enemy5sheld9StateDashFv - .byte4 procMove__Q53scn4step5enemy5sheld9StateDashFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5sheld9StateDashFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5sheld9StateDashFv + .4byte procAnim__Q53scn4step5enemy5sheld9StateDashFv + .4byte procMove__Q53scn4step5enemy5sheld9StateDashFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5sheld9StateDashFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256936 diff --git a/asm/src/StateDashAttack.s b/asm/src/StateDashAttack.s index 7ed090ce..4f959689 100644 --- a/asm/src/StateDashAttack.s +++ b/asm/src/StateDashAttack.s @@ -832,37 +832,37 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing22State __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing22StateDashAttackWallHit$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing22StateDashAttackWallHit$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing22StateDashAttackWallHit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing22StateDashAttackWallHit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing22StateDashAttackWallHit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDiveAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDiveAttack$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDiveAttack$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDiveAttack$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDiveAttack$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDiveAttack$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateUnderAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateUnderAttack$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateUnderAttack$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateUnderAttack$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateUnderAttack$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateUnderAttack$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDashAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDashAttack$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDashAttack$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDashAttack$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDashAttack$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDashAttack$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4wing15StateDashAttack __vt__Q53scn4step4hero4wing15StateDashAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4wing15StateDashAttackFv - .byte4 procAnim__Q53scn4step4hero4wing15StateDashAttackFv - .byte4 procMove__Q53scn4step4hero4wing15StateDashAttackFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4wing15StateDashAttackFv - .byte4 procObjCollReact__Q53scn4step4hero4wing15StateDashAttackFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4wing15StateDashAttackFv + .4byte procAnim__Q53scn4step4hero4wing15StateDashAttackFv + .4byte procMove__Q53scn4step4hero4wing15StateDashAttackFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4wing15StateDashAttackFv + .4byte procObjCollReact__Q53scn4step4hero4wing15StateDashAttackFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateDashAttackWallHit.s b/asm/src/StateDashAttackWallHit.s index 39a9a883..9586450d 100644 --- a/asm/src/StateDashAttackWallHit.s +++ b/asm/src/StateDashAttackWallHit.s @@ -196,13 +196,13 @@ procFixPos__Q53scn4step4hero4wing22StateDashAttackWallHitFv: __vt__Q53scn4step4hero4wing22StateDashAttackWallHit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4wing22StateDashAttackWallHitFv - .byte4 procAnim__Q53scn4step4hero4wing22StateDashAttackWallHitFv - .byte4 procMove__Q53scn4step4hero4wing22StateDashAttackWallHitFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4wing22StateDashAttackWallHitFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4wing22StateDashAttackWallHitFv + .4byte procAnim__Q53scn4step4hero4wing22StateDashAttackWallHitFv + .4byte procMove__Q53scn4step4hero4wing22StateDashAttackWallHitFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4wing22StateDashAttackWallHitFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateDashEnd.s b/asm/src/StateDashEnd.s index b11a7e35..c02458fe 100644 --- a/asm/src/StateDashEnd.s +++ b/asm/src/StateDashEnd.s @@ -68,9 +68,9 @@ procFixPos__Q53scn4step4boss6common12StateDashEndFv: __vt__Q53scn4step4boss6common12StateDashEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common12StateDashEndFv - .byte4 procAnim__Q53scn4step4boss6common12StateDashEndFv - .byte4 procMove__Q53scn4step4boss6common12StateDashEndFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common12StateDashEndFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6common12StateDashEndFv + .4byte procAnim__Q53scn4step4boss6common12StateDashEndFv + .4byte procMove__Q53scn4step4boss6common12StateDashEndFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common12StateDashEndFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateDashWallHit.s b/asm/src/StateDashWallHit.s index e4949521..d06c2c3d 100644 --- a/asm/src/StateDashWallHit.s +++ b/asm/src/StateDashWallHit.s @@ -408,24 +408,24 @@ procFixPos__Q53scn4step4boss6dubior16StateDashWallHitFv: __vt__Q53scn4step4boss6common16StateDashWallHit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common16StateDashWallHitFv - .byte4 procAnim__Q53scn4step4boss6common16StateDashWallHitFv - .byte4 procMove__Q53scn4step4boss6common16StateDashWallHitFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common16StateDashWallHitFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6common16StateDashWallHitFv + .4byte procAnim__Q53scn4step4boss6common16StateDashWallHitFv + .4byte procMove__Q53scn4step4boss6common16StateDashWallHitFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common16StateDashWallHitFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior16StateDashWallHit __vt__Q53scn4step4boss6dubior16StateDashWallHit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6dubior16StateDashWallHitFv - .byte4 procAnim__Q53scn4step4boss6dubior16StateDashWallHitFv - .byte4 procMove__Q53scn4step4boss6dubior16StateDashWallHitFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6dubior16StateDashWallHitFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6dubior16StateDashWallHitFv + .4byte procAnim__Q53scn4step4boss6dubior16StateDashWallHitFv + .4byte procMove__Q53scn4step4boss6dubior16StateDashWallHitFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6dubior16StateDashWallHitFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255953 diff --git a/asm/src/StateDead.s b/asm/src/StateDead.s index 250cba6f..10e9674a 100644 --- a/asm/src/StateDead.s +++ b/asm/src/StateDead.s @@ -2222,43 +2222,43 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11Stat __vt__Q53scn4step4boss6common9StateDead: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common9StateDeadFv - .byte4 procAnim__Q53scn4step4boss6common9StateDeadFv - .byte4 procMove__Q53scn4step4boss6common9StateDeadFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common9StateDeadFv - .byte4 procObjCollReact__Q53scn4step4boss6common9StateDeadFv + .4byte __dt__Q53scn4step4boss6common9StateDeadFv + .4byte procAnim__Q53scn4step4boss6common9StateDeadFv + .4byte procMove__Q53scn4step4boss6common9StateDeadFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common9StateDeadFv + .4byte procObjCollReact__Q53scn4step4boss6common9StateDeadFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy9StateDead __vt__Q53scn4step4boss6whispy9StateDead: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy9StateDeadFv - .byte4 procAnim__Q53scn4step4boss6whispy9StateDeadFv - .byte4 procMove__Q53scn4step4boss6whispy9StateDeadFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy9StateDeadFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6whispy9StateDeadFv + .4byte procAnim__Q53scn4step4boss6whispy9StateDeadFv + .4byte procMove__Q53scn4step4boss6whispy9StateDeadFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy9StateDeadFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateLogout$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateLogout$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateLogout$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateLogout$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateLogout$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateLogout$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common9StateDead __vt__Q53scn4step4hero6common9StateDead: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common9StateDeadFv - .byte4 procAnim__Q53scn4step4hero6common9StateDeadFv - .byte4 procMove__Q53scn4step4hero6common9StateDeadFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common9StateDeadFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common9StateDeadFv + .4byte procAnim__Q53scn4step4hero6common9StateDeadFv + .4byte procMove__Q53scn4step4hero6common9StateDeadFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common9StateDeadFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/StateDeadCaptureRelease.s b/asm/src/StateDeadCaptureRelease.s index 0cbcab59..fa0934ab 100644 --- a/asm/src/StateDeadCaptureRelease.s +++ b/asm/src/StateDeadCaptureRelease.s @@ -212,12 +212,12 @@ lbl_802AA50C: __vt__Q53scn4step5enemy6damage23StateDeadCaptureRelease: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6damage23StateDeadCaptureReleaseFv - .byte4 procAnim__Q53scn4step5enemy6damage23StateDeadCaptureReleaseFv - .byte4 procMove__Q53scn4step5enemy6damage23StateDeadCaptureReleaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6damage23StateDeadCaptureReleaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6damage23StateDeadCaptureReleaseFv + .4byte procAnim__Q53scn4step5enemy6damage23StateDeadCaptureReleaseFv + .4byte procMove__Q53scn4step5enemy6damage23StateDeadCaptureReleaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6damage23StateDeadCaptureReleaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256713 diff --git a/asm/src/StateDeadExtreme.s b/asm/src/StateDeadExtreme.s index 62656175..11573b9f 100644 --- a/asm/src/StateDeadExtreme.s +++ b/asm/src/StateDeadExtreme.s @@ -333,12 +333,12 @@ lbl_802AA9A0: __vt__Q53scn4step5enemy6damage16StateDeadExtreme: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6damage16StateDeadExtremeFv - .byte4 procAnim__Q53scn4step5enemy6damage16StateDeadExtremeFv - .byte4 procMove__Q53scn4step5enemy6damage16StateDeadExtremeFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6damage16StateDeadExtremeFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6damage16StateDeadExtremeFv + .4byte procAnim__Q53scn4step5enemy6damage16StateDeadExtremeFv + .4byte procMove__Q53scn4step5enemy6damage16StateDeadExtremeFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6damage16StateDeadExtremeFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257029 diff --git a/asm/src/StateDeadInWater.s b/asm/src/StateDeadInWater.s index 3bb44ca1..2761a148 100644 --- a/asm/src/StateDeadInWater.s +++ b/asm/src/StateDeadInWater.s @@ -406,12 +406,12 @@ lbl_802AAE7C: __vt__Q53scn4step5enemy6damage16StateDeadInWater: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6damage16StateDeadInWaterFv - .byte4 procAnim__Q53scn4step5enemy6damage16StateDeadInWaterFv - .byte4 procMove__Q53scn4step5enemy6damage16StateDeadInWaterFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6damage16StateDeadInWaterFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6damage16StateDeadInWaterFv + .4byte procAnim__Q53scn4step5enemy6damage16StateDeadInWaterFv + .4byte procMove__Q53scn4step5enemy6damage16StateDeadInWaterFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6damage16StateDeadInWaterFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256983 diff --git a/asm/src/StateDeadSuper.s b/asm/src/StateDeadSuper.s index fa3d3009..e351b73d 100644 --- a/asm/src/StateDeadSuper.s +++ b/asm/src/StateDeadSuper.s @@ -475,12 +475,12 @@ lbl_802AB5FC: __vt__Q53scn4step5enemy6damage14StateDeadSuper: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6damage14StateDeadSuperFv - .byte4 procAnim__Q53scn4step5enemy6damage14StateDeadSuperFv - .byte4 procMove__Q53scn4step5enemy6damage14StateDeadSuperFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6damage14StateDeadSuperFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6damage14StateDeadSuperFv + .4byte procAnim__Q53scn4step5enemy6damage14StateDeadSuperFv + .4byte procMove__Q53scn4step5enemy6damage14StateDeadSuperFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6damage14StateDeadSuperFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257110 diff --git a/asm/src/StateDemo.s b/asm/src/StateDemo.s index 6911e97d..5179ec20 100644 --- a/asm/src/StateDemo.s +++ b/asm/src/StateDemo.s @@ -226,11 +226,11 @@ lbl_80362130: __vt__Q53scn4step4hero6common9StateDemo: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common9StateDemoFv - .byte4 procAnim__Q53scn4step4hero6common9StateDemoFv - .byte4 procMove__Q53scn4step4hero6common9StateDemoFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common9StateDemoFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common9StateDemoFv + .4byte procAnim__Q53scn4step4hero6common9StateDemoFv + .4byte procMove__Q53scn4step4hero6common9StateDemoFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common9StateDemoFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateDive.s b/asm/src/StateDive.s index fe333b29..a0651db3 100644 --- a/asm/src/StateDive.s +++ b/asm/src/StateDive.s @@ -507,30 +507,30 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13State __vt__Q53scn4step5enemy7blipper9StateDive: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7blipper9StateDiveFv - .byte4 procAnim__Q53scn4step5enemy7blipper9StateDiveFv - .byte4 procMove__Q53scn4step5enemy7blipper9StateDiveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7blipper9StateDiveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7blipper9StateDiveFv + .4byte procAnim__Q53scn4step5enemy7blipper9StateDiveFv + .4byte procMove__Q53scn4step5enemy7blipper9StateDiveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7blipper9StateDiveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13StateDiveWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13StateDiveWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13StateDiveWait$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13StateDiveWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13StateDiveWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13StateDiveWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4como9StateDive __vt__Q53scn4step5enemy4como9StateDive: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4como9StateDiveFv - .byte4 procAnim__Q53scn4step5enemy4como9StateDiveFv - .byte4 procMove__Q53scn4step5enemy4como9StateDiveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4como9StateDiveFv - .byte4 procObjCollReact__Q53scn4step5enemy4como9StateDiveFv + .4byte __dt__Q53scn4step5enemy4como9StateDiveFv + .4byte procAnim__Q53scn4step5enemy4como9StateDiveFv + .4byte procMove__Q53scn4step5enemy4como9StateDiveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4como9StateDiveFv + .4byte procObjCollReact__Q53scn4step5enemy4como9StateDiveFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255836 diff --git a/asm/src/StateDiveAttack.s b/asm/src/StateDiveAttack.s index 3fc936b1..4975b2c6 100644 --- a/asm/src/StateDiveAttack.s +++ b/asm/src/StateDiveAttack.s @@ -597,19 +597,19 @@ __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero4wing23State __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero4wing23StateUnderAttackLanding$$4PQ43scn4step4hero4Hero$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero4wing23StateUnderAttackLanding$$4PQ43scn4step4hero4Hero$$4b$$1Fv - .byte4 create__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero4wing23StateUnderAttackLanding$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero4wing23StateUnderAttackLanding$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte create__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero4wing23StateUnderAttackLanding$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero4wing15StateDiveAttack __vt__Q53scn4step4hero4wing15StateDiveAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4wing15StateDiveAttackFv - .byte4 procAnim__Q53scn4step4hero4wing15StateDiveAttackFv - .byte4 procMove__Q53scn4step4hero4wing15StateDiveAttackFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4wing15StateDiveAttackFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4wing15StateDiveAttackFv + .4byte procAnim__Q53scn4step4hero4wing15StateDiveAttackFv + .4byte procMove__Q53scn4step4hero4wing15StateDiveAttackFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4wing15StateDiveAttackFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateDiveWait.s b/asm/src/StateDiveWait.s index 47a56a63..f551cf83 100644 --- a/asm/src/StateDiveWait.s +++ b/asm/src/StateDiveWait.s @@ -155,9 +155,9 @@ __dt__Q53scn4step5enemy4como13StateDiveWaitFv: __vt__Q53scn4step5enemy4como13StateDiveWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4como13StateDiveWaitFv - .byte4 procAnim__Q53scn4step5enemy4como13StateDiveWaitFv - .byte4 procMove__Q53scn4step5enemy4como13StateDiveWaitFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4como13StateDiveWaitFv - .byte4 procObjCollReact__Q53scn4step5enemy4como13StateDiveWaitFv + .4byte __dt__Q53scn4step5enemy4como13StateDiveWaitFv + .4byte procAnim__Q53scn4step5enemy4como13StateDiveWaitFv + .4byte procMove__Q53scn4step5enemy4como13StateDiveWaitFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4como13StateDiveWaitFv + .4byte procObjCollReact__Q53scn4step5enemy4como13StateDiveWaitFv diff --git a/asm/src/StateDoubleAttack.s b/asm/src/StateDoubleAttack.s index 8304a427..00f46c65 100644 --- a/asm/src/StateDoubleAttack.s +++ b/asm/src/StateDoubleAttack.s @@ -175,12 +175,12 @@ procFixPos__Q53scn4step5enemy11bladeknight17StateDoubleAttackFv: __vt__Q53scn4step5enemy11bladeknight17StateDoubleAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11bladeknight17StateDoubleAttackFv - .byte4 procAnim__Q53scn4step5enemy11bladeknight17StateDoubleAttackFv - .byte4 procMove__Q53scn4step5enemy11bladeknight17StateDoubleAttackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11bladeknight17StateDoubleAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11bladeknight17StateDoubleAttackFv + .4byte procAnim__Q53scn4step5enemy11bladeknight17StateDoubleAttackFv + .4byte procMove__Q53scn4step5enemy11bladeknight17StateDoubleAttackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11bladeknight17StateDoubleAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255847 diff --git a/asm/src/StateDoubleKick.s b/asm/src/StateDoubleKick.s index 44833ab8..a6262ea3 100644 --- a/asm/src/StateDoubleKick.s +++ b/asm/src/StateDoubleKick.s @@ -311,13 +311,13 @@ createWeapon__Q53scn4step4hero7fighter15StateDoubleKickFv: __vt__Q53scn4step4hero7fighter15StateDoubleKick: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter15StateDoubleKickFv - .byte4 procAnim__Q53scn4step4hero7fighter15StateDoubleKickFv - .byte4 procMove__Q53scn4step4hero7fighter15StateDoubleKickFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter15StateDoubleKickFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter15StateDoubleKickFv + .4byte procAnim__Q53scn4step4hero7fighter15StateDoubleKickFv + .4byte procMove__Q53scn4step4hero7fighter15StateDoubleKickFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter15StateDoubleKickFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateDrink.s b/asm/src/StateDrink.s index f5a50de9..744c0ef6 100644 --- a/asm/src/StateDrink.s +++ b/asm/src/StateDrink.s @@ -500,31 +500,31 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11Stat __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateMixPre$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateMixPre$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateMixPre$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateMixPre$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateMixPre$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateDrink$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateDrink$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateDrink$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateDrink$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateDrink$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateDrink$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common10StateDrink __vt__Q53scn4step4hero6common10StateDrink: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common10StateDrinkFv - .byte4 procAnim__Q53scn4step4hero6common10StateDrinkFv - .byte4 procMove__Q53scn4step4hero6common10StateDrinkFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common10StateDrinkFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common10StateDrinkFv + .4byte procAnim__Q53scn4step4hero6common10StateDrinkFv + .4byte procMove__Q53scn4step4hero6common10StateDrinkFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common10StateDrinkFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateEat.s b/asm/src/StateEat.s index 8521d0ff..e0786fa5 100644 --- a/asm/src/StateEat.s +++ b/asm/src/StateEat.s @@ -123,11 +123,11 @@ procFixPos__Q53scn4step4hero6common8StateEatFv: __vt__Q53scn4step4hero6common8StateEat: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common8StateEatFv - .byte4 procAnim__Q53scn4step4hero6common8StateEatFv - .byte4 procMove__Q53scn4step4hero6common8StateEatFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common8StateEatFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common8StateEatFv + .4byte procAnim__Q53scn4step4hero6common8StateEatFv + .4byte procMove__Q53scn4step4hero6common8StateEatFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common8StateEatFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateEaten.s b/asm/src/StateEaten.s index 2d566aee..7dc479fa 100644 --- a/asm/src/StateEaten.s +++ b/asm/src/StateEaten.s @@ -565,13 +565,13 @@ endState__Q53scn4step4hero12interference10StateEatenFv: __vt__Q53scn4step4hero12interference10StateEaten: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero12interference10StateEatenFv - .byte4 procAnim__Q53scn4step4hero12interference10StateEatenFv - .byte4 procMove__Q53scn4step4hero12interference10StateEatenFv - .byte4 procConstraint__Q53scn4step4hero12interference10StateEatenFv - .byte4 procFixPos__Q43scn4step4hero9StateBaseFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero12interference10StateEatenFv + .4byte procAnim__Q53scn4step4hero12interference10StateEatenFv + .4byte procMove__Q53scn4step4hero12interference10StateEatenFv + .4byte procConstraint__Q53scn4step4hero12interference10StateEatenFv + .4byte procFixPos__Q43scn4step4hero9StateBaseFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateEnd.s b/asm/src/StateEnd.s index 9210a8cf..1d97b365 100644 --- a/asm/src/StateEnd.s +++ b/asm/src/StateEnd.s @@ -147,13 +147,13 @@ procFixPos__Q53scn4step4hero5stone8StateEndFv: __vt__Q53scn4step4hero5stone8StateEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5stone8StateEndFv - .byte4 procAnim__Q53scn4step4hero5stone8StateEndFv - .byte4 procMove__Q53scn4step4hero5stone8StateEndFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5stone8StateEndFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5stone8StateEndFv + .4byte procAnim__Q53scn4step4hero5stone8StateEndFv + .4byte procMove__Q53scn4step4hero5stone8StateEndFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5stone8StateEndFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateEndure.s b/asm/src/StateEndure.s index 4c3c4159..e85f92c4 100644 --- a/asm/src/StateEndure.s +++ b/asm/src/StateEndure.s @@ -136,9 +136,9 @@ lbl_802C5A24: __vt__Q53scn4step5enemy7mumbies11StateEndure: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7mumbies11StateEndureFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy7mumbies11StateEndureFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7mumbies11StateEndureFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7mumbies11StateEndureFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy7mumbies11StateEndureFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7mumbies11StateEndureFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateEnterChallengeDoor.s b/asm/src/StateEnterChallengeDoor.s index 6e8dc565..8125c9b1 100644 --- a/asm/src/StateEnterChallengeDoor.s +++ b/asm/src/StateEnterChallengeDoor.s @@ -279,13 +279,13 @@ lbl_8037C730: __vt__Q53scn4step4hero7gimmick23StateEnterChallengeDoor: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick23StateEnterChallengeDoorFv - .byte4 procAnim__Q53scn4step4hero7gimmick23StateEnterChallengeDoorFv - .byte4 procMove__Q53scn4step4hero7gimmick23StateEnterChallengeDoorFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick23StateEnterChallengeDoorFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick23StateEnterChallengeDoorFv + .4byte procAnim__Q53scn4step4hero7gimmick23StateEnterChallengeDoorFv + .4byte procMove__Q53scn4step4hero7gimmick23StateEnterChallengeDoorFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick23StateEnterChallengeDoorFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateEnterChallengeDoorPre.s b/asm/src/StateEnterChallengeDoorPre.s index c2b91b8f..1e22fc86 100644 --- a/asm/src/StateEnterChallengeDoorPre.s +++ b/asm/src/StateEnterChallengeDoorPre.s @@ -594,19 +594,19 @@ __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26St __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick13challengedoor6Result$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick13challengedoor6Result$$1Fv - .byte4 create__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick13challengedoor6Result$$1Fv + .4byte __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick13challengedoor6Result$$1Fv + .4byte create__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick13challengedoor6Result$$1Fv .global __vt__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre __vt__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPreFv - .byte4 procAnim__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPreFv - .byte4 procMove__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPreFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPreFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPreFv + .4byte procAnim__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPreFv + .4byte procMove__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPreFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPreFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateEnterDoor.s b/asm/src/StateEnterDoor.s index f5354278..92bb1d36 100644 --- a/asm/src/StateEnterDoor.s +++ b/asm/src/StateEnterDoor.s @@ -822,19 +822,19 @@ __dt__Q24util132StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick14St __vt__Q24util132StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateEnterDoor$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick4door6Result$$4b$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util132StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateEnterDoor$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick4door6Result$$4b$$4b$$1Fv - .byte4 create__Q24util132StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateEnterDoor$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick4door6Result$$4b$$4b$$1Fv + .4byte __dt__Q24util132StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateEnterDoor$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick4door6Result$$4b$$4b$$1Fv + .4byte create__Q24util132StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateEnterDoor$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick4door6Result$$4b$$4b$$1Fv .global __vt__Q53scn4step4hero7gimmick14StateEnterDoor __vt__Q53scn4step4hero7gimmick14StateEnterDoor: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick14StateEnterDoorFv - .byte4 procAnim__Q53scn4step4hero7gimmick14StateEnterDoorFv - .byte4 procMove__Q53scn4step4hero7gimmick14StateEnterDoorFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick14StateEnterDoorFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick14StateEnterDoorFv + .4byte procAnim__Q53scn4step4hero7gimmick14StateEnterDoorFv + .4byte procMove__Q53scn4step4hero7gimmick14StateEnterDoorFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick14StateEnterDoorFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateEnterMahoroa.s b/asm/src/StateEnterMahoroa.s index bb46b0d0..a724622a 100644 --- a/asm/src/StateEnterMahoroa.s +++ b/asm/src/StateEnterMahoroa.s @@ -1866,19 +1866,19 @@ T_OFS_LIST3__31$$2unnamed$$2StateEnterMahoroa_cpp$$2: __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateLeaveMahoroa$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateLeaveMahoroa$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateLeaveMahoroa$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateLeaveMahoroa$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateLeaveMahoroa$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7gimmick17StateEnterMahoroa __vt__Q53scn4step4hero7gimmick17StateEnterMahoroa: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick17StateEnterMahoroaFv - .byte4 procAnim__Q53scn4step4hero7gimmick17StateEnterMahoroaFv - .byte4 procMove__Q53scn4step4hero7gimmick17StateEnterMahoroaFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick17StateEnterMahoroaFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick17StateEnterMahoroaFv + .4byte procAnim__Q53scn4step4hero7gimmick17StateEnterMahoroaFv + .4byte procMove__Q53scn4step4hero7gimmick17StateEnterMahoroaFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick17StateEnterMahoroaFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateEscape.s b/asm/src/StateEscape.s index 50a004d6..11c43b80 100644 --- a/asm/src/StateEscape.s +++ b/asm/src/StateEscape.s @@ -356,24 +356,24 @@ lbl_802DE524: __vt__Q53scn4step5enemy6scarfy11StateEscape: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6scarfy11StateEscapeFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy6scarfy11StateEscapeFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6scarfy11StateEscapeFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy6scarfy11StateEscapeFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld11StateEscape __vt__Q53scn4step5enemy5sheld11StateEscape: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5sheld11StateEscapeFv - .byte4 procAnim__Q53scn4step5enemy5sheld11StateEscapeFv - .byte4 procMove__Q53scn4step5enemy5sheld11StateEscapeFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5sheld11StateEscapeFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5sheld11StateEscapeFv + .4byte procAnim__Q53scn4step5enemy5sheld11StateEscapeFv + .4byte procMove__Q53scn4step5enemy5sheld11StateEscapeFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5sheld11StateEscapeFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257269 diff --git a/asm/src/StateExplosion.s b/asm/src/StateExplosion.s index 47b12975..52d590a8 100644 --- a/asm/src/StateExplosion.s +++ b/asm/src/StateExplosion.s @@ -1010,72 +1010,72 @@ __dt__Q53scn4step6weapon12dededehammer14StateExplosionFv: __vt__Q53scn4step6weapon12hammerhammer14StateExplosion: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon12hammerhammer14StateExplosionFv - .byte4 procAnim__Q53scn4step6weapon12hammerhammer14StateExplosionFv - .byte4 procMove__Q53scn4step6weapon12hammerhammer14StateExplosionFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon12hammerhammer14StateExplosionFv - .byte4 procObjCollReact__Q53scn4step6weapon12hammerhammer14StateExplosionFv + .4byte __dt__Q53scn4step6weapon12hammerhammer14StateExplosionFv + .4byte procAnim__Q53scn4step6weapon12hammerhammer14StateExplosionFv + .4byte procMove__Q53scn4step6weapon12hammerhammer14StateExplosionFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon12hammerhammer14StateExplosionFv + .4byte procObjCollReact__Q53scn4step6weapon12hammerhammer14StateExplosionFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon16fightersmashshot14StateExplosion __vt__Q53scn4step6weapon16fightersmashshot14StateExplosion: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon16fightersmashshot14StateExplosionFv - .byte4 procAnim__Q53scn4step6weapon16fightersmashshot14StateExplosionFv - .byte4 procMove__Q53scn4step6weapon16fightersmashshot14StateExplosionFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon16fightersmashshot14StateExplosionFv - .byte4 procObjCollReact__Q53scn4step6weapon16fightersmashshot14StateExplosionFv + .4byte __dt__Q53scn4step6weapon16fightersmashshot14StateExplosionFv + .4byte procAnim__Q53scn4step6weapon16fightersmashshot14StateExplosionFv + .4byte procMove__Q53scn4step6weapon16fightersmashshot14StateExplosionFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon16fightersmashshot14StateExplosionFv + .4byte procObjCollReact__Q53scn4step6weapon16fightersmashshot14StateExplosionFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon15fighterkickshot14StateExplosion __vt__Q53scn4step6weapon15fighterkickshot14StateExplosion: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon15fighterkickshot14StateExplosionFv - .byte4 procAnim__Q53scn4step6weapon15fighterkickshot14StateExplosionFv - .byte4 procMove__Q53scn4step6weapon15fighterkickshot14StateExplosionFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon15fighterkickshot14StateExplosionFv - .byte4 procObjCollReact__Q53scn4step6weapon15fighterkickshot14StateExplosionFv + .4byte __dt__Q53scn4step6weapon15fighterkickshot14StateExplosionFv + .4byte procAnim__Q53scn4step6weapon15fighterkickshot14StateExplosionFv + .4byte procMove__Q53scn4step6weapon15fighterkickshot14StateExplosionFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon15fighterkickshot14StateExplosionFv + .4byte procObjCollReact__Q53scn4step6weapon15fighterkickshot14StateExplosionFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon16fighterhadoushot14StateExplosion __vt__Q53scn4step6weapon16fighterhadoushot14StateExplosion: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon16fighterhadoushot14StateExplosionFv - .byte4 procAnim__Q53scn4step6weapon16fighterhadoushot14StateExplosionFv - .byte4 procMove__Q53scn4step6weapon16fighterhadoushot14StateExplosionFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon16fighterhadoushot14StateExplosionFv - .byte4 procObjCollReact__Q53scn4step6weapon16fighterhadoushot14StateExplosionFv + .4byte __dt__Q53scn4step6weapon16fighterhadoushot14StateExplosionFv + .4byte procAnim__Q53scn4step6weapon16fighterhadoushot14StateExplosionFv + .4byte procMove__Q53scn4step6weapon16fighterhadoushot14StateExplosionFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon16fighterhadoushot14StateExplosionFv + .4byte procObjCollReact__Q53scn4step6weapon16fighterhadoushot14StateExplosionFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon23combinationdededebomber14StateExplosion __vt__Q53scn4step6weapon23combinationdededebomber14StateExplosion: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon23combinationdededebomber14StateExplosionFv - .byte4 procAnim__Q53scn4step6weapon23combinationdededebomber14StateExplosionFv - .byte4 procMove__Q53scn4step6weapon23combinationdededebomber14StateExplosionFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon23combinationdededebomber14StateExplosionFv - .byte4 procObjCollReact__Q53scn4step6weapon23combinationdededebomber14StateExplosionFv + .4byte __dt__Q53scn4step6weapon23combinationdededebomber14StateExplosionFv + .4byte procAnim__Q53scn4step6weapon23combinationdededebomber14StateExplosionFv + .4byte procMove__Q53scn4step6weapon23combinationdededebomber14StateExplosionFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon23combinationdededebomber14StateExplosionFv + .4byte procObjCollReact__Q53scn4step6weapon23combinationdededebomber14StateExplosionFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12dededehammer14StateExplosion __vt__Q53scn4step6weapon12dededehammer14StateExplosion: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon12dededehammer14StateExplosionFv - .byte4 procAnim__Q53scn4step6weapon12dededehammer14StateExplosionFv - .byte4 procMove__Q53scn4step6weapon12dededehammer14StateExplosionFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon12dededehammer14StateExplosionFv - .byte4 procObjCollReact__Q53scn4step6weapon12dededehammer14StateExplosionFv + .4byte __dt__Q53scn4step6weapon12dededehammer14StateExplosionFv + .4byte procAnim__Q53scn4step6weapon12dededehammer14StateExplosionFv + .4byte procMove__Q53scn4step6weapon12dededehammer14StateExplosionFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon12dededehammer14StateExplosionFv + .4byte procObjCollReact__Q53scn4step6weapon12dededehammer14StateExplosionFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256495 diff --git a/asm/src/StateExtreme.s b/asm/src/StateExtreme.s index 93e12a73..22bff59d 100644 --- a/asm/src/StateExtreme.s +++ b/asm/src/StateExtreme.s @@ -380,19 +380,19 @@ __dt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10Stat __vt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateFaint$$4PQ43scn4step4hero4Hero$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateFaint$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv - .byte4 create__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateFaint$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte __dt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateFaint$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte create__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateFaint$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q53scn4step4hero6damage12StateExtreme __vt__Q53scn4step4hero6damage12StateExtreme: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6damage12StateExtremeFv - .byte4 procAnim__Q53scn4step4hero6damage12StateExtremeFv - .byte4 procMove__Q53scn4step4hero6damage12StateExtremeFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6damage12StateExtremeFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6damage12StateExtremeFv + .4byte procAnim__Q53scn4step4hero6damage12StateExtremeFv + .4byte procMove__Q53scn4step4hero6damage12StateExtremeFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6damage12StateExtremeFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateFaceChange.s b/asm/src/StateFaceChange.s index ca78c7cb..32d48989 100644 --- a/asm/src/StateFaceChange.s +++ b/asm/src/StateFaceChange.s @@ -248,9 +248,9 @@ lbl_802DB160: __vt__Q53scn4step5enemy6scarfy15StateFaceChange: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6scarfy15StateFaceChangeFv - .byte4 procAnim__Q53scn4step5enemy6scarfy15StateFaceChangeFv - .byte4 procMove__Q53scn4step5enemy6scarfy15StateFaceChangeFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6scarfy15StateFaceChangeFv + .4byte procAnim__Q53scn4step5enemy6scarfy15StateFaceChangeFv + .4byte procMove__Q53scn4step5enemy6scarfy15StateFaceChangeFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateFaint.s b/asm/src/StateFaint.s index 8f577ac6..a5539cfc 100644 --- a/asm/src/StateFaint.s +++ b/asm/src/StateFaint.s @@ -211,17 +211,17 @@ __dt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11Stat __vt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateWakeUp$$4PQ43scn4step4hero4Hero$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateWakeUp$$4PQ43scn4step4hero4Hero$$4b$$1Fv - .byte4 create__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateWakeUp$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte __dt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateWakeUp$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte create__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateWakeUp$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero6common10StateFaint __vt__Q53scn4step4hero6common10StateFaint: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common10StateFaintFv - .byte4 procAnim__Q53scn4step4hero6common10StateFaintFv - .byte4 procMove__Q53scn4step4hero6common10StateFaintFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common10StateFaintFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common10StateFaintFv + .4byte procAnim__Q53scn4step4hero6common10StateFaintFv + .4byte procMove__Q53scn4step4hero6common10StateFaintFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common10StateFaintFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateFall.s b/asm/src/StateFall.s index 126df122..6c41e731 100644 --- a/asm/src/StateFall.s +++ b/asm/src/StateFall.s @@ -3422,223 +3422,223 @@ lbl_803C7B58: __vt__Q53scn4step4boss6common9StateFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common9StateFallFv - .byte4 procAnim__Q53scn4step4boss6common9StateFallFv - .byte4 procMove__Q53scn4step4boss6common9StateFallFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common9StateFallFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6common9StateFallFv + .4byte procAnim__Q53scn4step4boss6common9StateFallFv + .4byte procMove__Q53scn4step4boss6common9StateFallFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common9StateFallFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6common9StateFall __vt__Q53scn4step5enemy6common9StateFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common9StateFallFv - .byte4 procAnim__Q53scn4step5enemy6common9StateFallFv - .byte4 procMove__Q53scn4step5enemy6common9StateFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common9StateFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common9StateFallFv + .4byte procAnim__Q53scn4step5enemy6common9StateFallFv + .4byte procMove__Q53scn4step5enemy6common9StateFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common9StateFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper9StateFall __vt__Q53scn4step5enemy7blipper9StateFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7blipper9StateFallFv - .byte4 procAnim__Q53scn4step5enemy7blipper9StateFallFv - .byte4 procMove__Q53scn4step5enemy7blipper9StateFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7blipper9StateFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7blipper9StateFallFv + .4byte procAnim__Q53scn4step5enemy7blipper9StateFallFv + .4byte procMove__Q53scn4step5enemy7blipper9StateFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7blipper9StateFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu9StateFall __vt__Q53scn4step5enemy4kabu9StateFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4kabu9StateFallFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy4kabu9StateFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4kabu9StateFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy4kabu9StateFallFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy4kabu9StateFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4kabu9StateFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6leafan9StateFall __vt__Q53scn4step5enemy6leafan9StateFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6leafan9StateFallFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy6leafan9StateFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6leafan9StateFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6leafan9StateFallFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy6leafan9StateFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6leafan9StateFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12StateStopAir$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12StateStopAir$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12StateStopAir$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12StateStopAir$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12StateStopAir$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12StateStopAir$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5nruff9StateFall __vt__Q53scn4step5enemy5nruff9StateFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5nruff9StateFallFv - .byte4 procAnim__Q53scn4step5enemy5nruff9StateFallFv - .byte4 procMove__Q53scn4step5enemy5nruff9StateFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5nruff9StateFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5nruff9StateFallFv + .4byte procAnim__Q53scn4step5enemy5nruff9StateFallFv + .4byte procMove__Q53scn4step5enemy5nruff9StateFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5nruff9StateFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10parasoldee9StateFall __vt__Q53scn4step5enemy10parasoldee9StateFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10parasoldee9StateFallFv - .byte4 procAnim__Q53scn4step5enemy10parasoldee9StateFallFv - .byte4 procMove__Q53scn4step5enemy10parasoldee9StateFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10parasoldee9StateFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10parasoldee9StateFallFv + .4byte procAnim__Q53scn4step5enemy10parasoldee9StateFallFv + .4byte procMove__Q53scn4step5enemy10parasoldee9StateFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10parasoldee9StateFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10parasoldoo9StateFall __vt__Q53scn4step5enemy10parasoldoo9StateFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10parasoldoo9StateFallFv - .byte4 procAnim__Q53scn4step5enemy10parasoldoo9StateFallFv - .byte4 procMove__Q53scn4step5enemy10parasoldoo9StateFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10parasoldoo9StateFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10parasoldoo9StateFallFv + .4byte procAnim__Q53scn4step5enemy10parasoldoo9StateFallFv + .4byte procMove__Q53scn4step5enemy10parasoldoo9StateFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10parasoldoo9StateFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5rocky9StateFall __vt__Q53scn4step5enemy5rocky9StateFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5rocky9StateFallFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy5rocky9StateFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5rocky9StateFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5rocky9StateFallFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy5rocky9StateFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5rocky9StateFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld9StateFall __vt__Q53scn4step5enemy5sheld9StateFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5sheld9StateFallFv - .byte4 procAnim__Q53scn4step5enemy5sheld9StateFallFv - .byte4 procMove__Q53scn4step5enemy5sheld9StateFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5sheld9StateFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5sheld9StateFallFv + .4byte procAnim__Q53scn4step5enemy5sheld9StateFallFv + .4byte procMove__Q53scn4step5enemy5sheld9StateFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5sheld9StateFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound9StateFall __vt__Q53scn4step5enemy11sisterbound9StateFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11sisterbound9StateFallFv - .byte4 procAnim__Q53scn4step5enemy11sisterbound9StateFallFv - .byte4 procMove__Q53scn4step5enemy11sisterbound9StateFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11sisterbound9StateFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11sisterbound9StateFallFv + .4byte procAnim__Q53scn4step5enemy11sisterbound9StateFallFv + .4byte procMove__Q53scn4step5enemy11sisterbound9StateFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11sisterbound9StateFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9tsukikage9StateFall __vt__Q53scn4step5enemy9tsukikage9StateFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9tsukikage9StateFallFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy9tsukikage9StateFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9tsukikage9StateFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9tsukikage9StateFallFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy9tsukikage9StateFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9tsukikage9StateFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound1$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1 __vt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound1$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound1$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1Fv - .byte4 create__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound1$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1Fv + .4byte __dt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound1$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1Fv + .4byte create__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound1$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1Fv .global __vt__Q53scn4step5enemy11whispyapple9StateFall __vt__Q53scn4step5enemy11whispyapple9StateFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11whispyapple9StateFallFv - .byte4 procAnim__Q53scn4step5enemy11whispyapple9StateFallFv - .byte4 procMove__Q53scn4step5enemy11whispyapple9StateFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11whispyapple9StateFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11whispyapple9StateFallFv + .4byte procAnim__Q53scn4step5enemy11whispyapple9StateFallFv + .4byte procMove__Q53scn4step5enemy11whispyapple9StateFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11whispyapple9StateFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13StatePlancher$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13StatePlancher$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13StatePlancher$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13StatePlancher$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13StatePlancher$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13StatePlancher$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common9StateFall __vt__Q53scn4step4hero6common9StateFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common9StateFallFv - .byte4 procAnim__Q53scn4step4hero6common9StateFallFv - .byte4 procMove__Q53scn4step4hero6common9StateFallFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common9StateFallFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common9StateFallFv + .4byte procAnim__Q53scn4step4hero6common9StateFallFv + .4byte procMove__Q53scn4step4hero6common9StateFallFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common9StateFallFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -3646,25 +3646,25 @@ __vt__Q53scn4step4hero6common9StateFall: __vt__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone12StateLanding$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone12StateLanding$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv - .byte4 create__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone12StateLanding$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .4byte __dt__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone12StateLanding$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .4byte create__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone12StateLanding$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv .global __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5stone8StateEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5stone8StateEnd$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5stone8StateEnd$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5stone8StateEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5stone8StateEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5stone8StateEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5stone9StateFall __vt__Q53scn4step4hero5stone9StateFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5stone9StateFallFv - .byte4 procAnim__Q53scn4step4hero5stone9StateFallFv - .byte4 procMove__Q53scn4step4hero5stone9StateFallFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5stone9StateFallFv - .byte4 procObjCollReact__Q53scn4step4hero5stone9StateFallFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5stone9StateFallFv + .4byte procAnim__Q53scn4step4hero5stone9StateFallFv + .4byte procMove__Q53scn4step4hero5stone9StateFallFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5stone9StateFallFv + .4byte procObjCollReact__Q53scn4step4hero5stone9StateFallFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -3672,10 +3672,10 @@ __vt__Q53scn4step4hero5stone9StateFall: __vt__Q53scn4step4item5state9StateFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4item5state9StateFallFv - .byte4 procAnim__Q53scn4step4item5state9StateFallFv - .byte4 procMove__Q53scn4step4item5state9StateFallFv - .byte4 procFixPos__Q53scn4step4item5state9StateFallFv + .4byte __dt__Q53scn4step4item5state9StateFallFv + .4byte procAnim__Q53scn4step4item5state9StateFallFv + .4byte procMove__Q53scn4step4item5state9StateFallFv + .4byte procFixPos__Q53scn4step4item5state9StateFallFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255720 diff --git a/asm/src/StateFallEnemy.s b/asm/src/StateFallEnemy.s index 67b9de5c..24240bd4 100644 --- a/asm/src/StateFallEnemy.s +++ b/asm/src/StateFallEnemy.s @@ -243,9 +243,9 @@ lbl_8025D7B0: __vt__Q53scn4step4boss6whispy14StateFallEnemy: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy14StateFallEnemyFv - .byte4 procAnim__Q53scn4step4boss6whispy14StateFallEnemyFv - .byte4 procMove__Q53scn4step4boss6whispy14StateFallEnemyFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy14StateFallEnemyFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6whispy14StateFallEnemyFv + .4byte procAnim__Q53scn4step4boss6whispy14StateFallEnemyFv + .4byte procMove__Q53scn4step4boss6whispy14StateFallEnemyFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy14StateFallEnemyFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateFallFeathery.s b/asm/src/StateFallFeathery.s index 848acdf0..320c492a 100644 --- a/asm/src/StateFallFeathery.s +++ b/asm/src/StateFallFeathery.s @@ -142,7 +142,7 @@ lbl_803C7D34: __vt__Q53scn4step4item5state17StateFallFeathery: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4item5state17StateFallFeatheryFv - .byte4 procAnim__Q53scn4step4item5state17StateFallFeatheryFv - .byte4 procMove__Q53scn4step4item5state17StateFallFeatheryFv - .byte4 procFixPos__Q53scn4step4item5state17StateFallFeatheryFv + .4byte __dt__Q53scn4step4item5state17StateFallFeatheryFv + .4byte procAnim__Q53scn4step4item5state17StateFallFeatheryFv + .4byte procMove__Q53scn4step4item5state17StateFallFeatheryFv + .4byte procFixPos__Q53scn4step4item5state17StateFallFeatheryFv diff --git a/asm/src/StateFallNoDecel.s b/asm/src/StateFallNoDecel.s index 4ba1ac4c..c2891d8a 100644 --- a/asm/src/StateFallNoDecel.s +++ b/asm/src/StateFallNoDecel.s @@ -71,12 +71,12 @@ procFixPos__Q53scn4step5enemy6common16StateFallNoDecelFv: __vt__Q53scn4step5enemy6common16StateFallNoDecel: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common16StateFallNoDecelFv - .byte4 procAnim__Q53scn4step5enemy6common16StateFallNoDecelFv - .byte4 procMove__Q53scn4step5enemy6common16StateFallNoDecelFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common16StateFallNoDecelFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common16StateFallNoDecelFv + .4byte procAnim__Q53scn4step5enemy6common16StateFallNoDecelFv + .4byte procMove__Q53scn4step5enemy6common16StateFallNoDecelFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common16StateFallNoDecelFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255747 diff --git a/asm/src/StateFallScrewStart.s b/asm/src/StateFallScrewStart.s index 59b270c4..27211830 100644 --- a/asm/src/StateFallScrewStart.s +++ b/asm/src/StateFallScrewStart.s @@ -199,11 +199,11 @@ procFixPos__Q53scn4step4hero5stone19StateFallScrewStartFv: __vt__Q53scn4step4hero5stone19StateFallScrewStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5stone19StateFallScrewStartFv - .byte4 procAnim__Q53scn4step4hero5stone19StateFallScrewStartFv - .byte4 procMove__Q53scn4step4hero5stone19StateFallScrewStartFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5stone19StateFallScrewStartFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5stone19StateFallScrewStartFv + .4byte procAnim__Q53scn4step4hero5stone19StateFallScrewStartFv + .4byte procMove__Q53scn4step4hero5stone19StateFallScrewStartFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5stone19StateFallScrewStartFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateFattyBufferAppearFall.s b/asm/src/StateFattyBufferAppearFall.s index 4d7e29de..3f9f1824 100644 --- a/asm/src/StateFattyBufferAppearFall.s +++ b/asm/src/StateFattyBufferAppearFall.s @@ -188,12 +188,12 @@ procFixPos__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv: __vt__Q53scn4step5enemy7blipper26StateFattyBufferAppearFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv - .byte4 procAnim__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv - .byte4 procMove__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv + .4byte procAnim__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv + .4byte procMove__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256135 diff --git a/asm/src/StateFattyBufferEscapeNear.s b/asm/src/StateFattyBufferEscapeNear.s index 42fa8149..90de11de 100644 --- a/asm/src/StateFattyBufferEscapeNear.s +++ b/asm/src/StateFattyBufferEscapeNear.s @@ -121,12 +121,12 @@ __dt__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFv: __vt__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFv - .byte4 procAnim__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFv - .byte4 procMove__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFv + .4byte procAnim__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFv + .4byte procMove__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256586 diff --git a/asm/src/StateFinalCutterDrop.s b/asm/src/StateFinalCutterDrop.s index bcd91492..6872b3e0 100644 --- a/asm/src/StateFinalCutterDrop.s +++ b/asm/src/StateFinalCutterDrop.s @@ -273,17 +273,17 @@ __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash23Stat __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash23StateFinalCutterLanding$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash23StateFinalCutterLanding$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash23StateFinalCutterLanding$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash23StateFinalCutterLanding$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash23StateFinalCutterLanding$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5smash20StateFinalCutterDrop __vt__Q53scn4step4hero5smash20StateFinalCutterDrop: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5smash20StateFinalCutterDropFv - .byte4 procAnim__Q53scn4step4hero5smash20StateFinalCutterDropFv - .byte4 procMove__Q53scn4step4hero5smash20StateFinalCutterDropFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5smash20StateFinalCutterDropFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5smash20StateFinalCutterDropFv + .4byte procAnim__Q53scn4step4hero5smash20StateFinalCutterDropFv + .4byte procMove__Q53scn4step4hero5smash20StateFinalCutterDropFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5smash20StateFinalCutterDropFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateFinalCutterLanding.s b/asm/src/StateFinalCutterLanding.s index 61c5c58d..ea429b8b 100644 --- a/asm/src/StateFinalCutterLanding.s +++ b/asm/src/StateFinalCutterLanding.s @@ -227,13 +227,13 @@ procFixPos__Q53scn4step4hero5smash23StateFinalCutterLandingFv: __vt__Q53scn4step4hero5smash23StateFinalCutterLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5smash23StateFinalCutterLandingFv - .byte4 procAnim__Q53scn4step4hero5smash23StateFinalCutterLandingFv - .byte4 procMove__Q53scn4step4hero5smash23StateFinalCutterLandingFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5smash23StateFinalCutterLandingFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5smash23StateFinalCutterLandingFv + .4byte procAnim__Q53scn4step4hero5smash23StateFinalCutterLandingFv + .4byte procMove__Q53scn4step4hero5smash23StateFinalCutterLandingFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5smash23StateFinalCutterLandingFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateFinalCutterPre.s b/asm/src/StateFinalCutterPre.s index f7e16f10..84c8d4b0 100644 --- a/asm/src/StateFinalCutterPre.s +++ b/asm/src/StateFinalCutterPre.s @@ -202,23 +202,23 @@ __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20Stat __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterRise$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterRise$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterRise$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterRise$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterRise$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash19StateFinalCutterPre$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash19StateFinalCutterPre$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash19StateFinalCutterPre$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash19StateFinalCutterPre$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash19StateFinalCutterPre$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash19StateFinalCutterPre$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5smash19StateFinalCutterPre __vt__Q53scn4step4hero5smash19StateFinalCutterPre: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5smash19StateFinalCutterPreFv - .byte4 procAnim__Q53scn4step4hero5smash19StateFinalCutterPreFv - .byte4 procMove__Q53scn4step4hero5smash19StateFinalCutterPreFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5smash19StateFinalCutterPreFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5smash19StateFinalCutterPreFv + .4byte procAnim__Q53scn4step4hero5smash19StateFinalCutterPreFv + .4byte procMove__Q53scn4step4hero5smash19StateFinalCutterPreFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5smash19StateFinalCutterPreFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateFinalCutterRise.s b/asm/src/StateFinalCutterRise.s index e86ce2c3..4d632773 100644 --- a/asm/src/StateFinalCutterRise.s +++ b/asm/src/StateFinalCutterRise.s @@ -264,19 +264,19 @@ __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20Stat __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterDrop$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterDrop$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterDrop$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterDrop$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterDrop$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5smash20StateFinalCutterRise __vt__Q53scn4step4hero5smash20StateFinalCutterRise: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5smash20StateFinalCutterRiseFv - .byte4 procAnim__Q53scn4step4hero5smash20StateFinalCutterRiseFv - .byte4 procMove__Q53scn4step4hero5smash20StateFinalCutterRiseFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5smash20StateFinalCutterRiseFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5smash20StateFinalCutterRiseFv + .4byte procAnim__Q53scn4step4hero5smash20StateFinalCutterRiseFv + .4byte procMove__Q53scn4step4hero5smash20StateFinalCutterRiseFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5smash20StateFinalCutterRiseFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateFireBlock.s b/asm/src/StateFireBlock.s index 51fcab43..34399051 100644 --- a/asm/src/StateFireBlock.s +++ b/asm/src/StateFireBlock.s @@ -426,13 +426,13 @@ lbl_8037662C: __vt__Q53scn4step4hero6damage14StateFireBlock: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6damage14StateFireBlockFv - .byte4 procAnim__Q53scn4step4hero6damage14StateFireBlockFv - .byte4 procMove__Q53scn4step4hero6damage14StateFireBlockFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6damage14StateFireBlockFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6damage14StateFireBlockFv + .4byte procAnim__Q53scn4step4hero6damage14StateFireBlockFv + .4byte procMove__Q53scn4step4hero6damage14StateFireBlockFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6damage14StateFireBlockFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateFireLv2.s b/asm/src/StateFireLv2.s index 83736016..cc4dfac1 100644 --- a/asm/src/StateFireLv2.s +++ b/asm/src/StateFireLv2.s @@ -336,13 +336,13 @@ lbl_80376AEC: __vt__Q53scn4step4hero6damage12StateFireLv2: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6damage12StateFireLv2Fv - .byte4 procAnim__Q53scn4step4hero6damage12StateFireLv2Fv - .byte4 procMove__Q53scn4step4hero6damage12StateFireLv2Fv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6damage12StateFireLv2Fv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6damage12StateFireLv2Fv + .4byte procAnim__Q53scn4step4hero6damage12StateFireLv2Fv + .4byte procMove__Q53scn4step4hero6damage12StateFireLv2Fv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6damage12StateFireLv2Fv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateFireLv3.s b/asm/src/StateFireLv3.s index 63cfbaa8..82c96f5e 100644 --- a/asm/src/StateFireLv3.s +++ b/asm/src/StateFireLv3.s @@ -341,13 +341,13 @@ lbl_80376FBC: __vt__Q53scn4step4hero6damage12StateFireLv3: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6damage12StateFireLv3Fv - .byte4 procAnim__Q53scn4step4hero6damage12StateFireLv3Fv - .byte4 procMove__Q53scn4step4hero6damage12StateFireLv3Fv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6damage12StateFireLv3Fv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6damage12StateFireLv3Fv + .4byte procAnim__Q53scn4step4hero6damage12StateFireLv3Fv + .4byte procMove__Q53scn4step4hero6damage12StateFireLv3Fv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6damage12StateFireLv3Fv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateFirst.s b/asm/src/StateFirst.s index 7b454ce5..9f671836 100644 --- a/asm/src/StateFirst.s +++ b/asm/src/StateFirst.s @@ -129,15 +129,15 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11Stat __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateAppear$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6whispy10StateFirst __vt__Q53scn4step4boss6whispy10StateFirst: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy10StateFirstFv - .byte4 procAnim__Q53scn4step4boss6whispy10StateFirstFv - .byte4 procMove__Q53scn4step4boss6whispy10StateFirstFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy10StateFirstFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6whispy10StateFirstFv + .4byte procAnim__Q53scn4step4boss6whispy10StateFirstFv + .4byte procMove__Q53scn4step4boss6whispy10StateFirstFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy10StateFirstFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateFirstDemo.s b/asm/src/StateFirstDemo.s index b0222659..572bb5bd 100644 --- a/asm/src/StateFirstDemo.s +++ b/asm/src/StateFirstDemo.s @@ -356,13 +356,13 @@ lbl_8037FA2C: __vt__Q53scn4step4hero7gimmick14StateFirstDemo: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick14StateFirstDemoFv - .byte4 procAnim__Q53scn4step4hero7gimmick14StateFirstDemoFv - .byte4 procMove__Q53scn4step4hero7gimmick14StateFirstDemoFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick14StateFirstDemoFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick14StateFirstDemoFv + .4byte procAnim__Q53scn4step4hero7gimmick14StateFirstDemoFv + .4byte procMove__Q53scn4step4hero7gimmick14StateFirstDemoFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick14StateFirstDemoFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateFirstMotion.s b/asm/src/StateFirstMotion.s index 7cc4ab33..0d2bb25a 100644 --- a/asm/src/StateFirstMotion.s +++ b/asm/src/StateFirstMotion.s @@ -491,29 +491,29 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14Sta __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateMoonSault$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateMoonSault$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateMoonSault$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateMoonSault$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateMoonSault$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateRising$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateRising$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateRising$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateRising$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateRising$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateRising$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter16StateFirstMotion$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter16StateFirstMotion$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter16StateFirstMotion$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter16StateFirstMotion$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter16StateFirstMotion$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter16StateFirstMotion$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7fighter16StateFirstMotion __vt__Q53scn4step4hero7fighter16StateFirstMotion: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter16StateFirstMotionFv - .byte4 procAnim__Q53scn4step4hero7fighter16StateFirstMotionFv - .byte4 procMove__Q53scn4step4hero7fighter16StateFirstMotionFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter16StateFirstMotionFv - .byte4 procObjCollReact__Q53scn4step4hero7fighter16StateFirstMotionFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter16StateFirstMotionFv + .4byte procAnim__Q53scn4step4hero7fighter16StateFirstMotionFv + .4byte procMove__Q53scn4step4hero7fighter16StateFirstMotionFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter16StateFirstMotionFv + .4byte procObjCollReact__Q53scn4step4hero7fighter16StateFirstMotionFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateFirstMotionDash.s b/asm/src/StateFirstMotionDash.s index 806a67aa..6dc0e062 100644 --- a/asm/src/StateFirstMotionDash.s +++ b/asm/src/StateFirstMotionDash.s @@ -281,29 +281,29 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14Sta __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateFootSweep$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateFootSweep$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateFootSweep$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateFootSweep$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateFootSweep$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateSpinKick$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateSpinKick$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateSpinKick$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateSpinKick$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateSpinKick$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateSpinKick$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter20StateFirstMotionDash$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter20StateFirstMotionDash$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter20StateFirstMotionDash$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter20StateFirstMotionDash$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter20StateFirstMotionDash$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter20StateFirstMotionDash$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7fighter20StateFirstMotionDash __vt__Q53scn4step4hero7fighter20StateFirstMotionDash: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter20StateFirstMotionDashFv - .byte4 procAnim__Q53scn4step4hero7fighter20StateFirstMotionDashFv - .byte4 procMove__Q53scn4step4hero7fighter20StateFirstMotionDashFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter20StateFirstMotionDashFv - .byte4 procObjCollReact__Q53scn4step4hero7fighter20StateFirstMotionDashFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter20StateFirstMotionDashFv + .4byte procAnim__Q53scn4step4hero7fighter20StateFirstMotionDashFv + .4byte procMove__Q53scn4step4hero7fighter20StateFirstMotionDashFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter20StateFirstMotionDashFv + .4byte procObjCollReact__Q53scn4step4hero7fighter20StateFirstMotionDashFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateFixed.s b/asm/src/StateFixed.s index 778d8fc1..3aaeceaa 100644 --- a/asm/src/StateFixed.s +++ b/asm/src/StateFixed.s @@ -65,7 +65,7 @@ __dt__Q53scn4step4item5state10StateFixedFv: __vt__Q53scn4step4item5state10StateFixed: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4item5state10StateFixedFv - .byte4 procAnim__Q43scn4step4item9StateBaseFv - .byte4 procMove__Q53scn4step4item5state10StateFixedFv - .byte4 procFixPos__Q43scn4step4item9StateBaseFv + .4byte __dt__Q53scn4step4item5state10StateFixedFv + .4byte procAnim__Q43scn4step4item9StateBaseFv + .4byte procMove__Q53scn4step4item5state10StateFixedFv + .4byte procFixPos__Q43scn4step4item9StateBaseFv diff --git a/asm/src/StateFlight.s b/asm/src/StateFlight.s index d09d6207..dbea6b4e 100644 --- a/asm/src/StateFlight.s +++ b/asm/src/StateFlight.s @@ -420,17 +420,17 @@ __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing11StateF __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing11StateFlight$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing11StateFlight$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing11StateFlight$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing11StateFlight$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing11StateFlight$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4wing11StateFlight __vt__Q53scn4step4hero4wing11StateFlight: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4wing11StateFlightFv - .byte4 procAnim__Q53scn4step4hero4wing11StateFlightFv - .byte4 procMove__Q53scn4step4hero4wing11StateFlightFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4wing11StateFlightFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4wing11StateFlightFv + .4byte procAnim__Q53scn4step4hero4wing11StateFlightFv + .4byte procMove__Q53scn4step4hero4wing11StateFlightFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4wing11StateFlightFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateFlightFar.s b/asm/src/StateFlightFar.s index acf7cd9a..a28f4f90 100644 --- a/asm/src/StateFlightFar.s +++ b/asm/src/StateFlightFar.s @@ -414,18 +414,18 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14S __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateFlightFar$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateFlightFar$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateFlightFar$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateFlightFar$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateFlightFar$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9creditdee14StateFlightFar __vt__Q53scn4step4boss9creditdee14StateFlightFar: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9creditdee14StateFlightFarFv - .byte4 procAnim__Q53scn4step4boss9creditdee14StateFlightFarFv - .byte4 procMove__Q53scn4step4boss9creditdee14StateFlightFarFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9creditdee14StateFlightFarFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9creditdee14StateFlightFarFv + .4byte procAnim__Q53scn4step4boss9creditdee14StateFlightFarFv + .4byte procMove__Q53scn4step4boss9creditdee14StateFlightFarFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9creditdee14StateFlightFarFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255678 diff --git a/asm/src/StateFlush.s b/asm/src/StateFlush.s index 0cfbb63b..fafdbdfc 100644 --- a/asm/src/StateFlush.s +++ b/asm/src/StateFlush.s @@ -135,12 +135,12 @@ __dt__Q53scn4step5enemy6common10StateFlushFv: __vt__Q53scn4step5enemy6common10StateFlush: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common10StateFlushFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy6common10StateFlushFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common10StateFlushFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy6common10StateFlushFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254965 diff --git a/asm/src/StateFlushWait.s b/asm/src/StateFlushWait.s index 21fdd878..277cf4c9 100644 --- a/asm/src/StateFlushWait.s +++ b/asm/src/StateFlushWait.s @@ -113,18 +113,18 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common10Sta __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common10StateFlush$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common10StateFlush$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common10StateFlush$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common10StateFlush$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common10StateFlush$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6common14StateFlushWait __vt__Q53scn4step5enemy6common14StateFlushWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common14StateFlushWaitFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common14StateFlushWaitFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common14StateFlushWaitFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common14StateFlushWaitFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255730 diff --git a/asm/src/StateFly.s b/asm/src/StateFly.s index 4f881a91..3572762c 100644 --- a/asm/src/StateFly.s +++ b/asm/src/StateFly.s @@ -1627,114 +1627,114 @@ procFixPos__Q53scn4step5enemy6sodory8StateFlyFv: __vt__Q53scn4step4boss15challengemaster8StateFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster8StateFlyFv - .byte4 procAnim__Q53scn4step4boss15challengemaster8StateFlyFv - .byte4 procMove__Q53scn4step4boss15challengemaster8StateFlyFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster8StateFlyFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster8StateFlyFv + .4byte procAnim__Q53scn4step4boss15challengemaster8StateFlyFv + .4byte procMove__Q53scn4step4boss15challengemaster8StateFlyFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster8StateFlyFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common8StateFly __vt__Q53scn4step5enemy6common8StateFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common8StateFlyFv - .byte4 procAnim__Q53scn4step5enemy6common8StateFlyFv - .byte4 procMove__Q53scn4step5enemy6common8StateFlyFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common8StateFlyFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common8StateFlyFv + .4byte procAnim__Q53scn4step5enemy6common8StateFlyFv + .4byte procMove__Q53scn4step5enemy6common8StateFlyFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common8StateFlyFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10brontoburt8StateFly __vt__Q53scn4step5enemy10brontoburt8StateFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10brontoburt8StateFlyFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy10brontoburt8StateFlyFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10brontoburt8StateFlyFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10brontoburt8StateFlyFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy10brontoburt8StateFlyFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10brontoburt8StateFlyFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8cerulean8StateFly __vt__Q53scn4step5enemy8cerulean8StateFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8cerulean8StateFlyFv - .byte4 procAnim__Q53scn4step5enemy8cerulean8StateFlyFv - .byte4 procMove__Q53scn4step5enemy8cerulean8StateFlyFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy8cerulean8StateFlyFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8cerulean8StateFlyFv + .4byte procAnim__Q53scn4step5enemy8cerulean8StateFlyFv + .4byte procMove__Q53scn4step5enemy8cerulean8StateFlyFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy8cerulean8StateFlyFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6degout8StateFly __vt__Q53scn4step5enemy6degout8StateFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6degout8StateFlyFv - .byte4 procAnim__Q53scn4step5enemy6degout8StateFlyFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6degout8StateFlyFv + .4byte procAnim__Q53scn4step5enemy6degout8StateFlyFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8dubiorjr8StateFly __vt__Q53scn4step5enemy8dubiorjr8StateFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8dubiorjr8StateFlyFv - .byte4 procAnim__Q53scn4step5enemy8dubiorjr8StateFlyFv - .byte4 procMove__Q53scn4step5enemy8dubiorjr8StateFlyFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy8dubiorjr8StateFlyFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8dubiorjr8StateFlyFv + .4byte procAnim__Q53scn4step5enemy8dubiorjr8StateFlyFv + .4byte procMove__Q53scn4step5enemy8dubiorjr8StateFlyFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy8dubiorjr8StateFlyFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gemra8StateFly __vt__Q53scn4step5enemy5gemra8StateFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5gemra8StateFlyFv - .byte4 procAnim__Q53scn4step5enemy5gemra8StateFlyFv - .byte4 procMove__Q53scn4step5enemy5gemra8StateFlyFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5gemra8StateFlyFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5gemra8StateFlyFv + .4byte procAnim__Q53scn4step5enemy5gemra8StateFlyFv + .4byte procMove__Q53scn4step5enemy5gemra8StateFlyFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5gemra8StateFlyFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8searches8StateFly __vt__Q53scn4step5enemy8searches8StateFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8searches8StateFlyFv - .byte4 procAnim__Q53scn4step5enemy8searches8StateFlyFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8searches8StateFlyFv + .4byte procAnim__Q53scn4step5enemy8searches8StateFlyFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory8StateFly __vt__Q53scn4step5enemy6sodory8StateFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6sodory8StateFlyFv - .byte4 procAnim__Q53scn4step5enemy6sodory8StateFlyFv - .byte4 procMove__Q53scn4step5enemy6sodory8StateFlyFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6sodory8StateFlyFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6sodory8StateFlyFv + .4byte procAnim__Q53scn4step5enemy6sodory8StateFlyFv + .4byte procMove__Q53scn4step5enemy6sodory8StateFlyFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6sodory8StateFlyFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255233 diff --git a/asm/src/StateFlyAround.s b/asm/src/StateFlyAround.s index 221bd5d0..d1342aa5 100644 --- a/asm/src/StateFlyAround.s +++ b/asm/src/StateFlyAround.s @@ -959,24 +959,24 @@ lbl_802E3E80: __vt__Q53scn4step5enemy6pierce14StateFlyAround: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6pierce14StateFlyAroundFv - .byte4 procAnim__Q53scn4step5enemy6pierce14StateFlyAroundFv - .byte4 procMove__Q53scn4step5enemy6pierce14StateFlyAroundFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6pierce14StateFlyAroundFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6pierce14StateFlyAroundFv + .4byte procAnim__Q53scn4step5enemy6pierce14StateFlyAroundFv + .4byte procMove__Q53scn4step5enemy6pierce14StateFlyAroundFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6pierce14StateFlyAroundFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5snowl14StateFlyAround __vt__Q53scn4step5enemy5snowl14StateFlyAround: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5snowl14StateFlyAroundFv - .byte4 procAnim__Q53scn4step5enemy5snowl14StateFlyAroundFv - .byte4 procMove__Q53scn4step5enemy5snowl14StateFlyAroundFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5snowl14StateFlyAroundFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5snowl14StateFlyAroundFv + .4byte procAnim__Q53scn4step5enemy5snowl14StateFlyAroundFv + .4byte procMove__Q53scn4step5enemy5snowl14StateFlyAroundFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5snowl14StateFlyAroundFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256372 diff --git a/asm/src/StateFlyAway.s b/asm/src/StateFlyAway.s index cd0bf30d..38e0d0a6 100644 --- a/asm/src/StateFlyAway.s +++ b/asm/src/StateFlyAway.s @@ -353,18 +353,18 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateFlyAway$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateFlyAway$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateFlyAway$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateFlyAway$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateFlyAway$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss10creditroah12StateFlyAway __vt__Q53scn4step4boss10creditroah12StateFlyAway: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss10creditroah12StateFlyAwayFv - .byte4 procAnim__Q53scn4step4boss10creditroah12StateFlyAwayFv - .byte4 procMove__Q53scn4step4boss10creditroah12StateFlyAwayFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss10creditroah12StateFlyAwayFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss10creditroah12StateFlyAwayFv + .4byte procAnim__Q53scn4step4boss10creditroah12StateFlyAwayFv + .4byte procMove__Q53scn4step4boss10creditroah12StateFlyAwayFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss10creditroah12StateFlyAwayFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255018 diff --git a/asm/src/StateFlyFarSinCurve.s b/asm/src/StateFlyFarSinCurve.s index 31b1f395..f076a3ba 100644 --- a/asm/src/StateFlyFarSinCurve.s +++ b/asm/src/StateFlyFarSinCurve.s @@ -153,12 +153,12 @@ procFixPos__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFv: __vt__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFv - .byte4 procAnim__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFv - .byte4 procMove__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFv + .4byte procAnim__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFv + .4byte procMove__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256604 diff --git a/asm/src/StateFlyPursuit.s b/asm/src/StateFlyPursuit.s index feb1a09b..294b25c3 100644 --- a/asm/src/StateFlyPursuit.s +++ b/asm/src/StateFlyPursuit.s @@ -493,12 +493,12 @@ lbl_802D0AEC: __vt__Q53scn4step5enemy6pierce15StateFlyPursuit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6pierce15StateFlyPursuitFv - .byte4 procAnim__Q53scn4step5enemy6pierce15StateFlyPursuitFv - .byte4 procMove__Q53scn4step5enemy6pierce15StateFlyPursuitFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6pierce15StateFlyPursuitFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6pierce15StateFlyPursuitFv + .4byte procAnim__Q53scn4step5enemy6pierce15StateFlyPursuitFv + .4byte procMove__Q53scn4step5enemy6pierce15StateFlyPursuitFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6pierce15StateFlyPursuitFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256306 diff --git a/asm/src/StateFlySinCurve.s b/asm/src/StateFlySinCurve.s index d9c4fb56..a4d26764 100644 --- a/asm/src/StateFlySinCurve.s +++ b/asm/src/StateFlySinCurve.s @@ -614,24 +614,24 @@ lbl_802D0F9C: __vt__Q53scn4step5enemy6common16StateFlySinCurve: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common16StateFlySinCurveFv - .byte4 procAnim__Q53scn4step5enemy6common16StateFlySinCurveFv - .byte4 procMove__Q53scn4step5enemy6common16StateFlySinCurveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common16StateFlySinCurveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common16StateFlySinCurveFv + .4byte procAnim__Q53scn4step5enemy6common16StateFlySinCurveFv + .4byte procMove__Q53scn4step5enemy6common16StateFlySinCurveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common16StateFlySinCurveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6pierce16StateFlySinCurve __vt__Q53scn4step5enemy6pierce16StateFlySinCurve: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6pierce16StateFlySinCurveFv - .byte4 procAnim__Q53scn4step5enemy6pierce16StateFlySinCurveFv - .byte4 procMove__Q53scn4step5enemy6pierce16StateFlySinCurveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6pierce16StateFlySinCurveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6pierce16StateFlySinCurveFv + .4byte procAnim__Q53scn4step5enemy6pierce16StateFlySinCurveFv + .4byte procMove__Q53scn4step5enemy6pierce16StateFlySinCurveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6pierce16StateFlySinCurveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255895 diff --git a/asm/src/StateFlyStraight.s b/asm/src/StateFlyStraight.s index 1f52edf8..5e080df0 100644 --- a/asm/src/StateFlyStraight.s +++ b/asm/src/StateFlyStraight.s @@ -461,24 +461,24 @@ lbl_802E42D4: __vt__Q53scn4step5enemy6owgulf16StateFlyStraight: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6owgulf16StateFlyStraightFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy6owgulf16StateFlyStraightFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6owgulf16StateFlyStraightFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6owgulf16StateFlyStraightFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy6owgulf16StateFlyStraightFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6owgulf16StateFlyStraightFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5snowl16StateFlyStraight __vt__Q53scn4step5enemy5snowl16StateFlyStraight: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5snowl16StateFlyStraightFv - .byte4 procAnim__Q53scn4step5enemy5snowl16StateFlyStraightFv - .byte4 procMove__Q53scn4step5enemy5snowl16StateFlyStraightFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5snowl16StateFlyStraightFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5snowl16StateFlyStraightFv + .4byte procAnim__Q53scn4step5enemy5snowl16StateFlyStraightFv + .4byte procMove__Q53scn4step5enemy5snowl16StateFlyStraightFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5snowl16StateFlyStraightFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255722 diff --git a/asm/src/StateFlyUpDown.s b/asm/src/StateFlyUpDown.s index 68e0b610..ee8d4be7 100644 --- a/asm/src/StateFlyUpDown.s +++ b/asm/src/StateFlyUpDown.s @@ -342,24 +342,24 @@ lbl_802DB3CC: __vt__Q53scn4step5enemy6common14StateFlyUpDown: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common14StateFlyUpDownFv - .byte4 procAnim__Q53scn4step5enemy6common14StateFlyUpDownFv - .byte4 procMove__Q53scn4step5enemy6common14StateFlyUpDownFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common14StateFlyUpDownFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common14StateFlyUpDownFv + .4byte procAnim__Q53scn4step5enemy6common14StateFlyUpDownFv + .4byte procMove__Q53scn4step5enemy6common14StateFlyUpDownFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common14StateFlyUpDownFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy14StateFlyUpDown __vt__Q53scn4step5enemy6scarfy14StateFlyUpDown: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6scarfy14StateFlyUpDownFv - .byte4 procAnim__Q53scn4step5enemy6scarfy14StateFlyUpDownFv - .byte4 procMove__Q53scn4step5enemy6scarfy14StateFlyUpDownFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6scarfy14StateFlyUpDownFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6scarfy14StateFlyUpDownFv + .4byte procAnim__Q53scn4step5enemy6scarfy14StateFlyUpDownFv + .4byte procMove__Q53scn4step5enemy6scarfy14StateFlyUpDownFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6scarfy14StateFlyUpDownFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255699 diff --git a/asm/src/StateFlyWait.s b/asm/src/StateFlyWait.s index 9db50bec..2a1a0661 100644 --- a/asm/src/StateFlyWait.s +++ b/asm/src/StateFlyWait.s @@ -169,9 +169,9 @@ procMove__Q53scn4step5enemy6pierce12StateFlyWaitFv: __vt__Q53scn4step5enemy6pierce12StateFlyWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6pierce12StateFlyWaitFv - .byte4 procAnim__Q53scn4step5enemy6pierce12StateFlyWaitFv - .byte4 procMove__Q53scn4step5enemy6pierce12StateFlyWaitFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6pierce12StateFlyWaitFv + .4byte procAnim__Q53scn4step5enemy6pierce12StateFlyWaitFv + .4byte procMove__Q53scn4step5enemy6pierce12StateFlyWaitFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateFlyWaitFix.s b/asm/src/StateFlyWaitFix.s index e1bb3fad..fd3df29a 100644 --- a/asm/src/StateFlyWaitFix.s +++ b/asm/src/StateFlyWaitFix.s @@ -68,12 +68,12 @@ __dt__Q53scn4step5enemy6owgulf15StateFlyWaitFixFv: __vt__Q53scn4step5enemy6owgulf15StateFlyWaitFix: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6owgulf15StateFlyWaitFixFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy6owgulf15StateFlyWaitFixFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6owgulf15StateFlyWaitFixFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy6owgulf15StateFlyWaitFixFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254812 diff --git a/asm/src/StateFlyWall.s b/asm/src/StateFlyWall.s index 67b6a36d..b912ee0f 100644 --- a/asm/src/StateFlyWall.s +++ b/asm/src/StateFlyWall.s @@ -535,12 +535,12 @@ lbl_8024096C: __vt__Q53scn4step4boss15challengemaster12StateFlyWall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster12StateFlyWallFv - .byte4 procAnim__Q53scn4step4boss15challengemaster12StateFlyWallFv - .byte4 procMove__Q53scn4step4boss15challengemaster12StateFlyWallFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster12StateFlyWallFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster12StateFlyWallFv + .4byte procAnim__Q53scn4step4boss15challengemaster12StateFlyWallFv + .4byte procMove__Q53scn4step4boss15challengemaster12StateFlyWallFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster12StateFlyWallFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255893 diff --git a/asm/src/StateFlyWallStart.s b/asm/src/StateFlyWallStart.s index 999842c4..69352b02 100644 --- a/asm/src/StateFlyWallStart.s +++ b/asm/src/StateFlyWallStart.s @@ -260,21 +260,21 @@ __dt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengem __vt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateFlyWall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateFlyWall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1Fv - .byte4 create__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateFlyWall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1Fv + .4byte __dt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateFlyWall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1Fv + .4byte create__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateFlyWall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1Fv .global __vt__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster17StateFlyWallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1 __vt__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster17StateFlyWallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster17StateFlyWallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1Fv - .byte4 create__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster17StateFlyWallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1Fv + .4byte __dt__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster17StateFlyWallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1Fv + .4byte create__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster17StateFlyWallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1Fv .global __vt__Q53scn4step4boss15challengemaster17StateFlyWallStart __vt__Q53scn4step4boss15challengemaster17StateFlyWallStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster17StateFlyWallStartFv - .byte4 procAnim__Q53scn4step4boss15challengemaster17StateFlyWallStartFv - .byte4 procMove__Q53scn4step4boss15challengemaster17StateFlyWallStartFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster17StateFlyWallStartFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster17StateFlyWallStartFv + .4byte procAnim__Q53scn4step4boss15challengemaster17StateFlyWallStartFv + .4byte procMove__Q53scn4step4boss15challengemaster17StateFlyWallStartFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster17StateFlyWallStartFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateFlyingOut.s b/asm/src/StateFlyingOut.s index 577d40d1..64824504 100644 --- a/asm/src/StateFlyingOut.s +++ b/asm/src/StateFlyingOut.s @@ -207,12 +207,12 @@ __dt__Q53scn4step5enemy7blipper14StateFlyingOutFv: __vt__Q53scn4step5enemy7blipper14StateFlyingOut: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7blipper14StateFlyingOutFv - .byte4 procAnim__Q53scn4step5enemy7blipper14StateFlyingOutFv - .byte4 procMove__Q53scn4step5enemy7blipper14StateFlyingOutFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7blipper14StateFlyingOutFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7blipper14StateFlyingOutFv + .4byte procAnim__Q53scn4step5enemy7blipper14StateFlyingOutFv + .4byte procMove__Q53scn4step5enemy7blipper14StateFlyingOutFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7blipper14StateFlyingOutFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255853 diff --git a/asm/src/StateFollow.s b/asm/src/StateFollow.s index e89d9dff..01ee988e 100644 --- a/asm/src/StateFollow.s +++ b/asm/src/StateFollow.s @@ -361,12 +361,12 @@ __dt__Q53scn4step5enemy6juckle11StateFollowFv: __vt__Q53scn4step5enemy6juckle11StateFollow: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6juckle11StateFollowFv - .byte4 procAnim__Q53scn4step5enemy6juckle11StateFollowFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6juckle11StateFollowFv + .4byte procAnim__Q53scn4step5enemy6juckle11StateFollowFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255367 diff --git a/asm/src/StateFootSweep.s b/asm/src/StateFootSweep.s index 268962cf..9d819cca 100644 --- a/asm/src/StateFootSweep.s +++ b/asm/src/StateFootSweep.s @@ -367,19 +367,19 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter17Sta __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter17StateFootSweepEnd$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter17StateFootSweepEnd$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter17StateFootSweepEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter17StateFootSweepEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter17StateFootSweepEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7fighter14StateFootSweep __vt__Q53scn4step4hero7fighter14StateFootSweep: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter14StateFootSweepFv - .byte4 procAnim__Q53scn4step4hero7fighter14StateFootSweepFv - .byte4 procMove__Q53scn4step4hero7fighter14StateFootSweepFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter14StateFootSweepFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter14StateFootSweepFv + .4byte procAnim__Q53scn4step4hero7fighter14StateFootSweepFv + .4byte procMove__Q53scn4step4hero7fighter14StateFootSweepFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter14StateFootSweepFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateFootSweepEnd.s b/asm/src/StateFootSweepEnd.s index 404ce772..621d8379 100644 --- a/asm/src/StateFootSweepEnd.s +++ b/asm/src/StateFootSweepEnd.s @@ -86,11 +86,11 @@ procFixPos__Q53scn4step4hero7fighter17StateFootSweepEndFv: __vt__Q53scn4step4hero7fighter17StateFootSweepEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter17StateFootSweepEndFv - .byte4 procAnim__Q53scn4step4hero7fighter17StateFootSweepEndFv - .byte4 procMove__Q53scn4step4hero7fighter17StateFootSweepEndFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter17StateFootSweepEndFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter17StateFootSweepEndFv + .4byte procAnim__Q53scn4step4hero7fighter17StateFootSweepEndFv + .4byte procMove__Q53scn4step4hero7fighter17StateFootSweepEndFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter17StateFootSweepEndFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateGather.s b/asm/src/StateGather.s index 0febfff5..be4ab7c6 100644 --- a/asm/src/StateGather.s +++ b/asm/src/StateGather.s @@ -198,10 +198,10 @@ __dt__Q53scn4step4item5state11StateGatherFv: __vt__Q53scn4step4item5state11StateGather: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4item5state11StateGatherFv - .byte4 procAnim__Q53scn4step4item5state11StateGatherFv - .byte4 procMove__Q53scn4step4item5state11StateGatherFv - .byte4 procFixPos__Q43scn4step4item9StateBaseFv + .4byte __dt__Q53scn4step4item5state11StateGatherFv + .4byte procAnim__Q53scn4step4item5state11StateGatherFv + .4byte procMove__Q53scn4step4item5state11StateGatherFv + .4byte procFixPos__Q43scn4step4item9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255059 diff --git a/asm/src/StateGetShipParts.s b/asm/src/StateGetShipParts.s index a69b4915..e7bbbc65 100644 --- a/asm/src/StateGetShipParts.s +++ b/asm/src/StateGetShipParts.s @@ -334,13 +334,13 @@ lbl_8037FF00: __vt__Q53scn4step4hero7gimmick17StateGetShipParts: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick17StateGetShipPartsFv - .byte4 procAnim__Q53scn4step4hero7gimmick17StateGetShipPartsFv - .byte4 procMove__Q53scn4step4hero7gimmick17StateGetShipPartsFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick17StateGetShipPartsFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick17StateGetShipPartsFv + .4byte procAnim__Q53scn4step4hero7gimmick17StateGetShipPartsFv + .4byte procMove__Q53scn4step4hero7gimmick17StateGetShipPartsFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick17StateGetShipPartsFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateGlide.s b/asm/src/StateGlide.s index 9f9ed996..5f411900 100644 --- a/asm/src/StateGlide.s +++ b/asm/src/StateGlide.s @@ -1072,30 +1072,30 @@ lbl_8024EEE4: __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10creditmeta10StateGlide$$4PQ43scn4step4boss4Boss$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10creditmeta10StateGlide$$4PQ43scn4step4boss4Boss$$4b$$1Fv - .byte4 create__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10creditmeta10StateGlide$$4PQ43scn4step4boss4Boss$$4b$$1Fv + .4byte __dt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10creditmeta10StateGlide$$4PQ43scn4step4boss4Boss$$4b$$1Fv + .4byte create__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10creditmeta10StateGlide$$4PQ43scn4step4boss4Boss$$4b$$1Fv .global __vt__Q53scn4step4boss10creditmeta10StateGlide __vt__Q53scn4step4boss10creditmeta10StateGlide: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss10creditmeta10StateGlideFv - .byte4 procAnim__Q53scn4step4boss10creditmeta10StateGlideFv - .byte4 procMove__Q53scn4step4boss10creditmeta10StateGlideFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss10creditmeta10StateGlideFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss10creditmeta10StateGlideFv + .4byte procAnim__Q53scn4step4boss10creditmeta10StateGlideFv + .4byte procMove__Q53scn4step4boss10creditmeta10StateGlideFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss10creditmeta10StateGlideFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior10StateGlide __vt__Q53scn4step4boss6dubior10StateGlide: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6dubior10StateGlideFv - .byte4 procAnim__Q53scn4step4boss6dubior10StateGlideFv - .byte4 procMove__Q53scn4step4boss6dubior10StateGlideFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6dubior10StateGlideFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6dubior10StateGlideFv + .4byte procAnim__Q53scn4step4boss6dubior10StateGlideFv + .4byte procMove__Q53scn4step4boss6dubior10StateGlideFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6dubior10StateGlideFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255202 diff --git a/asm/src/StateGlideAway.s b/asm/src/StateGlideAway.s index 7f9dc78e..8ff5da9d 100644 --- a/asm/src/StateGlideAway.s +++ b/asm/src/StateGlideAway.s @@ -496,12 +496,12 @@ lbl_8024AB84: __vt__Q53scn4step4boss10creditmeta14StateGlideAway: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss10creditmeta14StateGlideAwayFv - .byte4 procAnim__Q53scn4step4boss10creditmeta14StateGlideAwayFv - .byte4 procMove__Q53scn4step4boss10creditmeta14StateGlideAwayFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss10creditmeta14StateGlideAwayFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss10creditmeta14StateGlideAwayFv + .4byte procAnim__Q53scn4step4boss10creditmeta14StateGlideAwayFv + .4byte procMove__Q53scn4step4boss10creditmeta14StateGlideAwayFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss10creditmeta14StateGlideAwayFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256059 diff --git a/asm/src/StateGoodbye.s b/asm/src/StateGoodbye.s index 9f26d3c0..5bcd9c16 100644 --- a/asm/src/StateGoodbye.s +++ b/asm/src/StateGoodbye.s @@ -206,9 +206,9 @@ $$256612: __vt__Q53scn4step5enemy6common12StateGoodbye: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common12StateGoodbyeFv - .byte4 procAnim__Q53scn4step5enemy6common12StateGoodbyeFv - .byte4 procMove__Q53scn4step5enemy6common12StateGoodbyeFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common12StateGoodbyeFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common12StateGoodbyeFv + .4byte procAnim__Q53scn4step5enemy6common12StateGoodbyeFv + .4byte procMove__Q53scn4step5enemy6common12StateGoodbyeFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common12StateGoodbyeFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateGrandLowperAppear.s b/asm/src/StateGrandLowperAppear.s index a4186dbf..9c19fd6f 100644 --- a/asm/src/StateGrandLowperAppear.s +++ b/asm/src/StateGrandLowperAppear.s @@ -1439,114 +1439,114 @@ __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee2 __vt__Q53scn4step5enemy8armordee22StateGrandLowperAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8armordee22StateGrandLowperAppearFv - .byte4 procAnim__Q53scn4step5enemy8armordee22StateGrandLowperAppearFv - .byte4 procMove__Q53scn4step5enemy8armordee22StateGrandLowperAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy8armordee22StateGrandLowperAppearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8armordee22StateGrandLowperAppearFv + .4byte procAnim__Q53scn4step5enemy8armordee22StateGrandLowperAppearFv + .4byte procMove__Q53scn4step5enemy8armordee22StateGrandLowperAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy8armordee22StateGrandLowperAppearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight22StateGrandLowperAppear __vt__Q53scn4step5enemy11bladeknight22StateGrandLowperAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11bladeknight22StateGrandLowperAppearFv - .byte4 procAnim__Q53scn4step5enemy11bladeknight22StateGrandLowperAppearFv - .byte4 procMove__Q53scn4step5enemy11bladeknight22StateGrandLowperAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11bladeknight22StateGrandLowperAppearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11bladeknight22StateGrandLowperAppearFv + .4byte procAnim__Q53scn4step5enemy11bladeknight22StateGrandLowperAppearFv + .4byte procMove__Q53scn4step5enemy11bladeknight22StateGrandLowperAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11bladeknight22StateGrandLowperAppearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy22StateGrandLowperAppear __vt__Q53scn4step5enemy6bouncy22StateGrandLowperAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6bouncy22StateGrandLowperAppearFv - .byte4 procAnim__Q53scn4step5enemy6bouncy22StateGrandLowperAppearFv - .byte4 procMove__Q53scn4step5enemy6bouncy22StateGrandLowperAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6bouncy22StateGrandLowperAppearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6bouncy22StateGrandLowperAppearFv + .4byte procAnim__Q53scn4step5enemy6bouncy22StateGrandLowperAppearFv + .4byte procMove__Q53scn4step5enemy6bouncy22StateGrandLowperAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6bouncy22StateGrandLowperAppearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter22StateGrandLowperAppear __vt__Q53scn4step5enemy11broomhatter22StateGrandLowperAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11broomhatter22StateGrandLowperAppearFv - .byte4 procAnim__Q53scn4step5enemy11broomhatter22StateGrandLowperAppearFv - .byte4 procMove__Q53scn4step5enemy11broomhatter22StateGrandLowperAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11broomhatter22StateGrandLowperAppearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11broomhatter22StateGrandLowperAppearFv + .4byte procAnim__Q53scn4step5enemy11broomhatter22StateGrandLowperAppearFv + .4byte procMove__Q53scn4step5enemy11broomhatter22StateGrandLowperAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11broomhatter22StateGrandLowperAppearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu22StateGrandLowperAppear __vt__Q53scn4step5enemy4kabu22StateGrandLowperAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4kabu22StateGrandLowperAppearFv - .byte4 procAnim__Q53scn4step5enemy4kabu22StateGrandLowperAppearFv - .byte4 procMove__Q53scn4step5enemy4kabu22StateGrandLowperAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4kabu22StateGrandLowperAppearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy4kabu22StateGrandLowperAppearFv + .4byte procAnim__Q53scn4step5enemy4kabu22StateGrandLowperAppearFv + .4byte procMove__Q53scn4step5enemy4kabu22StateGrandLowperAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4kabu22StateGrandLowperAppearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff22StateGrandLowperAppear __vt__Q53scn4step5enemy5nruff22StateGrandLowperAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5nruff22StateGrandLowperAppearFv - .byte4 procAnim__Q53scn4step5enemy5nruff22StateGrandLowperAppearFv - .byte4 procMove__Q53scn4step5enemy5nruff22StateGrandLowperAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5nruff22StateGrandLowperAppearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5nruff22StateGrandLowperAppearFv + .4byte procAnim__Q53scn4step5enemy5nruff22StateGrandLowperAppearFv + .4byte procMove__Q53scn4step5enemy5nruff22StateGrandLowperAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5nruff22StateGrandLowperAppearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy22StateGrandLowperAppear __vt__Q53scn4step5enemy6scarfy22StateGrandLowperAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6scarfy22StateGrandLowperAppearFv - .byte4 procAnim__Q53scn4step5enemy6scarfy22StateGrandLowperAppearFv - .byte4 procMove__Q53scn4step5enemy6scarfy22StateGrandLowperAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6scarfy22StateGrandLowperAppearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6scarfy22StateGrandLowperAppearFv + .4byte procAnim__Q53scn4step5enemy6scarfy22StateGrandLowperAppearFv + .4byte procMove__Q53scn4step5enemy6scarfy22StateGrandLowperAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6scarfy22StateGrandLowperAppearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld22StateGrandLowperAppear __vt__Q53scn4step5enemy5sheld22StateGrandLowperAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5sheld22StateGrandLowperAppearFv - .byte4 procAnim__Q53scn4step5enemy5sheld22StateGrandLowperAppearFv - .byte4 procMove__Q53scn4step5enemy5sheld22StateGrandLowperAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5sheld22StateGrandLowperAppearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5sheld22StateGrandLowperAppearFv + .4byte procAnim__Q53scn4step5enemy5sheld22StateGrandLowperAppearFv + .4byte procMove__Q53scn4step5enemy5sheld22StateGrandLowperAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5sheld22StateGrandLowperAppearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee23StateGrandLowperLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee23StateGrandLowperLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee23StateGrandLowperLanding$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee23StateGrandLowperLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee23StateGrandLowperLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee23StateGrandLowperLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee22StateGrandLowperAppear __vt__Q53scn4step5enemy9waddledee22StateGrandLowperAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledee22StateGrandLowperAppearFv - .byte4 procAnim__Q53scn4step5enemy9waddledee22StateGrandLowperAppearFv - .byte4 procMove__Q53scn4step5enemy9waddledee22StateGrandLowperAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9waddledee22StateGrandLowperAppearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9waddledee22StateGrandLowperAppearFv + .4byte procAnim__Q53scn4step5enemy9waddledee22StateGrandLowperAppearFv + .4byte procMove__Q53scn4step5enemy9waddledee22StateGrandLowperAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9waddledee22StateGrandLowperAppearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256597 diff --git a/asm/src/StateGrandLowperEscape.s b/asm/src/StateGrandLowperEscape.s index aadc6590..c3d5c3d1 100644 --- a/asm/src/StateGrandLowperEscape.s +++ b/asm/src/StateGrandLowperEscape.s @@ -1130,81 +1130,81 @@ lbl_802EDE88: __vt__Q53scn4step5enemy11bladeknight22StateGrandLowperEscape: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11bladeknight22StateGrandLowperEscapeFv - .byte4 procAnim__Q53scn4step5enemy11bladeknight22StateGrandLowperEscapeFv - .byte4 procMove__Q53scn4step5enemy11bladeknight22StateGrandLowperEscapeFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11bladeknight22StateGrandLowperEscapeFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11bladeknight22StateGrandLowperEscapeFv + .4byte procAnim__Q53scn4step5enemy11bladeknight22StateGrandLowperEscapeFv + .4byte procMove__Q53scn4step5enemy11bladeknight22StateGrandLowperEscapeFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11bladeknight22StateGrandLowperEscapeFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy22StateGrandLowperEscape __vt__Q53scn4step5enemy6bouncy22StateGrandLowperEscape: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6bouncy22StateGrandLowperEscapeFv - .byte4 procAnim__Q53scn4step5enemy6bouncy22StateGrandLowperEscapeFv - .byte4 procMove__Q53scn4step5enemy6bouncy22StateGrandLowperEscapeFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6bouncy22StateGrandLowperEscapeFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6bouncy22StateGrandLowperEscapeFv + .4byte procAnim__Q53scn4step5enemy6bouncy22StateGrandLowperEscapeFv + .4byte procMove__Q53scn4step5enemy6bouncy22StateGrandLowperEscapeFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6bouncy22StateGrandLowperEscapeFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter22StateGrandLowperEscape __vt__Q53scn4step5enemy11broomhatter22StateGrandLowperEscape: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11broomhatter22StateGrandLowperEscapeFv - .byte4 procAnim__Q53scn4step5enemy11broomhatter22StateGrandLowperEscapeFv - .byte4 procMove__Q53scn4step5enemy11broomhatter22StateGrandLowperEscapeFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11broomhatter22StateGrandLowperEscapeFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11broomhatter22StateGrandLowperEscapeFv + .4byte procAnim__Q53scn4step5enemy11broomhatter22StateGrandLowperEscapeFv + .4byte procMove__Q53scn4step5enemy11broomhatter22StateGrandLowperEscapeFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11broomhatter22StateGrandLowperEscapeFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu22StateGrandLowperEscape __vt__Q53scn4step5enemy4kabu22StateGrandLowperEscape: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4kabu22StateGrandLowperEscapeFv - .byte4 procAnim__Q53scn4step5enemy4kabu22StateGrandLowperEscapeFv - .byte4 procMove__Q53scn4step5enemy4kabu22StateGrandLowperEscapeFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4kabu22StateGrandLowperEscapeFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy4kabu22StateGrandLowperEscapeFv + .4byte procAnim__Q53scn4step5enemy4kabu22StateGrandLowperEscapeFv + .4byte procMove__Q53scn4step5enemy4kabu22StateGrandLowperEscapeFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4kabu22StateGrandLowperEscapeFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff22StateGrandLowperEscape __vt__Q53scn4step5enemy5nruff22StateGrandLowperEscape: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5nruff22StateGrandLowperEscapeFv - .byte4 procAnim__Q53scn4step5enemy5nruff22StateGrandLowperEscapeFv - .byte4 procMove__Q53scn4step5enemy5nruff22StateGrandLowperEscapeFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5nruff22StateGrandLowperEscapeFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5nruff22StateGrandLowperEscapeFv + .4byte procAnim__Q53scn4step5enemy5nruff22StateGrandLowperEscapeFv + .4byte procMove__Q53scn4step5enemy5nruff22StateGrandLowperEscapeFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5nruff22StateGrandLowperEscapeFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld22StateGrandLowperEscape __vt__Q53scn4step5enemy5sheld22StateGrandLowperEscape: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5sheld22StateGrandLowperEscapeFv - .byte4 procAnim__Q53scn4step5enemy5sheld22StateGrandLowperEscapeFv - .byte4 procMove__Q53scn4step5enemy5sheld22StateGrandLowperEscapeFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5sheld22StateGrandLowperEscapeFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5sheld22StateGrandLowperEscapeFv + .4byte procAnim__Q53scn4step5enemy5sheld22StateGrandLowperEscapeFv + .4byte procMove__Q53scn4step5enemy5sheld22StateGrandLowperEscapeFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5sheld22StateGrandLowperEscapeFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledee22StateGrandLowperEscape __vt__Q53scn4step5enemy9waddledee22StateGrandLowperEscape: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledee22StateGrandLowperEscapeFv - .byte4 procAnim__Q53scn4step5enemy9waddledee22StateGrandLowperEscapeFv - .byte4 procMove__Q53scn4step5enemy9waddledee22StateGrandLowperEscapeFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9waddledee22StateGrandLowperEscapeFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9waddledee22StateGrandLowperEscapeFv + .4byte procAnim__Q53scn4step5enemy9waddledee22StateGrandLowperEscapeFv + .4byte procMove__Q53scn4step5enemy9waddledee22StateGrandLowperEscapeFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9waddledee22StateGrandLowperEscapeFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateGrandLowperEscapeStart.s b/asm/src/StateGrandLowperEscapeStart.s index 9fd0467a..2bd1de1f 100644 --- a/asm/src/StateGrandLowperEscapeStart.s +++ b/asm/src/StateGrandLowperEscapeStart.s @@ -712,123 +712,123 @@ __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee2 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStartFv - .byte4 procAnim__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStartFv - .byte4 procMove__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStartFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStartFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStartFv + .4byte procAnim__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStartFv + .4byte procMove__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStartFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStartFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStartFv - .byte4 procAnim__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStartFv - .byte4 procMove__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStartFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStartFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStartFv + .4byte procAnim__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStartFv + .4byte procMove__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStartFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStartFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStartFv - .byte4 procAnim__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStartFv - .byte4 procMove__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStartFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStartFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStartFv + .4byte procAnim__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStartFv + .4byte procMove__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStartFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStartFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStartFv - .byte4 procAnim__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStartFv - .byte4 procMove__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStartFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStartFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStartFv + .4byte procAnim__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStartFv + .4byte procMove__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStartFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStartFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStartFv - .byte4 procAnim__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStartFv - .byte4 procMove__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStartFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStartFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStartFv + .4byte procAnim__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStartFv + .4byte procMove__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStartFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStartFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStartFv - .byte4 procAnim__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStartFv - .byte4 procMove__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStartFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStartFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStartFv + .4byte procAnim__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStartFv + .4byte procMove__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStartFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStartFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStartFv - .byte4 procAnim__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStartFv - .byte4 procMove__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStartFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStartFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStartFv + .4byte procAnim__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStartFv + .4byte procMove__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStartFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStartFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateGrandLowperLanding.s b/asm/src/StateGrandLowperLanding.s index a8c4cff3..feb5742d 100644 --- a/asm/src/StateGrandLowperLanding.s +++ b/asm/src/StateGrandLowperLanding.s @@ -92,9 +92,9 @@ procFixPos__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv: __vt__Q53scn4step5enemy9waddledee23StateGrandLowperLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv - .byte4 procAnim__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv - .byte4 procMove__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv + .4byte procAnim__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv + .4byte procMove__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateGroundAttack.s b/asm/src/StateGroundAttack.s index 81bb15e0..8685c3e1 100644 --- a/asm/src/StateGroundAttack.s +++ b/asm/src/StateGroundAttack.s @@ -113,9 +113,9 @@ procMove__Q53scn4step5enemy6sodory17StateGroundAttackFv: __vt__Q53scn4step5enemy6sodory17StateGroundAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6sodory17StateGroundAttackFv - .byte4 procAnim__Q53scn4step5enemy6sodory17StateGroundAttackFv - .byte4 procMove__Q53scn4step5enemy6sodory17StateGroundAttackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6sodory17StateGroundAttackFv + .4byte procAnim__Q53scn4step5enemy6sodory17StateGroundAttackFv + .4byte procMove__Q53scn4step5enemy6sodory17StateGroundAttackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateGrow.s b/asm/src/StateGrow.s index dd99bfd1..588bead3 100644 --- a/asm/src/StateGrow.s +++ b/asm/src/StateGrow.s @@ -263,12 +263,12 @@ procFixPos__Q53scn4step4boss6whispy9StateGrowFv: __vt__Q53scn4step4boss6whispy9StateGrow: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy9StateGrowFv - .byte4 procAnim__Q53scn4step4boss6whispy9StateGrowFv - .byte4 procMove__Q53scn4step4boss6whispy9StateGrowFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy9StateGrowFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6whispy9StateGrowFv + .4byte procAnim__Q53scn4step4boss6whispy9StateGrowFv + .4byte procMove__Q53scn4step4boss6whispy9StateGrowFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy9StateGrowFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256186 diff --git a/asm/src/StateGuard.s b/asm/src/StateGuard.s index 068ff1cd..96f0f4ef 100644 --- a/asm/src/StateGuard.s +++ b/asm/src/StateGuard.s @@ -855,37 +855,37 @@ procFixPos__Q53scn4step4hero6damage10StateGuardFv: __vt__Q53scn4step4boss10gigantedge10StateGuard: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss10gigantedge10StateGuardFv - .byte4 procAnim__Q53scn4step4boss10gigantedge10StateGuardFv - .byte4 procMove__Q53scn4step4boss10gigantedge10StateGuardFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss10gigantedge10StateGuardFv - .byte4 procObjCollReact__Q53scn4step4boss10gigantedge10StateGuardFv + .4byte __dt__Q53scn4step4boss10gigantedge10StateGuardFv + .4byte procAnim__Q53scn4step4boss10gigantedge10StateGuardFv + .4byte procMove__Q53scn4step4boss10gigantedge10StateGuardFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss10gigantedge10StateGuardFv + .4byte procObjCollReact__Q53scn4step4boss10gigantedge10StateGuardFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util118StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1 __vt__Q24util118StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util118StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv - .byte4 create__Q24util118StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv + .4byte __dt__Q24util118StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv + .4byte create__Q24util118StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv .global __vt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateGuard$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateGuard$$4PQ43scn4step4hero4Hero$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateGuard$$4PQ43scn4step4hero4Hero$$4b$$1Fv - .byte4 create__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateGuard$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte __dt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateGuard$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte create__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateGuard$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero6common10StateGuard __vt__Q53scn4step4hero6common10StateGuard: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common10StateGuardFv - .byte4 procAnim__Q53scn4step4hero6common10StateGuardFv - .byte4 procMove__Q53scn4step4hero6common10StateGuardFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common10StateGuardFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common10StateGuardFv + .4byte procAnim__Q53scn4step4hero6common10StateGuardFv + .4byte procMove__Q53scn4step4hero6common10StateGuardFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common10StateGuardFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -893,13 +893,13 @@ __vt__Q53scn4step4hero6common10StateGuard: __vt__Q53scn4step4hero6damage10StateGuard: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6damage10StateGuardFv - .byte4 procAnim__Q53scn4step4hero6damage10StateGuardFv - .byte4 procMove__Q53scn4step4hero6damage10StateGuardFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6damage10StateGuardFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6damage10StateGuardFv + .4byte procAnim__Q53scn4step4hero6damage10StateGuardFv + .4byte procMove__Q53scn4step4hero6damage10StateGuardFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6damage10StateGuardFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateHadou.s b/asm/src/StateHadou.s index e9be0698..660db093 100644 --- a/asm/src/StateHadou.s +++ b/asm/src/StateHadou.s @@ -151,12 +151,12 @@ procFixPos__Q53scn4step5enemy10knucklejoe10StateHadouFv: __vt__Q53scn4step5enemy10knucklejoe10StateHadou: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10knucklejoe10StateHadouFv - .byte4 procAnim__Q53scn4step5enemy10knucklejoe10StateHadouFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10knucklejoe10StateHadouFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10knucklejoe10StateHadouFv + .4byte procAnim__Q53scn4step5enemy10knucklejoe10StateHadouFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10knucklejoe10StateHadouFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255822 diff --git a/asm/src/StateHammerAirSpin.s b/asm/src/StateHammerAirSpin.s index 28a2031c..da5dfe92 100644 --- a/asm/src/StateHammerAirSpin.s +++ b/asm/src/StateHammerAirSpin.s @@ -267,17 +267,17 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash18State __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash18StateHammerAirSpin$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash18StateHammerAirSpin$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash18StateHammerAirSpin$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash18StateHammerAirSpin$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash18StateHammerAirSpin$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5smash18StateHammerAirSpin __vt__Q53scn4step4hero5smash18StateHammerAirSpin: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5smash18StateHammerAirSpinFv - .byte4 procAnim__Q53scn4step4hero5smash18StateHammerAirSpinFv - .byte4 procMove__Q53scn4step4hero5smash18StateHammerAirSpinFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5smash18StateHammerAirSpinFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5smash18StateHammerAirSpinFv + .4byte procAnim__Q53scn4step4hero5smash18StateHammerAirSpinFv + .4byte procMove__Q53scn4step4hero5smash18StateHammerAirSpinFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5smash18StateHammerAirSpinFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateHammerStrongSwing.s b/asm/src/StateHammerStrongSwing.s index ffe68d71..98f92246 100644 --- a/asm/src/StateHammerStrongSwing.s +++ b/asm/src/StateHammerStrongSwing.s @@ -194,17 +194,17 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash22Stat __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash22StateHammerStrongSwing$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash22StateHammerStrongSwing$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash22StateHammerStrongSwing$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash22StateHammerStrongSwing$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash22StateHammerStrongSwing$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5smash22StateHammerStrongSwing __vt__Q53scn4step4hero5smash22StateHammerStrongSwing: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5smash22StateHammerStrongSwingFv - .byte4 procAnim__Q53scn4step4hero5smash22StateHammerStrongSwingFv - .byte4 procMove__Q53scn4step4hero5smash22StateHammerStrongSwingFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5smash22StateHammerStrongSwingFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5smash22StateHammerStrongSwingFv + .4byte procAnim__Q53scn4step4hero5smash22StateHammerStrongSwingFv + .4byte procMove__Q53scn4step4hero5smash22StateHammerStrongSwingFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5smash22StateHammerStrongSwingFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateHang.s b/asm/src/StateHang.s index b98ef3a6..fb184c94 100644 --- a/asm/src/StateHang.s +++ b/asm/src/StateHang.s @@ -876,31 +876,31 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interferenc __vt__Q53scn4step5enemy4como9StateHang: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4como9StateHangFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy4como9StateHangFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4como9StateHangFv - .byte4 procObjCollReact__Q53scn4step5enemy4como9StateHangFv + .4byte __dt__Q53scn4step5enemy4como9StateHangFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy4como9StateHangFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4como9StateHangFv + .4byte procObjCollReact__Q53scn4step5enemy4como9StateHangFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference9StateHang$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference9StateHang$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference9StateHang$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference9StateHang$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference9StateHang$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference9StateHang$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero12interference9StateHang __vt__Q53scn4step4hero12interference9StateHang: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero12interference9StateHangFv - .byte4 procAnim__Q53scn4step4hero12interference9StateHangFv - .byte4 procMove__Q53scn4step4hero12interference9StateHangFv - .byte4 procConstraint__Q53scn4step4hero12interference9StateHangFv - .byte4 procFixPos__Q53scn4step4hero12interference9StateHangFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero12interference9StateHangFv + .4byte procAnim__Q53scn4step4hero12interference9StateHangFv + .4byte procMove__Q53scn4step4hero12interference9StateHangFv + .4byte procConstraint__Q53scn4step4hero12interference9StateHangFv + .4byte procFixPos__Q53scn4step4hero12interference9StateHangFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateHeightAdjust.s b/asm/src/StateHeightAdjust.s index de469083..6d45bf36 100644 --- a/asm/src/StateHeightAdjust.s +++ b/asm/src/StateHeightAdjust.s @@ -264,12 +264,12 @@ procFixPos__Q53scn4step4boss6dubior17StateHeightAdjustFv: __vt__Q53scn4step4boss6dubior17StateHeightAdjust: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6dubior17StateHeightAdjustFv - .byte4 procAnim__Q53scn4step4boss6dubior17StateHeightAdjustFv - .byte4 procMove__Q53scn4step4boss6dubior17StateHeightAdjustFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6dubior17StateHeightAdjustFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6dubior17StateHeightAdjustFv + .4byte procAnim__Q53scn4step4boss6dubior17StateHeightAdjustFv + .4byte procMove__Q53scn4step4boss6dubior17StateHeightAdjustFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6dubior17StateHeightAdjustFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255294 diff --git a/asm/src/StateHide.s b/asm/src/StateHide.s index 6a557904..3b626293 100644 --- a/asm/src/StateHide.s +++ b/asm/src/StateHide.s @@ -557,45 +557,45 @@ procFixPos__Q53scn4step4boss10creditroah9StateHideFv: __vt__Q53scn4step4boss12creditdedede9StateHide: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss12creditdedede9StateHideFv - .byte4 procAnim__Q53scn4step4boss12creditdedede9StateHideFv - .byte4 procMove__Q53scn4step4boss12creditdedede9StateHideFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss12creditdedede9StateHideFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss12creditdedede9StateHideFv + .4byte procAnim__Q53scn4step4boss12creditdedede9StateHideFv + .4byte procMove__Q53scn4step4boss12creditdedede9StateHideFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss12creditdedede9StateHideFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9creditdee9StateHide __vt__Q53scn4step4boss9creditdee9StateHide: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9creditdee9StateHideFv - .byte4 procAnim__Q53scn4step4boss9creditdee9StateHideFv - .byte4 procMove__Q53scn4step4boss9creditdee9StateHideFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9creditdee9StateHideFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9creditdee9StateHideFv + .4byte procAnim__Q53scn4step4boss9creditdee9StateHideFv + .4byte procMove__Q53scn4step4boss9creditdee9StateHideFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9creditdee9StateHideFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss10creditmeta9StateHide __vt__Q53scn4step4boss10creditmeta9StateHide: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss10creditmeta9StateHideFv - .byte4 procAnim__Q53scn4step4boss10creditmeta9StateHideFv - .byte4 procMove__Q53scn4step4boss10creditmeta9StateHideFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss10creditmeta9StateHideFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss10creditmeta9StateHideFv + .4byte procAnim__Q53scn4step4boss10creditmeta9StateHideFv + .4byte procMove__Q53scn4step4boss10creditmeta9StateHideFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss10creditmeta9StateHideFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss10creditroah9StateHide __vt__Q53scn4step4boss10creditroah9StateHide: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss10creditroah9StateHideFv - .byte4 procAnim__Q53scn4step4boss10creditroah9StateHideFv - .byte4 procMove__Q53scn4step4boss10creditroah9StateHideFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss10creditroah9StateHideFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss10creditroah9StateHideFv + .4byte procAnim__Q53scn4step4boss10creditroah9StateHideFv + .4byte procMove__Q53scn4step4boss10creditroah9StateHideFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss10creditroah9StateHideFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateHover.s b/asm/src/StateHover.s index fe13e1c8..b5f3f5ae 100644 --- a/asm/src/StateHover.s +++ b/asm/src/StateHover.s @@ -967,25 +967,25 @@ procFixPos__Q53scn4step4hero6damage10StateHoverFv: __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StateShotAirBall$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StateShotAirBall$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StateShotAirBall$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StateShotAirBall$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StateShotAirBall$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateHover$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateHover$$4PQ43scn4step4hero4Hero$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateHover$$4PQ43scn4step4hero4Hero$$4b$$1Fv - .byte4 create__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateHover$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte __dt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateHover$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte create__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateHover$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero6common10StateHover __vt__Q53scn4step4hero6common10StateHover: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common10StateHoverFv - .byte4 procAnim__Q53scn4step4hero6common10StateHoverFv - .byte4 procMove__Q53scn4step4hero6common10StateHoverFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common10StateHoverFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common10StateHoverFv + .4byte procAnim__Q53scn4step4hero6common10StateHoverFv + .4byte procMove__Q53scn4step4hero6common10StateHoverFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common10StateHoverFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -993,13 +993,13 @@ __vt__Q53scn4step4hero6common10StateHover: __vt__Q53scn4step4hero6damage10StateHover: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6damage10StateHoverFv - .byte4 procAnim__Q53scn4step4hero6damage10StateHoverFv - .byte4 procMove__Q53scn4step4hero6damage10StateHoverFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6damage10StateHoverFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6damage10StateHoverFv + .4byte procAnim__Q53scn4step4hero6damage10StateHoverFv + .4byte procMove__Q53scn4step4hero6damage10StateHoverFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6damage10StateHoverFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateHoverFar.s b/asm/src/StateHoverFar.s index eb7da8bd..2f7f3515 100644 --- a/asm/src/StateHoverFar.s +++ b/asm/src/StateHoverFar.s @@ -282,18 +282,18 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdede __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede13StateHoverFar$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede13StateHoverFar$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede13StateHoverFar$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede13StateHoverFar$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede13StateHoverFar$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss12creditdedede13StateHoverFar __vt__Q53scn4step4boss12creditdedede13StateHoverFar: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss12creditdedede13StateHoverFarFv - .byte4 procAnim__Q53scn4step4boss12creditdedede13StateHoverFarFv - .byte4 procMove__Q53scn4step4boss12creditdedede13StateHoverFarFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss12creditdedede13StateHoverFarFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss12creditdedede13StateHoverFarFv + .4byte procAnim__Q53scn4step4boss12creditdedede13StateHoverFarFv + .4byte procMove__Q53scn4step4boss12creditdedede13StateHoverFarFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss12creditdedede13StateHoverFarFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255585 diff --git a/asm/src/StateHoverLanding.s b/asm/src/StateHoverLanding.s index 64dab410..96ab809b 100644 --- a/asm/src/StateHoverLanding.s +++ b/asm/src/StateHoverLanding.s @@ -166,17 +166,17 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common17Stat __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common17StateHoverLanding$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common17StateHoverLanding$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common17StateHoverLanding$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common17StateHoverLanding$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common17StateHoverLanding$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common17StateHoverLanding __vt__Q53scn4step4hero6common17StateHoverLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common17StateHoverLandingFv - .byte4 procAnim__Q53scn4step4hero6common17StateHoverLandingFv - .byte4 procMove__Q53scn4step4hero6common17StateHoverLandingFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common17StateHoverLandingFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common17StateHoverLandingFv + .4byte procAnim__Q53scn4step4hero6common17StateHoverLandingFv + .4byte procMove__Q53scn4step4hero6common17StateHoverLandingFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common17StateHoverLandingFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateIdling.s b/asm/src/StateIdling.s index dd698a44..1e159fb7 100644 --- a/asm/src/StateIdling.s +++ b/asm/src/StateIdling.s @@ -373,18 +373,18 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11S __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8needlous11StateIdling __vt__Q53scn4step5enemy8needlous11StateIdling: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8needlous11StateIdlingFv - .byte4 procAnim__Q53scn4step5enemy8needlous11StateIdlingFv - .byte4 procMove__Q53scn4step5enemy8needlous11StateIdlingFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy8needlous11StateIdlingFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8needlous11StateIdlingFv + .4byte procAnim__Q53scn4step5enemy8needlous11StateIdlingFv + .4byte procMove__Q53scn4step5enemy8needlous11StateIdlingFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy8needlous11StateIdlingFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256990 diff --git a/asm/src/StateInit.s b/asm/src/StateInit.s index 0a626204..17126661 100644 --- a/asm/src/StateInit.s +++ b/asm/src/StateInit.s @@ -385,21 +385,21 @@ procFixPos__Q53scn4step4hero11staffcredit9StateInitFv: __vt__Q53scn4step4hero8inactive9StateInit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero8inactive9StateInitFv - .byte4 proc__Q53scn4step4hero8inactive9StateInitFv + .4byte __dt__Q53scn4step4hero8inactive9StateInitFv + .4byte proc__Q53scn4step4hero8inactive9StateInitFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero11staffcredit9StateInit __vt__Q53scn4step4hero11staffcredit9StateInit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero11staffcredit9StateInitFv - .byte4 procAnim__Q53scn4step4hero11staffcredit9StateInitFv - .byte4 procMove__Q53scn4step4hero11staffcredit9StateInitFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero11staffcredit9StateInitFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero11staffcredit9StateInitFv + .4byte procAnim__Q53scn4step4hero11staffcredit9StateInitFv + .4byte procMove__Q53scn4step4hero11staffcredit9StateInitFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero11staffcredit9StateInitFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateItemGet.s b/asm/src/StateItemGet.s index 9263973e..9975f80d 100644 --- a/asm/src/StateItemGet.s +++ b/asm/src/StateItemGet.s @@ -240,11 +240,11 @@ procFixPos__Q53scn4step4hero7gimmick12StateItemGetFv: __vt__Q53scn4step4hero7gimmick12StateItemGet: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick12StateItemGetFv - .byte4 procAnim__Q53scn4step4hero7gimmick12StateItemGetFv - .byte4 procMove__Q53scn4step4hero7gimmick12StateItemGetFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick12StateItemGetFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick12StateItemGetFv + .4byte procAnim__Q53scn4step4hero7gimmick12StateItemGetFv + .4byte procMove__Q53scn4step4hero7gimmick12StateItemGetFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick12StateItemGetFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateJump.s b/asm/src/StateJump.s index 6c7726e4..c57b0a74 100644 --- a/asm/src/StateJump.s +++ b/asm/src/StateJump.s @@ -4313,193 +4313,193 @@ __dt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredi __vt__Q53scn4step4boss6common9StateJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common9StateJumpFv - .byte4 procAnim__Q53scn4step4boss6common9StateJumpFv - .byte4 procMove__Q53scn4step4boss6common9StateJumpFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common9StateJumpFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6common9StateJumpFv + .4byte procAnim__Q53scn4step4boss6common9StateJumpFv + .4byte procMove__Q53scn4step4boss6common9StateJumpFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common9StateJumpFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9moundeath9StateJump __vt__Q53scn4step4boss9moundeath9StateJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9moundeath9StateJumpFv - .byte4 procAnim__Q53scn4step4boss9moundeath9StateJumpFv - .byte4 procMove__Q53scn4step4boss9moundeath9StateJumpFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9moundeath9StateJumpFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9moundeath9StateJumpFv + .4byte procAnim__Q53scn4step4boss9moundeath9StateJumpFv + .4byte procMove__Q53scn4step4boss9moundeath9StateJumpFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9moundeath9StateJumpFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper9StateJump __vt__Q53scn4step5enemy7blipper9StateJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7blipper9StateJumpFv - .byte4 procAnim__Q53scn4step5enemy7blipper9StateJumpFv - .byte4 procMove__Q53scn4step5enemy7blipper9StateJumpFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7blipper9StateJumpFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7blipper9StateJumpFv + .4byte procAnim__Q53scn4step5enemy7blipper9StateJumpFv + .4byte procMove__Q53scn4step5enemy7blipper9StateJumpFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7blipper9StateJumpFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy9StateJump __vt__Q53scn4step5enemy6bouncy9StateJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6bouncy9StateJumpFv - .byte4 procAnim__Q53scn4step5enemy6bouncy9StateJumpFv - .byte4 procMove__Q53scn4step5enemy6bouncy9StateJumpFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6bouncy9StateJumpFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6bouncy9StateJumpFv + .4byte procAnim__Q53scn4step5enemy6bouncy9StateJumpFv + .4byte procMove__Q53scn4step5enemy6bouncy9StateJumpFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6bouncy9StateJumpFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu9StateJump __vt__Q53scn4step5enemy4kabu9StateJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4kabu9StateJumpFv - .byte4 procAnim__Q53scn4step5enemy4kabu9StateJumpFv - .byte4 procMove__Q53scn4step5enemy4kabu9StateJumpFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4kabu9StateJumpFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy4kabu9StateJumpFv + .4byte procAnim__Q53scn4step5enemy4kabu9StateJumpFv + .4byte procMove__Q53scn4step5enemy4kabu9StateJumpFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4kabu9StateJumpFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6leafan9StateJump __vt__Q53scn4step5enemy6leafan9StateJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6leafan9StateJumpFv - .byte4 procAnim__Q53scn4step5enemy6leafan9StateJumpFv - .byte4 procMove__Q53scn4step5enemy6leafan9StateJumpFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6leafan9StateJumpFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6leafan9StateJumpFv + .4byte procAnim__Q53scn4step5enemy6leafan9StateJumpFv + .4byte procMove__Q53scn4step5enemy6leafan9StateJumpFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6leafan9StateJumpFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5rocky9StateJump __vt__Q53scn4step5enemy5rocky9StateJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5rocky9StateJumpFv - .byte4 procAnim__Q53scn4step5enemy5rocky9StateJumpFv - .byte4 procMove__Q53scn4step5enemy5rocky9StateJumpFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5rocky9StateJumpFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5rocky9StateJumpFv + .4byte procAnim__Q53scn4step5enemy5rocky9StateJumpFv + .4byte procMove__Q53scn4step5enemy5rocky9StateJumpFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5rocky9StateJumpFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFallNoDecel$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFallNoDecel$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFallNoDecel$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFallNoDecel$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFallNoDecel$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFallNoDecel$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5sheld9StateJump __vt__Q53scn4step5enemy5sheld9StateJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5sheld9StateJumpFv - .byte4 procAnim__Q53scn4step5enemy5sheld9StateJumpFv - .byte4 procMove__Q53scn4step5enemy5sheld9StateJumpFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5sheld9StateJumpFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5sheld9StateJumpFv + .4byte procAnim__Q53scn4step5enemy5sheld9StateJumpFv + .4byte procMove__Q53scn4step5enemy5sheld9StateJumpFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5sheld9StateJumpFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9sirkibble9StateJump __vt__Q53scn4step5enemy9sirkibble9StateJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9sirkibble9StateJumpFv - .byte4 procAnim__Q53scn4step5enemy9sirkibble9StateJumpFv - .byte4 procMove__Q53scn4step5enemy9sirkibble9StateJumpFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9sirkibble9StateJumpFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9sirkibble9StateJumpFv + .4byte procAnim__Q53scn4step5enemy9sirkibble9StateJumpFv + .4byte procMove__Q53scn4step5enemy9sirkibble9StateJumpFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9sirkibble9StateJumpFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound9StateJump __vt__Q53scn4step5enemy11sisterbound9StateJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11sisterbound9StateJumpFv - .byte4 procAnim__Q53scn4step5enemy11sisterbound9StateJumpFv - .byte4 procMove__Q53scn4step5enemy11sisterbound9StateJumpFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11sisterbound9StateJumpFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11sisterbound9StateJumpFv + .4byte procAnim__Q53scn4step5enemy11sisterbound9StateJumpFv + .4byte procMove__Q53scn4step5enemy11sisterbound9StateJumpFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11sisterbound9StateJumpFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sparky9StateJump __vt__Q53scn4step5enemy6sparky9StateJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6sparky9StateJumpFv - .byte4 procAnim__Q53scn4step5enemy6sparky9StateJumpFv - .byte4 procMove__Q53scn4step5enemy6sparky9StateJumpFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6sparky9StateJumpFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6sparky9StateJumpFv + .4byte procAnim__Q53scn4step5enemy6sparky9StateJumpFv + .4byte procMove__Q53scn4step5enemy6sparky9StateJumpFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6sparky9StateJumpFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage9StateJump __vt__Q53scn4step5enemy9tsukikage9StateJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9tsukikage9StateJumpFv - .byte4 procAnim__Q53scn4step5enemy9tsukikage9StateJumpFv - .byte4 procMove__Q53scn4step5enemy9tsukikage9StateJumpFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9tsukikage9StateJumpFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9tsukikage9StateJumpFv + .4byte procAnim__Q53scn4step5enemy9tsukikage9StateJumpFv + .4byte procMove__Q53scn4step5enemy9tsukikage9StateJumpFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9tsukikage9StateJumpFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledoo9StateJump __vt__Q53scn4step5enemy9waddledoo9StateJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledoo9StateJumpFv - .byte4 procAnim__Q53scn4step5enemy9waddledoo9StateJumpFv - .byte4 procMove__Q53scn4step5enemy9waddledoo9StateJumpFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9waddledoo9StateJumpFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9waddledoo9StateJumpFv + .4byte procAnim__Q53scn4step5enemy9waddledoo9StateJumpFv + .4byte procMove__Q53scn4step5enemy9waddledoo9StateJumpFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9waddledoo9StateJumpFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common13StateJumpHold$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common13StateJumpHold$$4PQ43scn4step4hero4Hero$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common13StateJumpHold$$4PQ43scn4step4hero4Hero$$4b$$1Fv - .byte4 create__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common13StateJumpHold$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte __dt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common13StateJumpHold$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte create__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common13StateJumpHold$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4b$$1Fv - .byte4 create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero6common9StateJump __vt__Q53scn4step4hero6common9StateJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common9StateJumpFv - .byte4 procAnim__Q53scn4step4hero6common9StateJumpFv - .byte4 procMove__Q53scn4step4hero6common9StateJumpFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common9StateJumpFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common9StateJumpFv + .4byte procAnim__Q53scn4step4hero6common9StateJumpFv + .4byte procMove__Q53scn4step4hero6common9StateJumpFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common9StateJumpFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -4507,25 +4507,25 @@ __vt__Q53scn4step4hero6common9StateJump: __vt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv - .byte4 create__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv + .4byte __dt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv + .4byte create__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateJump$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateJump$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateJump$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateJump$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateJump$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateJump$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero11staffcredit9StateJump __vt__Q53scn4step4hero11staffcredit9StateJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero11staffcredit9StateJumpFv - .byte4 procAnim__Q53scn4step4hero11staffcredit9StateJumpFv - .byte4 procMove__Q53scn4step4hero11staffcredit9StateJumpFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero11staffcredit9StateJumpFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero11staffcredit9StateJumpFv + .4byte procAnim__Q53scn4step4hero11staffcredit9StateJumpFv + .4byte procMove__Q53scn4step4hero11staffcredit9StateJumpFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero11staffcredit9StateJumpFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateJumpAttack.s b/asm/src/StateJumpAttack.s index a2693f98..beb9eee9 100644 --- a/asm/src/StateJumpAttack.s +++ b/asm/src/StateJumpAttack.s @@ -1169,60 +1169,60 @@ __dt__Q53scn4step5enemy9tsukikage15StateJumpAttackFv: __vt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4i$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4i$$1Fv - .byte4 create__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4i$$1Fv + .4byte __dt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4i$$1Fv + .4byte create__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4i$$1Fv .global __vt__Q53scn4step4boss6common15StateJumpAttack __vt__Q53scn4step4boss6common15StateJumpAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common15StateJumpAttackFv - .byte4 procAnim__Q53scn4step4boss6common15StateJumpAttackFv - .byte4 procMove__Q53scn4step4boss6common15StateJumpAttackFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common15StateJumpAttackFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6common15StateJumpAttackFv + .4byte procAnim__Q53scn4step4boss6common15StateJumpAttackFv + .4byte procMove__Q53scn4step4boss6common15StateJumpAttackFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common15StateJumpAttackFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble10ScriptKind$$1 __vt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv - .byte4 create__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv + .4byte __dt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv + .4byte create__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv .global __vt__Q53scn4step4boss9zankibble15StateJumpAttack __vt__Q53scn4step4boss9zankibble15StateJumpAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9zankibble15StateJumpAttackFv - .byte4 procAnim__Q53scn4step4boss9zankibble15StateJumpAttackFv - .byte4 procMove__Q53scn4step4boss9zankibble15StateJumpAttackFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9zankibble15StateJumpAttackFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9zankibble15StateJumpAttackFv + .4byte procAnim__Q53scn4step4boss9zankibble15StateJumpAttackFv + .4byte procMove__Q53scn4step4boss9zankibble15StateJumpAttackFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9zankibble15StateJumpAttackFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9sirkibble15StateJumpAttack __vt__Q53scn4step5enemy9sirkibble15StateJumpAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9sirkibble15StateJumpAttackFv - .byte4 procAnim__Q53scn4step5enemy9sirkibble15StateJumpAttackFv - .byte4 procMove__Q53scn4step5enemy9sirkibble15StateJumpAttackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9sirkibble15StateJumpAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9sirkibble15StateJumpAttackFv + .4byte procAnim__Q53scn4step5enemy9sirkibble15StateJumpAttackFv + .4byte procMove__Q53scn4step5enemy9sirkibble15StateJumpAttackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9sirkibble15StateJumpAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage15StateJumpAttack __vt__Q53scn4step5enemy9tsukikage15StateJumpAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9tsukikage15StateJumpAttackFv - .byte4 procAnim__Q53scn4step5enemy9tsukikage15StateJumpAttackFv - .byte4 procMove__Q53scn4step5enemy9tsukikage15StateJumpAttackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9tsukikage15StateJumpAttackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9tsukikage15StateJumpAttackFv + .4byte procAnim__Q53scn4step5enemy9tsukikage15StateJumpAttackFv + .4byte procMove__Q53scn4step5enemy9tsukikage15StateJumpAttackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9tsukikage15StateJumpAttackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256369 diff --git a/asm/src/StateJumpAttackStart.s b/asm/src/StateJumpAttackStart.s index cae45f3f..48388810 100644 --- a/asm/src/StateJumpAttackStart.s +++ b/asm/src/StateJumpAttackStart.s @@ -280,36 +280,36 @@ __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble15 __vt__Q24util144StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util144StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Ul$$1Fv - .byte4 create__Q24util144StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Ul$$1Fv + .4byte __dt__Q24util144StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Ul$$1Fv + .4byte create__Q24util144StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Ul$$1Fv .global __vt__Q53scn4step4boss6common20StateJumpAttackStart __vt__Q53scn4step4boss6common20StateJumpAttackStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common20StateJumpAttackStartFv - .byte4 procAnim__Q53scn4step4boss6common20StateJumpAttackStartFv - .byte4 procMove__Q53scn4step4boss6common20StateJumpAttackStartFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common20StateJumpAttackStartFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6common20StateJumpAttackStartFv + .4byte procAnim__Q53scn4step4boss6common20StateJumpAttackStartFv + .4byte procMove__Q53scn4step4boss6common20StateJumpAttackStartFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common20StateJumpAttackStartFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1 __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1Fv - .byte4 create__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1Fv + .4byte __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1Fv + .4byte create__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1Fv .global __vt__Q53scn4step4boss9zankibble20StateJumpAttackStart __vt__Q53scn4step4boss9zankibble20StateJumpAttackStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9zankibble20StateJumpAttackStartFv - .byte4 procAnim__Q53scn4step4boss9zankibble20StateJumpAttackStartFv - .byte4 procMove__Q53scn4step4boss9zankibble20StateJumpAttackStartFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9zankibble20StateJumpAttackStartFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9zankibble20StateJumpAttackStartFv + .4byte procAnim__Q53scn4step4boss9zankibble20StateJumpAttackStartFv + .4byte procMove__Q53scn4step4boss9zankibble20StateJumpAttackStartFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9zankibble20StateJumpAttackStartFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254946 diff --git a/asm/src/StateJumpBig.s b/asm/src/StateJumpBig.s index c6b64e27..91250bdf 100644 --- a/asm/src/StateJumpBig.s +++ b/asm/src/StateJumpBig.s @@ -340,18 +340,18 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common12Stat __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss7bonkers12StateJumpBig __vt__Q53scn4step4boss7bonkers12StateJumpBig: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss7bonkers12StateJumpBigFv - .byte4 procAnim__Q53scn4step4boss7bonkers12StateJumpBigFv - .byte4 procMove__Q53scn4step4boss7bonkers12StateJumpBigFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss7bonkers12StateJumpBigFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss7bonkers12StateJumpBigFv + .4byte procAnim__Q53scn4step4boss7bonkers12StateJumpBigFv + .4byte procMove__Q53scn4step4boss7bonkers12StateJumpBigFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss7bonkers12StateJumpBigFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256288 diff --git a/asm/src/StateJumpBigStart.s b/asm/src/StateJumpBigStart.s index 20f6da2c..40d24008 100644 --- a/asm/src/StateJumpBigStart.s +++ b/asm/src/StateJumpBigStart.s @@ -102,15 +102,15 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers12Sta __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers12StateJumpBig$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers12StateJumpBig$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers12StateJumpBig$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers12StateJumpBig$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers12StateJumpBig$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss7bonkers17StateJumpBigStart __vt__Q53scn4step4boss7bonkers17StateJumpBigStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss7bonkers17StateJumpBigStartFv - .byte4 procAnim__Q53scn4step4boss7bonkers17StateJumpBigStartFv - .byte4 procMove__Q53scn4step4boss7bonkers17StateJumpBigStartFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss7bonkers17StateJumpBigStartFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss7bonkers17StateJumpBigStartFv + .4byte procAnim__Q53scn4step4boss7bonkers17StateJumpBigStartFv + .4byte procMove__Q53scn4step4boss7bonkers17StateJumpBigStartFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss7bonkers17StateJumpBigStartFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateJumpCenterAttack.s b/asm/src/StateJumpCenterAttack.s index 6e912df7..96256dfd 100644 --- a/asm/src/StateJumpCenterAttack.s +++ b/asm/src/StateJumpCenterAttack.s @@ -294,12 +294,12 @@ lbl_802542AC: __vt__Q53scn4step4boss8kingsdoo21StateJumpCenterAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss8kingsdoo21StateJumpCenterAttackFv - .byte4 procAnim__Q53scn4step4boss8kingsdoo21StateJumpCenterAttackFv - .byte4 procMove__Q53scn4step4boss8kingsdoo21StateJumpCenterAttackFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss8kingsdoo21StateJumpCenterAttackFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss8kingsdoo21StateJumpCenterAttackFv + .4byte procAnim__Q53scn4step4boss8kingsdoo21StateJumpCenterAttackFv + .4byte procMove__Q53scn4step4boss8kingsdoo21StateJumpCenterAttackFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss8kingsdoo21StateJumpCenterAttackFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256165 diff --git a/asm/src/StateJumpHold.s b/asm/src/StateJumpHold.s index 5182dc3b..76e28da1 100644 --- a/asm/src/StateJumpHold.s +++ b/asm/src/StateJumpHold.s @@ -340,19 +340,19 @@ __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9State __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$4b$$1Fv - .byte4 create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero6common13StateJumpHold __vt__Q53scn4step4hero6common13StateJumpHold: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common13StateJumpHoldFv - .byte4 procAnim__Q53scn4step4hero6common13StateJumpHoldFv - .byte4 procMove__Q53scn4step4hero6common13StateJumpHoldFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common13StateJumpHoldFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common13StateJumpHoldFv + .4byte procAnim__Q53scn4step4hero6common13StateJumpHoldFv + .4byte procMove__Q53scn4step4hero6common13StateJumpHoldFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common13StateJumpHoldFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateJumpMachinegun.s b/asm/src/StateJumpMachinegun.s index d1e3a667..b131cd31 100644 --- a/asm/src/StateJumpMachinegun.s +++ b/asm/src/StateJumpMachinegun.s @@ -407,12 +407,12 @@ reqMachinegun__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFv: __vt__Q53scn4step4boss8kingsdoo19StateJumpMachinegun: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFv - .byte4 procAnim__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFv - .byte4 procMove__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFv + .4byte procAnim__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFv + .4byte procMove__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256540 diff --git a/asm/src/StateJumpMachinegunStart.s b/asm/src/StateJumpMachinegunStart.s index 94c32c87..265b81ab 100644 --- a/asm/src/StateJumpMachinegunStart.s +++ b/asm/src/StateJumpMachinegunStart.s @@ -105,15 +105,15 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo19S __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo19StateJumpMachinegun$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo19StateJumpMachinegun$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo19StateJumpMachinegun$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo19StateJumpMachinegun$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo19StateJumpMachinegun$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart __vt__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStartFv - .byte4 procAnim__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStartFv - .byte4 procMove__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStartFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStartFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStartFv + .4byte procAnim__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStartFv + .4byte procMove__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStartFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStartFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateJumpStart.s b/asm/src/StateJumpStart.s index 4092b5b2..fc5e7065 100644 --- a/asm/src/StateJumpStart.s +++ b/asm/src/StateJumpStart.s @@ -917,73 +917,73 @@ __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9State __vt__Q24util131StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util131StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Ul$$1Fv - .byte4 create__Q24util131StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Ul$$1Fv + .4byte __dt__Q24util131StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Ul$$1Fv + .4byte create__Q24util131StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Ul$$1Fv .global __vt__Q53scn4step4boss6common14StateJumpStart __vt__Q53scn4step4boss6common14StateJumpStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common14StateJumpStartFv - .byte4 procAnim__Q53scn4step4boss6common14StateJumpStartFv - .byte4 procMove__Q53scn4step4boss6common14StateJumpStartFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common14StateJumpStartFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6common14StateJumpStartFv + .4byte procAnim__Q53scn4step4boss6common14StateJumpStartFv + .4byte procMove__Q53scn4step4boss6common14StateJumpStartFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common14StateJumpStartFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5sheld14StateJumpStart __vt__Q53scn4step5enemy5sheld14StateJumpStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5sheld14StateJumpStartFv - .byte4 procAnim__Q53scn4step5enemy5sheld14StateJumpStartFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5sheld14StateJumpStartFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5sheld14StateJumpStartFv + .4byte procAnim__Q53scn4step5enemy5sheld14StateJumpStartFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5sheld14StateJumpStartFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound14StateJumpStart __vt__Q53scn4step5enemy11sisterbound14StateJumpStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11sisterbound14StateJumpStartFv - .byte4 procAnim__Q53scn4step5enemy11sisterbound14StateJumpStartFv - .byte4 procMove__Q53scn4step5enemy11sisterbound14StateJumpStartFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11sisterbound14StateJumpStartFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11sisterbound14StateJumpStartFv + .4byte procAnim__Q53scn4step5enemy11sisterbound14StateJumpStartFv + .4byte procMove__Q53scn4step5enemy11sisterbound14StateJumpStartFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11sisterbound14StateJumpStartFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateJumpStart$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateJumpStart$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateJumpStart$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateJumpStart$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateJumpStart$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateJumpStart$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common14StateJumpStart __vt__Q53scn4step4hero6common14StateJumpStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common14StateJumpStartFv - .byte4 procAnim__Q53scn4step4hero6common14StateJumpStartFv - .byte4 procMove__Q53scn4step4hero6common14StateJumpStartFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common14StateJumpStartFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common14StateJumpStartFv + .4byte procAnim__Q53scn4step4hero6common14StateJumpStartFv + .4byte procMove__Q53scn4step4hero6common14StateJumpStartFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common14StateJumpStartFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateKiss.s b/asm/src/StateKiss.s index ab492df6..4d47f250 100644 --- a/asm/src/StateKiss.s +++ b/asm/src/StateKiss.s @@ -682,19 +682,19 @@ __dt__Q24util174StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interferen __vt__Q24util174StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference16StateKissReceive$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q43scn4step4hero11KissContext$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util174StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference16StateKissReceive$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q43scn4step4hero11KissContext$$1Fv - .byte4 create__Q24util174StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference16StateKissReceive$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q43scn4step4hero11KissContext$$1Fv + .4byte __dt__Q24util174StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference16StateKissReceive$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q43scn4step4hero11KissContext$$1Fv + .4byte create__Q24util174StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference16StateKissReceive$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q43scn4step4hero11KissContext$$1Fv .global __vt__Q53scn4step4hero12interference9StateKiss __vt__Q53scn4step4hero12interference9StateKiss: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero12interference9StateKissFv - .byte4 procAnim__Q53scn4step4hero12interference9StateKissFv - .byte4 procMove__Q53scn4step4hero12interference9StateKissFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero12interference9StateKissFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero12interference9StateKissFv + .4byte procAnim__Q53scn4step4hero12interference9StateKissFv + .4byte procMove__Q53scn4step4hero12interference9StateKissFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero12interference9StateKissFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateKissReceive.s b/asm/src/StateKissReceive.s index a31b9eb1..16d9bae4 100644 --- a/asm/src/StateKissReceive.s +++ b/asm/src/StateKissReceive.s @@ -446,13 +446,13 @@ procFixPos__Q53scn4step4hero12interference16StateKissReceiveFv: __vt__Q53scn4step4hero12interference16StateKissReceive: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero12interference16StateKissReceiveFv - .byte4 procAnim__Q53scn4step4hero12interference16StateKissReceiveFv - .byte4 procMove__Q53scn4step4hero12interference16StateKissReceiveFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero12interference16StateKissReceiveFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero12interference16StateKissReceiveFv + .4byte procAnim__Q53scn4step4hero12interference16StateKissReceiveFv + .4byte procMove__Q53scn4step4hero12interference16StateKissReceiveFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero12interference16StateKissReceiveFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateLadder.s b/asm/src/StateLadder.s index e50b3b98..f32c39b2 100644 --- a/asm/src/StateLadder.s +++ b/asm/src/StateLadder.s @@ -1107,19 +1107,19 @@ __dt__Q24util120StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11Sta __vt__Q24util120StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateLadder$$4PQ43scn4step4hero4Hero$$4Q35mcoll6detail10LadderInfo$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util120StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateLadder$$4PQ43scn4step4hero4Hero$$4Q35mcoll6detail10LadderInfo$$1Fv - .byte4 create__Q24util120StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateLadder$$4PQ43scn4step4hero4Hero$$4Q35mcoll6detail10LadderInfo$$1Fv + .4byte __dt__Q24util120StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateLadder$$4PQ43scn4step4hero4Hero$$4Q35mcoll6detail10LadderInfo$$1Fv + .4byte create__Q24util120StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateLadder$$4PQ43scn4step4hero4Hero$$4Q35mcoll6detail10LadderInfo$$1Fv .global __vt__Q53scn4step4hero6common11StateLadder __vt__Q53scn4step4hero6common11StateLadder: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common11StateLadderFv - .byte4 procAnim__Q53scn4step4hero6common11StateLadderFv - .byte4 procMove__Q53scn4step4hero6common11StateLadderFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common11StateLadderFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common11StateLadderFv + .4byte procAnim__Q53scn4step4hero6common11StateLadderFv + .4byte procMove__Q53scn4step4hero6common11StateLadderFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common11StateLadderFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateLanding.s b/asm/src/StateLanding.s index d1571843..04f59c40 100644 --- a/asm/src/StateLanding.s +++ b/asm/src/StateLanding.s @@ -2495,169 +2495,169 @@ __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9State __vt__Q53scn4step4boss6common12StateLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common12StateLandingFv - .byte4 procAnim__Q53scn4step4boss6common12StateLandingFv - .byte4 procMove__Q53scn4step4boss6common12StateLandingFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common12StateLandingFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6common12StateLandingFv + .4byte procAnim__Q53scn4step4boss6common12StateLandingFv + .4byte procMove__Q53scn4step4boss6common12StateLandingFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common12StateLandingFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common12StateLanding __vt__Q53scn4step5enemy6common12StateLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common12StateLandingFv - .byte4 procAnim__Q53scn4step5enemy6common12StateLandingFv - .byte4 procMove__Q53scn4step5enemy6common12StateLandingFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common12StateLandingFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common12StateLandingFv + .4byte procAnim__Q53scn4step5enemy6common12StateLandingFv + .4byte procMove__Q53scn4step5enemy6common12StateLandingFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common12StateLandingFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper12StateLanding __vt__Q53scn4step5enemy7blipper12StateLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7blipper12StateLandingFv - .byte4 procAnim__Q53scn4step5enemy7blipper12StateLandingFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7blipper12StateLandingFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7blipper12StateLandingFv + .4byte procAnim__Q53scn4step5enemy7blipper12StateLandingFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7blipper12StateLandingFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bonkersbomb12StateLanding __vt__Q53scn4step5enemy11bonkersbomb12StateLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11bonkersbomb12StateLandingFv - .byte4 procAnim__Q53scn4step5enemy11bonkersbomb12StateLandingFv - .byte4 procMove__Q53scn4step5enemy11bonkersbomb12StateLandingFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11bonkersbomb12StateLandingFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11bonkersbomb12StateLandingFv + .4byte procAnim__Q53scn4step5enemy11bonkersbomb12StateLandingFv + .4byte procMove__Q53scn4step5enemy11bonkersbomb12StateLandingFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11bonkersbomb12StateLandingFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy12StateLanding __vt__Q53scn4step5enemy6bouncy12StateLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6bouncy12StateLandingFv - .byte4 procAnim__Q53scn4step5enemy6bouncy12StateLandingFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6bouncy12StateLandingFv + .4byte procAnim__Q53scn4step5enemy6bouncy12StateLandingFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6leafan12StateLanding __vt__Q53scn4step5enemy6leafan12StateLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6leafan12StateLandingFv - .byte4 procAnim__Q53scn4step5enemy6leafan12StateLandingFv - .byte4 procMove__Q53scn4step5enemy6leafan12StateLandingFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6leafan12StateLandingFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6leafan12StateLandingFv + .4byte procAnim__Q53scn4step5enemy6leafan12StateLandingFv + .4byte procMove__Q53scn4step5enemy6leafan12StateLandingFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6leafan12StateLandingFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10parasoldee12StateLanding __vt__Q53scn4step5enemy10parasoldee12StateLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10parasoldee12StateLandingFv - .byte4 procAnim__Q53scn4step5enemy10parasoldee12StateLandingFv - .byte4 procMove__Q53scn4step5enemy10parasoldee12StateLandingFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10parasoldee12StateLandingFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10parasoldee12StateLandingFv + .4byte procAnim__Q53scn4step5enemy10parasoldee12StateLandingFv + .4byte procMove__Q53scn4step5enemy10parasoldee12StateLandingFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10parasoldee12StateLandingFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10parasoldoo12StateLanding __vt__Q53scn4step5enemy10parasoldoo12StateLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10parasoldoo12StateLandingFv - .byte4 procAnim__Q53scn4step5enemy10parasoldoo12StateLandingFv - .byte4 procMove__Q53scn4step5enemy10parasoldoo12StateLandingFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10parasoldoo12StateLandingFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10parasoldoo12StateLandingFv + .4byte procAnim__Q53scn4step5enemy10parasoldoo12StateLandingFv + .4byte procMove__Q53scn4step5enemy10parasoldoo12StateLandingFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10parasoldoo12StateLandingFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10StateSlope$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10StateSlope$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10StateSlope$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10StateSlope$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10StateSlope$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10StateSlope$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5rocky12StateLanding __vt__Q53scn4step5enemy5rocky12StateLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5rocky12StateLandingFv - .byte4 procAnim__Q53scn4step5enemy5rocky12StateLandingFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5rocky12StateLandingFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5rocky12StateLandingFv + .4byte procAnim__Q53scn4step5enemy5rocky12StateLandingFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5rocky12StateLandingFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound12StateLanding __vt__Q53scn4step5enemy11sisterbound12StateLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11sisterbound12StateLandingFv - .byte4 procAnim__Q53scn4step5enemy11sisterbound12StateLandingFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11sisterbound12StateLandingFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11sisterbound12StateLandingFv + .4byte procAnim__Q53scn4step5enemy11sisterbound12StateLandingFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11sisterbound12StateLandingFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage12StateLanding __vt__Q53scn4step5enemy9tsukikage12StateLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9tsukikage12StateLandingFv - .byte4 procAnim__Q53scn4step5enemy9tsukikage12StateLandingFv - .byte4 procMove__Q53scn4step5enemy9tsukikage12StateLandingFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9tsukikage12StateLandingFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9tsukikage12StateLandingFv + .4byte procAnim__Q53scn4step5enemy9tsukikage12StateLandingFv + .4byte procMove__Q53scn4step5enemy9tsukikage12StateLandingFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9tsukikage12StateLandingFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .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: .4byte 0 .4byte 0 - .byte4 __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateWait$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv - .byte4 create__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateWait$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .4byte __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateWait$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .4byte create__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateWait$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv .global __vt__Q53scn4step4hero5stone12StateLanding __vt__Q53scn4step4hero5stone12StateLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5stone12StateLandingFv - .byte4 procAnim__Q53scn4step4hero5stone12StateLandingFv - .byte4 procMove__Q53scn4step4hero5stone12StateLandingFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5stone12StateLandingFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5stone12StateLandingFv + .4byte procAnim__Q53scn4step4hero5stone12StateLandingFv + .4byte procMove__Q53scn4step4hero5stone12StateLandingFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5stone12StateLandingFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/StateLaugh.s b/asm/src/StateLaugh.s index 0c8b3a15..1e30175a 100644 --- a/asm/src/StateLaugh.s +++ b/asm/src/StateLaugh.s @@ -194,15 +194,15 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StateLaugh$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StateLaugh$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StateLaugh$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StateLaugh$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StateLaugh$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster10StateLaugh __vt__Q53scn4step4boss15challengemaster10StateLaugh: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster10StateLaughFv - .byte4 procAnim__Q53scn4step4boss15challengemaster10StateLaughFv - .byte4 procMove__Q53scn4step4boss15challengemaster10StateLaughFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster10StateLaughFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster10StateLaughFv + .4byte procAnim__Q53scn4step4boss15challengemaster10StateLaughFv + .4byte procMove__Q53scn4step4boss15challengemaster10StateLaughFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster10StateLaughFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateLeaveChallengeDoor.s b/asm/src/StateLeaveChallengeDoor.s index 3720ed90..c5d9ddfd 100644 --- a/asm/src/StateLeaveChallengeDoor.s +++ b/asm/src/StateLeaveChallengeDoor.s @@ -417,13 +417,13 @@ procFixPos__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFv: __vt__Q53scn4step4hero7gimmick23StateLeaveChallengeDoor: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFv - .byte4 procAnim__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFv - .byte4 procMove__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFv + .4byte procAnim__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFv + .4byte procMove__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateLeaveLvMapDoor.s b/asm/src/StateLeaveLvMapDoor.s index a9f2df37..ae7d68bf 100644 --- a/asm/src/StateLeaveLvMapDoor.s +++ b/asm/src/StateLeaveLvMapDoor.s @@ -441,25 +441,25 @@ __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick20St __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick20StateUnlockLvMapDoor$$4PQ43scn4step4hero4Hero$$4i$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick20StateUnlockLvMapDoor$$4PQ43scn4step4hero4Hero$$4i$$1Fv - .byte4 create__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick20StateUnlockLvMapDoor$$4PQ43scn4step4hero4Hero$$4i$$1Fv + .4byte __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick20StateUnlockLvMapDoor$$4PQ43scn4step4hero4Hero$$4i$$1Fv + .4byte create__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick20StateUnlockLvMapDoor$$4PQ43scn4step4hero4Hero$$4i$$1Fv .global __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick18StateAllStageClear$$4PQ43scn4step4hero4Hero$$4i$$1 __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick18StateAllStageClear$$4PQ43scn4step4hero4Hero$$4i$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick18StateAllStageClear$$4PQ43scn4step4hero4Hero$$4i$$1Fv - .byte4 create__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick18StateAllStageClear$$4PQ43scn4step4hero4Hero$$4i$$1Fv + .4byte __dt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick18StateAllStageClear$$4PQ43scn4step4hero4Hero$$4i$$1Fv + .4byte create__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick18StateAllStageClear$$4PQ43scn4step4hero4Hero$$4i$$1Fv .global __vt__Q53scn4step4hero7gimmick19StateLeaveLvMapDoor __vt__Q53scn4step4hero7gimmick19StateLeaveLvMapDoor: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick19StateLeaveLvMapDoorFv - .byte4 procAnim__Q53scn4step4hero7gimmick19StateLeaveLvMapDoorFv - .byte4 procMove__Q53scn4step4hero7gimmick19StateLeaveLvMapDoorFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick19StateLeaveLvMapDoorFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick19StateLeaveLvMapDoorFv + .4byte procAnim__Q53scn4step4hero7gimmick19StateLeaveLvMapDoorFv + .4byte procMove__Q53scn4step4hero7gimmick19StateLeaveLvMapDoorFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick19StateLeaveLvMapDoorFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateLeaveMahoroa.s b/asm/src/StateLeaveMahoroa.s index 6df8f471..40866e5e 100644 --- a/asm/src/StateLeaveMahoroa.s +++ b/asm/src/StateLeaveMahoroa.s @@ -356,13 +356,13 @@ distance__Q53scn4step4hero7gimmick17StateLeaveMahoroaFv: __vt__Q53scn4step4hero7gimmick17StateLeaveMahoroa: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick17StateLeaveMahoroaFv - .byte4 procAnim__Q53scn4step4hero7gimmick17StateLeaveMahoroaFv - .byte4 procMove__Q53scn4step4hero7gimmick17StateLeaveMahoroaFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick17StateLeaveMahoroaFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick17StateLeaveMahoroaFv + .4byte procAnim__Q53scn4step4hero7gimmick17StateLeaveMahoroaFv + .4byte procMove__Q53scn4step4hero7gimmick17StateLeaveMahoroaFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick17StateLeaveMahoroaFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateLeaveSubgameDoor.s b/asm/src/StateLeaveSubgameDoor.s index a944b7b1..af7c12e4 100644 --- a/asm/src/StateLeaveSubgameDoor.s +++ b/asm/src/StateLeaveSubgameDoor.s @@ -274,13 +274,13 @@ mfCinemaScopeDisable__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFv: __vt__Q53scn4step4hero7gimmick21StateLeaveSubgameDoor: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFv - .byte4 procAnim__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFv - .byte4 procMove__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFv + .4byte procAnim__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFv + .4byte procMove__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateLink.s b/asm/src/StateLink.s index ac6cfa80..7958cfa1 100644 --- a/asm/src/StateLink.s +++ b/asm/src/StateLink.s @@ -148,18 +148,18 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9Sta __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateRise$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateRise$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateRise$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateRise$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateRise$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy7parasol9StateLink __vt__Q53scn4step5enemy7parasol9StateLink: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7parasol9StateLinkFv - .byte4 procAnim__Q53scn4step5enemy7parasol9StateLinkFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7parasol9StateLinkFv + .4byte procAnim__Q53scn4step5enemy7parasol9StateLinkFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256687 diff --git a/asm/src/StateLogout.s b/asm/src/StateLogout.s index 422ebe5a..ef80da83 100644 --- a/asm/src/StateLogout.s +++ b/asm/src/StateLogout.s @@ -220,11 +220,11 @@ procFixPos__Q53scn4step4hero6common11StateLogoutFv: __vt__Q53scn4step4hero6common11StateLogout: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common11StateLogoutFv - .byte4 procAnim__Q53scn4step4hero6common11StateLogoutFv - .byte4 procMove__Q53scn4step4hero6common11StateLogoutFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common11StateLogoutFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common11StateLogoutFv + .4byte procAnim__Q53scn4step4hero6common11StateLogoutFv + .4byte procMove__Q53scn4step4hero6common11StateLogoutFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common11StateLogoutFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateLookAround.s b/asm/src/StateLookAround.s index 5a14d27f..713187eb 100644 --- a/asm/src/StateLookAround.s +++ b/asm/src/StateLookAround.s @@ -45,9 +45,9 @@ __dt__Q53scn4step5enemy6chilly15StateLookAroundFv: __vt__Q53scn4step5enemy6chilly15StateLookAround: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6chilly15StateLookAroundFv - .byte4 procAnim__Q53scn4step5enemy6chilly15StateLookAroundFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6chilly15StateLookAroundFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6chilly15StateLookAroundFv + .4byte procAnim__Q53scn4step5enemy6chilly15StateLookAroundFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6chilly15StateLookAroundFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateLookBoss.s b/asm/src/StateLookBoss.s index 6ea53d8f..5cdd465f 100644 --- a/asm/src/StateLookBoss.s +++ b/asm/src/StateLookBoss.s @@ -544,25 +544,25 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util129StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit13StateLookBoss$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1 __vt__Q24util129StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit13StateLookBoss$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util129StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit13StateLookBoss$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv - .byte4 create__Q24util129StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit13StateLookBoss$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv + .4byte __dt__Q24util129StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit13StateLookBoss$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv + .4byte create__Q24util129StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit13StateLookBoss$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv .global __vt__Q53scn4step4hero11staffcredit13StateLookBoss __vt__Q53scn4step4hero11staffcredit13StateLookBoss: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero11staffcredit13StateLookBossFv - .byte4 procAnim__Q53scn4step4hero11staffcredit13StateLookBossFv - .byte4 procMove__Q53scn4step4hero11staffcredit13StateLookBossFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero11staffcredit13StateLookBossFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero11staffcredit13StateLookBossFv + .4byte procAnim__Q53scn4step4hero11staffcredit13StateLookBossFv + .4byte procMove__Q53scn4step4hero11staffcredit13StateLookBossFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero11staffcredit13StateLookBossFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateLose.s b/asm/src/StateLose.s index 4947ba85..fad6bd4a 100644 --- a/asm/src/StateLose.s +++ b/asm/src/StateLose.s @@ -88,9 +88,9 @@ procFixPos__Q53scn4step4boss15challengemaster9StateLoseFv: __vt__Q53scn4step4boss15challengemaster9StateLose: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster9StateLoseFv - .byte4 procAnim__Q53scn4step4boss15challengemaster9StateLoseFv - .byte4 procMove__Q53scn4step4boss15challengemaster9StateLoseFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster9StateLoseFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster9StateLoseFv + .4byte procAnim__Q53scn4step4boss15challengemaster9StateLoseFv + .4byte procMove__Q53scn4step4boss15challengemaster9StateLoseFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster9StateLoseFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateLoseFly.s b/asm/src/StateLoseFly.s index 3464bd96..2620eac6 100644 --- a/asm/src/StateLoseFly.s +++ b/asm/src/StateLoseFly.s @@ -475,25 +475,25 @@ __sinit_$$3StateLoseFly_cpp: /* 802416E0 0023D520 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3StateLoseFly_cpp + .4byte __sinit_$$3StateLoseFly_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateLose$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateLose$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateLose$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateLose$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateLose$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateLose$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster12StateLoseFly __vt__Q53scn4step4boss15challengemaster12StateLoseFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster12StateLoseFlyFv - .byte4 procAnim__Q53scn4step4boss15challengemaster12StateLoseFlyFv - .byte4 procMove__Q53scn4step4boss15challengemaster12StateLoseFlyFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster12StateLoseFlyFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster12StateLoseFlyFv + .4byte procAnim__Q53scn4step4boss15challengemaster12StateLoseFlyFv + .4byte procMove__Q53scn4step4boss15challengemaster12StateLoseFlyFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster12StateLoseFlyFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256401 diff --git a/asm/src/StateLostHat.s b/asm/src/StateLostHat.s index a2a37365..0a7b8044 100644 --- a/asm/src/StateLostHat.s +++ b/asm/src/StateLostHat.s @@ -123,9 +123,9 @@ procFixPos__Q53scn4step5enemy5cappy12StateLostHatFv: __vt__Q53scn4step5enemy5cappy12StateLostHat: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5cappy12StateLostHatFv - .byte4 procAnim__Q53scn4step5enemy5cappy12StateLostHatFv - .byte4 procMove__Q53scn4step5enemy5cappy12StateLostHatFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5cappy12StateLostHatFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5cappy12StateLostHatFv + .4byte procAnim__Q53scn4step5enemy5cappy12StateLostHatFv + .4byte procMove__Q53scn4step5enemy5cappy12StateLostHatFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5cappy12StateLostHatFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateMain.s b/asm/src/StateMain.s index 195a09ae..f1c12f31 100644 --- a/asm/src/StateMain.s +++ b/asm/src/StateMain.s @@ -17347,684 +17347,684 @@ T_HOLD_FRAME__Q53scn4step6weapon10whispyroot23$$2unnamed$$2StateMain_cpp$$2: __vt__Q53scn4step5enemy9mbossdead9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9mbossdead9StateMainFv - .byte4 procAnim__Q53scn4step5enemy9mbossdead9StateMainFv - .byte4 procMove__Q53scn4step5enemy9mbossdead9StateMainFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9mbossdead9StateMainFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9mbossdead9StateMainFv + .4byte procAnim__Q53scn4step5enemy9mbossdead9StateMainFv + .4byte procMove__Q53scn4step5enemy9mbossdead9StateMainFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9mbossdead9StateMainFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon7airball9StateMain __vt__Q53scn4step6weapon7airball9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon7airball9StateMainFv - .byte4 procAnim__Q53scn4step6weapon7airball9StateMainFv - .byte4 procMove__Q53scn4step6weapon7airball9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon7airball9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon7airball9StateMainFv + .4byte __dt__Q53scn4step6weapon7airball9StateMainFv + .4byte procAnim__Q53scn4step6weapon7airball9StateMainFv + .4byte procMove__Q53scn4step6weapon7airball9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon7airball9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon7airball9StateMainFv .global __vt__Q53scn4step6weapon17fireburningbullet9StateMain __vt__Q53scn4step6weapon17fireburningbullet9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon17fireburningbullet9StateMainFv - .byte4 procAnim__Q53scn4step6weapon17fireburningbullet9StateMainFv - .byte4 procMove__Q53scn4step6weapon17fireburningbullet9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon17fireburningbullet9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon17fireburningbullet9StateMainFv + .4byte __dt__Q53scn4step6weapon17fireburningbullet9StateMainFv + .4byte procAnim__Q53scn4step6weapon17fireburningbullet9StateMainFv + .4byte procMove__Q53scn4step6weapon17fireburningbullet9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon17fireburningbullet9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon17fireburningbullet9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon11starshotlv19StateMain __vt__Q53scn4step6weapon11starshotlv19StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon11starshotlv19StateMainFv - .byte4 procAnim__Q53scn4step6weapon11starshotlv19StateMainFv - .byte4 procMove__Q53scn4step6weapon11starshotlv19StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon11starshotlv19StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon11starshotlv19StateMainFv + .4byte __dt__Q53scn4step6weapon11starshotlv19StateMainFv + .4byte procAnim__Q53scn4step6weapon11starshotlv19StateMainFv + .4byte procMove__Q53scn4step6weapon11starshotlv19StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon11starshotlv19StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon11starshotlv19StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon11starshotlv29StateMain __vt__Q53scn4step6weapon11starshotlv29StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon11starshotlv29StateMainFv - .byte4 procAnim__Q53scn4step6weapon11starshotlv29StateMainFv - .byte4 procMove__Q53scn4step6weapon11starshotlv29StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon11starshotlv29StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon11starshotlv29StateMainFv + .4byte __dt__Q53scn4step6weapon11starshotlv29StateMainFv + .4byte procAnim__Q53scn4step6weapon11starshotlv29StateMainFv + .4byte procMove__Q53scn4step6weapon11starshotlv29StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon11starshotlv29StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon11starshotlv29StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon11starshotlv39StateMain __vt__Q53scn4step6weapon11starshotlv39StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon11starshotlv39StateMainFv - .byte4 procAnim__Q53scn4step6weapon11starshotlv39StateMainFv - .byte4 procMove__Q53scn4step6weapon11starshotlv39StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon11starshotlv39StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon11starshotlv39StateMainFv + .4byte __dt__Q53scn4step6weapon11starshotlv39StateMainFv + .4byte procAnim__Q53scn4step6weapon11starshotlv39StateMainFv + .4byte procMove__Q53scn4step6weapon11starshotlv39StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon11starshotlv39StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon11starshotlv39StateMainFv .global __vt__Q53scn4step6weapon11waterpistol9StateMain __vt__Q53scn4step6weapon11waterpistol9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon11waterpistol9StateMainFv - .byte4 procAnim__Q53scn4step6weapon11waterpistol9StateMainFv - .byte4 procMove__Q53scn4step6weapon11waterpistol9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon11waterpistol9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon11waterpistol9StateMainFv + .4byte __dt__Q53scn4step6weapon11waterpistol9StateMainFv + .4byte procAnim__Q53scn4step6weapon11waterpistol9StateMainFv + .4byte procMove__Q53scn4step6weapon11waterpistol9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon11waterpistol9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon11waterpistol9StateMainFv .global __vt__Q53scn4step6weapon9swordbeam9StateMain __vt__Q53scn4step6weapon9swordbeam9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon9swordbeam9StateMainFv - .byte4 procAnim__Q53scn4step6weapon9swordbeam9StateMainFv - .byte4 procMove__Q53scn4step6weapon9swordbeam9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon9swordbeam9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon9swordbeam9StateMainFv + .4byte __dt__Q53scn4step6weapon9swordbeam9StateMainFv + .4byte procAnim__Q53scn4step6weapon9swordbeam9StateMainFv + .4byte procMove__Q53scn4step6weapon9swordbeam9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon9swordbeam9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon9swordbeam9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13whispyairball9StateMain __vt__Q53scn4step6weapon13whispyairball9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon13whispyairball9StateMainFv - .byte4 procAnim__Q53scn4step6weapon13whispyairball9StateMainFv - .byte4 procMove__Q53scn4step6weapon13whispyairball9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon13whispyairball9StateMainFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon13whispyairball9StateMainFv + .4byte procAnim__Q53scn4step6weapon13whispyairball9StateMainFv + .4byte procMove__Q53scn4step6weapon13whispyairball9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon13whispyairball9StateMainFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon7rollexp9StateMain __vt__Q53scn4step6weapon7rollexp9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon7rollexp9StateMainFv - .byte4 procAnim__Q53scn4step6weapon7rollexp9StateMainFv - .byte4 procMove__Q43scn4step6weapon9StateBaseFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q43scn4step6weapon9StateBaseFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon7rollexp9StateMainFv + .4byte procAnim__Q53scn4step6weapon7rollexp9StateMainFv + .4byte procMove__Q43scn4step6weapon9StateBaseFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q43scn4step6weapon9StateBaseFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12leafanpollen9StateMain __vt__Q53scn4step6weapon12leafanpollen9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon12leafanpollen9StateMainFv - .byte4 procAnim__Q53scn4step6weapon12leafanpollen9StateMainFv - .byte4 procMove__Q53scn4step6weapon12leafanpollen9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon12leafanpollen9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon12leafanpollen9StateMainFv + .4byte __dt__Q53scn4step6weapon12leafanpollen9StateMainFv + .4byte procAnim__Q53scn4step6weapon12leafanpollen9StateMainFv + .4byte procMove__Q53scn4step6weapon12leafanpollen9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon12leafanpollen9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon12leafanpollen9StateMainFv .global __vt__Q53scn4step6weapon16kingsdoowaveshot9StateMain __vt__Q53scn4step6weapon16kingsdoowaveshot9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon16kingsdoowaveshot9StateMainFv - .byte4 procAnim__Q53scn4step6weapon16kingsdoowaveshot9StateMainFv - .byte4 procMove__Q53scn4step6weapon16kingsdoowaveshot9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon16kingsdoowaveshot9StateMainFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon16kingsdoowaveshot9StateMainFv + .4byte procAnim__Q53scn4step6weapon16kingsdoowaveshot9StateMainFv + .4byte procMove__Q53scn4step6weapon16kingsdoowaveshot9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon16kingsdoowaveshot9StateMainFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .global __vt__Q53scn4step6weapon14gigantedgeshot9StateMain __vt__Q53scn4step6weapon14gigantedgeshot9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon14gigantedgeshot9StateMainFv - .byte4 procAnim__Q53scn4step6weapon14gigantedgeshot9StateMainFv - .byte4 procMove__Q53scn4step6weapon14gigantedgeshot9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon14gigantedgeshot9StateMainFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon14gigantedgeshot9StateMainFv + .4byte procAnim__Q53scn4step6weapon14gigantedgeshot9StateMainFv + .4byte procMove__Q53scn4step6weapon14gigantedgeshot9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon14gigantedgeshot9StateMainFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13gigatzobullet9StateMain __vt__Q53scn4step6weapon13gigatzobullet9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon13gigatzobullet9StateMainFv - .byte4 procAnim__Q53scn4step6weapon13gigatzobullet9StateMainFv - .byte4 procMove__Q53scn4step6weapon13gigatzobullet9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon13gigatzobullet9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon13gigatzobullet9StateMainFv + .4byte __dt__Q53scn4step6weapon13gigatzobullet9StateMainFv + .4byte procAnim__Q53scn4step6weapon13gigatzobullet9StateMainFv + .4byte procMove__Q53scn4step6weapon13gigatzobullet9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon13gigatzobullet9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon13gigatzobullet9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10comothread9StateMain __vt__Q53scn4step6weapon10comothread9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon10comothread9StateMainFv - .byte4 procAnim__Q53scn4step6weapon10comothread9StateMainFv - .byte4 procMove__Q53scn4step6weapon10comothread9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon10comothread9StateMainFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon10comothread9StateMainFv + .4byte procAnim__Q53scn4step6weapon10comothread9StateMainFv + .4byte procMove__Q53scn4step6weapon10comothread9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon10comothread9StateMainFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .global __vt__Q53scn4step6weapon18watergalboroswater9StateMain __vt__Q53scn4step6weapon18watergalboroswater9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon18watergalboroswater9StateMainFv - .byte4 procAnim__Q53scn4step6weapon18watergalboroswater9StateMainFv - .byte4 procMove__Q53scn4step6weapon18watergalboroswater9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon18watergalboroswater9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon18watergalboroswater9StateMainFv + .4byte __dt__Q53scn4step6weapon18watergalboroswater9StateMainFv + .4byte procAnim__Q53scn4step6weapon18watergalboroswater9StateMainFv + .4byte procMove__Q53scn4step6weapon18watergalboroswater9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon18watergalboroswater9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon18watergalboroswater9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon16enemywaterbullet9StateMain __vt__Q53scn4step6weapon16enemywaterbullet9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon16enemywaterbullet9StateMainFv - .byte4 procAnim__Q53scn4step6weapon16enemywaterbullet9StateMainFv - .byte4 procMove__Q53scn4step6weapon16enemywaterbullet9StateMainFv - .byte4 procConstraint__Q53scn4step6weapon16enemywaterbullet9StateMainFv - .byte4 procFixPos__Q53scn4step6weapon16enemywaterbullet9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon16enemywaterbullet9StateMainFv + .4byte __dt__Q53scn4step6weapon16enemywaterbullet9StateMainFv + .4byte procAnim__Q53scn4step6weapon16enemywaterbullet9StateMainFv + .4byte procMove__Q53scn4step6weapon16enemywaterbullet9StateMainFv + .4byte procConstraint__Q53scn4step6weapon16enemywaterbullet9StateMainFv + .4byte procFixPos__Q53scn4step6weapon16enemywaterbullet9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon16enemywaterbullet9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon20enemywaterbulletwarp9StateMain __vt__Q53scn4step6weapon20enemywaterbulletwarp9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon20enemywaterbulletwarp9StateMainFv - .byte4 procAnim__Q43scn4step6weapon9StateBaseFv - .byte4 procMove__Q43scn4step6weapon9StateBaseFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q43scn4step6weapon9StateBaseFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon20enemywaterbulletwarp9StateMainFv + .4byte procAnim__Q43scn4step6weapon9StateBaseFv + .4byte procMove__Q43scn4step6weapon9StateBaseFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q43scn4step6weapon9StateBaseFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .global __vt__Q53scn4step6weapon15cutterfinalwave9StateMain __vt__Q53scn4step6weapon15cutterfinalwave9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon15cutterfinalwave9StateMainFv - .byte4 procAnim__Q53scn4step6weapon15cutterfinalwave9StateMainFv - .byte4 procMove__Q53scn4step6weapon15cutterfinalwave9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon15cutterfinalwave9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon15cutterfinalwave9StateMainFv + .4byte __dt__Q53scn4step6weapon15cutterfinalwave9StateMainFv + .4byte procAnim__Q53scn4step6weapon15cutterfinalwave9StateMainFv + .4byte procMove__Q53scn4step6weapon15cutterfinalwave9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon15cutterfinalwave9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon15cutterfinalwave9StateMainFv .global __vt__Q53scn4step6weapon12sparkshotlv19StateMain __vt__Q53scn4step6weapon12sparkshotlv19StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon12sparkshotlv19StateMainFv - .byte4 procAnim__Q53scn4step6weapon12sparkshotlv19StateMainFv - .byte4 procMove__Q53scn4step6weapon12sparkshotlv19StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon12sparkshotlv19StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon12sparkshotlv19StateMainFv + .4byte __dt__Q53scn4step6weapon12sparkshotlv19StateMainFv + .4byte procAnim__Q53scn4step6weapon12sparkshotlv19StateMainFv + .4byte procMove__Q53scn4step6weapon12sparkshotlv19StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon12sparkshotlv19StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon12sparkshotlv19StateMainFv .global __vt__Q53scn4step6weapon12sparkshotlv29StateMain __vt__Q53scn4step6weapon12sparkshotlv29StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon12sparkshotlv29StateMainFv - .byte4 procAnim__Q53scn4step6weapon12sparkshotlv29StateMainFv - .byte4 procMove__Q53scn4step6weapon12sparkshotlv29StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon12sparkshotlv29StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon12sparkshotlv29StateMainFv + .4byte __dt__Q53scn4step6weapon12sparkshotlv29StateMainFv + .4byte procAnim__Q53scn4step6weapon12sparkshotlv29StateMainFv + .4byte procMove__Q53scn4step6weapon12sparkshotlv29StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon12sparkshotlv29StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon12sparkshotlv29StateMainFv .global __vt__Q53scn4step6weapon12sparkshotlv39StateMain __vt__Q53scn4step6weapon12sparkshotlv39StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon12sparkshotlv39StateMainFv - .byte4 procAnim__Q53scn4step6weapon12sparkshotlv39StateMainFv - .byte4 procMove__Q53scn4step6weapon12sparkshotlv39StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon12sparkshotlv39StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon12sparkshotlv39StateMainFv + .4byte __dt__Q53scn4step6weapon12sparkshotlv39StateMainFv + .4byte procAnim__Q53scn4step6weapon12sparkshotlv39StateMainFv + .4byte procMove__Q53scn4step6weapon12sparkshotlv39StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon12sparkshotlv39StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon12sparkshotlv39StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1 __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv - .byte4 create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .4byte __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .4byte create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv .global __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1 __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv - .byte4 create__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .4byte __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .4byte create__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv .global __vt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1 __vt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv - .byte4 create__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .4byte __dt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .4byte create__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv .global __vt__Q53scn4step6weapon10spearspear9StateMain __vt__Q53scn4step6weapon10spearspear9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon10spearspear9StateMainFv - .byte4 procAnim__Q53scn4step6weapon10spearspear9StateMainFv - .byte4 procMove__Q53scn4step6weapon10spearspear9StateMainFv - .byte4 procConstraint__Q53scn4step6weapon10spearspear9StateMainFv - .byte4 procFixPos__Q53scn4step6weapon10spearspear9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon10spearspear9StateMainFv + .4byte __dt__Q53scn4step6weapon10spearspear9StateMainFv + .4byte procAnim__Q53scn4step6weapon10spearspear9StateMainFv + .4byte procMove__Q53scn4step6weapon10spearspear9StateMainFv + .4byte procConstraint__Q53scn4step6weapon10spearspear9StateMainFv + .4byte procFixPos__Q53scn4step6weapon10spearspear9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon10spearspear9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon12hammerhammer9StateMain __vt__Q53scn4step6weapon12hammerhammer9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon12hammerhammer9StateMainFv - .byte4 procAnim__Q53scn4step6weapon12hammerhammer9StateMainFv - .byte4 procMove__Q53scn4step6weapon12hammerhammer9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon12hammerhammer9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon12hammerhammer9StateMainFv + .4byte __dt__Q53scn4step6weapon12hammerhammer9StateMainFv + .4byte procAnim__Q53scn4step6weapon12hammerhammer9StateMainFv + .4byte procMove__Q53scn4step6weapon12hammerhammer9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon12hammerhammer9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon12hammerhammer9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8wingshot9StateMain __vt__Q53scn4step6weapon8wingshot9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon8wingshot9StateMainFv - .byte4 procAnim__Q53scn4step6weapon8wingshot9StateMainFv - .byte4 procMove__Q53scn4step6weapon8wingshot9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon8wingshot9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon8wingshot9StateMainFv + .4byte __dt__Q53scn4step6weapon8wingshot9StateMainFv + .4byte procAnim__Q53scn4step6weapon8wingshot9StateMainFv + .4byte procMove__Q53scn4step6weapon8wingshot9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon8wingshot9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon8wingshot9StateMainFv .global __vt__Q53scn4step6weapon13wingshockwave9StateMain __vt__Q53scn4step6weapon13wingshockwave9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon13wingshockwave9StateMainFv - .byte4 procAnim__Q53scn4step6weapon13wingshockwave9StateMainFv - .byte4 procMove__Q53scn4step6weapon13wingshockwave9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon13wingshockwave9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon13wingshockwave9StateMainFv + .4byte __dt__Q53scn4step6weapon13wingshockwave9StateMainFv + .4byte procAnim__Q53scn4step6weapon13wingshockwave9StateMainFv + .4byte procMove__Q53scn4step6weapon13wingshockwave9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon13wingshockwave9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon13wingshockwave9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon16fightersmashshot9StateMain __vt__Q53scn4step6weapon16fightersmashshot9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon16fightersmashshot9StateMainFv - .byte4 procAnim__Q53scn4step6weapon16fightersmashshot9StateMainFv - .byte4 procMove__Q53scn4step6weapon16fightersmashshot9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon16fightersmashshot9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon16fightersmashshot9StateMainFv + .4byte __dt__Q53scn4step6weapon16fightersmashshot9StateMainFv + .4byte procAnim__Q53scn4step6weapon16fightersmashshot9StateMainFv + .4byte procMove__Q53scn4step6weapon16fightersmashshot9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon16fightersmashshot9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon16fightersmashshot9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon15fighterkickshot9StateMain __vt__Q53scn4step6weapon15fighterkickshot9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon15fighterkickshot9StateMainFv - .byte4 procAnim__Q53scn4step6weapon15fighterkickshot9StateMainFv - .byte4 procMove__Q53scn4step6weapon15fighterkickshot9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon15fighterkickshot9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon15fighterkickshot9StateMainFv + .4byte __dt__Q53scn4step6weapon15fighterkickshot9StateMainFv + .4byte procAnim__Q53scn4step6weapon15fighterkickshot9StateMainFv + .4byte procMove__Q53scn4step6weapon15fighterkickshot9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon15fighterkickshot9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon15fighterkickshot9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1 __vt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1Fv - .byte4 create__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1Fv + .4byte __dt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1Fv + .4byte create__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1Fv .global __vt__Q53scn4step6weapon16fighterhadoushot9StateMain __vt__Q53scn4step6weapon16fighterhadoushot9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon16fighterhadoushot9StateMainFv - .byte4 procAnim__Q53scn4step6weapon16fighterhadoushot9StateMainFv - .byte4 procMove__Q53scn4step6weapon16fighterhadoushot9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon16fighterhadoushot9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon16fighterhadoushot9StateMainFv + .4byte __dt__Q53scn4step6weapon16fighterhadoushot9StateMainFv + .4byte procAnim__Q53scn4step6weapon16fighterhadoushot9StateMainFv + .4byte procMove__Q53scn4step6weapon16fighterhadoushot9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon16fighterhadoushot9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon16fighterhadoushot9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12shotzobullet9StateMain __vt__Q53scn4step6weapon12shotzobullet9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon12shotzobullet9StateMainFv - .byte4 procAnim__Q53scn4step6weapon12shotzobullet9StateMainFv - .byte4 procMove__Q53scn4step6weapon12shotzobullet9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q43scn4step6weapon9StateBaseFv - .byte4 procObjCollReact__Q53scn4step6weapon12shotzobullet9StateMainFv + .4byte __dt__Q53scn4step6weapon12shotzobullet9StateMainFv + .4byte procAnim__Q53scn4step6weapon12shotzobullet9StateMainFv + .4byte procMove__Q53scn4step6weapon12shotzobullet9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q43scn4step6weapon9StateBaseFv + .4byte procObjCollReact__Q53scn4step6weapon12shotzobullet9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon15sirkibblecutter9StateMain __vt__Q53scn4step6weapon15sirkibblecutter9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon15sirkibblecutter9StateMainFv - .byte4 procAnim__Q53scn4step6weapon15sirkibblecutter9StateMainFv - .byte4 procMove__Q53scn4step6weapon15sirkibblecutter9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon15sirkibblecutter9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon15sirkibblecutter9StateMainFv + .4byte __dt__Q53scn4step6weapon15sirkibblecutter9StateMainFv + .4byte procAnim__Q53scn4step6weapon15sirkibblecutter9StateMainFv + .4byte procMove__Q53scn4step6weapon15sirkibblecutter9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon15sirkibblecutter9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon15sirkibblecutter9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13owgulffeather9StateMain __vt__Q53scn4step6weapon13owgulffeather9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon13owgulffeather9StateMainFv - .byte4 procAnim__Q53scn4step6weapon13owgulffeather9StateMainFv - .byte4 procMove__Q53scn4step6weapon13owgulffeather9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q43scn4step6weapon9StateBaseFv - .byte4 procObjCollReact__Q53scn4step6weapon13owgulffeather9StateMainFv + .4byte __dt__Q53scn4step6weapon13owgulffeather9StateMainFv + .4byte procAnim__Q53scn4step6weapon13owgulffeather9StateMainFv + .4byte procMove__Q53scn4step6weapon13owgulffeather9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q43scn4step6weapon9StateBaseFv + .4byte procObjCollReact__Q53scn4step6weapon13owgulffeather9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon9foleyleaf9StateMain __vt__Q53scn4step6weapon9foleyleaf9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon9foleyleaf9StateMainFv - .byte4 procAnim__Q43scn4step6weapon9StateBaseFv - .byte4 procMove__Q53scn4step6weapon9foleyleaf9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon9foleyleaf9StateMainFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon9foleyleaf9StateMainFv + .4byte procAnim__Q43scn4step6weapon9StateBaseFv + .4byte procMove__Q53scn4step6weapon9foleyleaf9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon9foleyleaf9StateMainFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10bowbyarrow9StateMain __vt__Q53scn4step6weapon10bowbyarrow9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon10bowbyarrow9StateMainFv - .byte4 procAnim__Q53scn4step6weapon10bowbyarrow9StateMainFv - .byte4 procMove__Q53scn4step6weapon10bowbyarrow9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon10bowbyarrow9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon10bowbyarrow9StateMainFv + .4byte __dt__Q53scn4step6weapon10bowbyarrow9StateMainFv + .4byte procAnim__Q53scn4step6weapon10bowbyarrow9StateMainFv + .4byte procMove__Q53scn4step6weapon10bowbyarrow9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon10bowbyarrow9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon10bowbyarrow9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12jucklecutter9StateMain __vt__Q53scn4step6weapon12jucklecutter9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon12jucklecutter9StateMainFv - .byte4 procAnim__Q53scn4step6weapon12jucklecutter9StateMainFv - .byte4 procMove__Q53scn4step6weapon12jucklecutter9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon12jucklecutter9StateMainFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon12jucklecutter9StateMainFv + .4byte procAnim__Q53scn4step6weapon12jucklecutter9StateMainFv + .4byte procMove__Q53scn4step6weapon12jucklecutter9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon12jucklecutter9StateMainFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon17tsukikageshuriken9StateMain __vt__Q53scn4step6weapon17tsukikageshuriken9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon17tsukikageshuriken9StateMainFv - .byte4 procAnim__Q43scn4step6weapon9StateBaseFv - .byte4 procMove__Q53scn4step6weapon17tsukikageshuriken9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon17tsukikageshuriken9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon17tsukikageshuriken9StateMainFv + .4byte __dt__Q53scn4step6weapon17tsukikageshuriken9StateMainFv + .4byte procAnim__Q43scn4step6weapon9StateBaseFv + .4byte procMove__Q53scn4step6weapon17tsukikageshuriken9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon17tsukikageshuriken9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon17tsukikageshuriken9StateMainFv .global __vt__Q53scn4step6weapon15knucklejoehadou9StateMain __vt__Q53scn4step6weapon15knucklejoehadou9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon15knucklejoehadou9StateMainFv - .byte4 procAnim__Q53scn4step6weapon15knucklejoehadou9StateMainFv - .byte4 procMove__Q53scn4step6weapon15knucklejoehadou9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon15knucklejoehadou9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon15knucklejoehadou9StateMainFv + .4byte __dt__Q53scn4step6weapon15knucklejoehadou9StateMainFv + .4byte procAnim__Q53scn4step6weapon15knucklejoehadou9StateMainFv + .4byte procMove__Q53scn4step6weapon15knucklejoehadou9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon15knucklejoehadou9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon15knucklejoehadou9StateMainFv .global __vt__Q53scn4step6weapon9snowlball9StateMain __vt__Q53scn4step6weapon9snowlball9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon9snowlball9StateMainFv - .byte4 procAnim__Q43scn4step6weapon9StateBaseFv - .byte4 procMove__Q53scn4step6weapon9snowlball9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon9snowlball9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon9snowlball9StateMainFv + .4byte __dt__Q53scn4step6weapon9snowlball9StateMainFv + .4byte procAnim__Q43scn4step6weapon9StateBaseFv + .4byte procMove__Q53scn4step6weapon9snowlball9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon9snowlball9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon9snowlball9StateMainFv .global __vt__Q53scn4step6weapon10floweffect9StateMain __vt__Q53scn4step6weapon10floweffect9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon10floweffect9StateMainFv - .byte4 procAnim__Q53scn4step6weapon10floweffect9StateMainFv - .byte4 procMove__Q53scn4step6weapon10floweffect9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon10floweffect9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon10floweffect9StateMainFv + .4byte __dt__Q53scn4step6weapon10floweffect9StateMainFv + .4byte procAnim__Q53scn4step6weapon10floweffect9StateMainFv + .4byte procMove__Q53scn4step6weapon10floweffect9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon10floweffect9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon10floweffect9StateMainFv .global __vt__Q53scn4step6weapon13whispytornado9StateMain __vt__Q53scn4step6weapon13whispytornado9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon13whispytornado9StateMainFv - .byte4 procAnim__Q53scn4step6weapon13whispytornado9StateMainFv - .byte4 procMove__Q53scn4step6weapon13whispytornado9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon13whispytornado9StateMainFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon13whispytornado9StateMainFv + .4byte procAnim__Q53scn4step6weapon13whispytornado9StateMainFv + .4byte procMove__Q53scn4step6weapon13whispytornado9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon13whispytornado9StateMainFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10whispyroot9StateMain __vt__Q53scn4step6weapon10whispyroot9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon10whispyroot9StateMainFv - .byte4 procAnim__Q53scn4step6weapon10whispyroot9StateMainFv - .byte4 procMove__Q53scn4step6weapon10whispyroot9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon10whispyroot9StateMainFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon10whispyroot9StateMainFv + .4byte procAnim__Q53scn4step6weapon10whispyroot9StateMainFv + .4byte procMove__Q53scn4step6weapon10whispyroot9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon10whispyroot9StateMainFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon18combinationairball9StateMain __vt__Q53scn4step6weapon18combinationairball9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon18combinationairball9StateMainFv - .byte4 procAnim__Q53scn4step6weapon18combinationairball9StateMainFv - .byte4 procMove__Q53scn4step6weapon18combinationairball9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon18combinationairball9StateMainFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon18combinationairball9StateMainFv + .4byte procAnim__Q53scn4step6weapon18combinationairball9StateMainFv + .4byte procMove__Q53scn4step6weapon18combinationairball9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon18combinationairball9StateMainFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .global __vt__Q53scn4step6weapon19combinationmetabeam9StateMain __vt__Q53scn4step6weapon19combinationmetabeam9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon19combinationmetabeam9StateMainFv - .byte4 procAnim__Q53scn4step6weapon19combinationmetabeam9StateMainFv - .byte4 procMove__Q53scn4step6weapon19combinationmetabeam9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon19combinationmetabeam9StateMainFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon19combinationmetabeam9StateMainFv + .4byte procAnim__Q53scn4step6weapon19combinationmetabeam9StateMainFv + .4byte procMove__Q53scn4step6weapon19combinationmetabeam9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon19combinationmetabeam9StateMainFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon23combinationdededebomber9StateMain __vt__Q53scn4step6weapon23combinationdededebomber9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon23combinationdededebomber9StateMainFv - .byte4 procAnim__Q53scn4step6weapon23combinationdededebomber9StateMainFv - .byte4 procMove__Q53scn4step6weapon23combinationdededebomber9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon23combinationdededebomber9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon23combinationdededebomber9StateMainFv + .4byte __dt__Q53scn4step6weapon23combinationdededebomber9StateMainFv + .4byte procAnim__Q53scn4step6weapon23combinationdededebomber9StateMainFv + .4byte procMove__Q53scn4step6weapon23combinationdededebomber9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon23combinationdededebomber9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon23combinationdededebomber9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon18combinationdeeshot9StateMain __vt__Q53scn4step6weapon18combinationdeeshot9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon18combinationdeeshot9StateMainFv - .byte4 procAnim__Q53scn4step6weapon18combinationdeeshot9StateMainFv - .byte4 procMove__Q53scn4step6weapon18combinationdeeshot9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon18combinationdeeshot9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon18combinationdeeshot9StateMainFv + .4byte __dt__Q53scn4step6weapon18combinationdeeshot9StateMainFv + .4byte procAnim__Q53scn4step6weapon18combinationdeeshot9StateMainFv + .4byte procMove__Q53scn4step6weapon18combinationdeeshot9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon18combinationdeeshot9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon18combinationdeeshot9StateMainFv .global __vt__Q53scn4step6weapon8metabeam9StateMain __vt__Q53scn4step6weapon8metabeam9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon8metabeam9StateMainFv - .byte4 procAnim__Q53scn4step6weapon8metabeam9StateMainFv - .byte4 procMove__Q53scn4step6weapon8metabeam9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon8metabeam9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon8metabeam9StateMainFv + .4byte __dt__Q53scn4step6weapon8metabeam9StateMainFv + .4byte procAnim__Q53scn4step6weapon8metabeam9StateMainFv + .4byte procMove__Q53scn4step6weapon8metabeam9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon8metabeam9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon8metabeam9StateMainFv .global __vt__Q53scn4step6weapon13metashockwave9StateMain __vt__Q53scn4step6weapon13metashockwave9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon13metashockwave9StateMainFv - .byte4 procAnim__Q53scn4step6weapon13metashockwave9StateMainFv - .byte4 procMove__Q53scn4step6weapon13metashockwave9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon13metashockwave9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon13metashockwave9StateMainFv + .4byte __dt__Q53scn4step6weapon13metashockwave9StateMainFv + .4byte procAnim__Q53scn4step6weapon13metashockwave9StateMainFv + .4byte procMove__Q53scn4step6weapon13metashockwave9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon13metashockwave9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon13metashockwave9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon12dededehammer9StateMain __vt__Q53scn4step6weapon12dededehammer9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon12dededehammer9StateMainFv - .byte4 procAnim__Q53scn4step6weapon12dededehammer9StateMainFv - .byte4 procMove__Q53scn4step6weapon12dededehammer9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon12dededehammer9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon12dededehammer9StateMainFv + .4byte __dt__Q53scn4step6weapon12dededehammer9StateMainFv + .4byte procAnim__Q53scn4step6weapon12dededehammer9StateMainFv + .4byte procMove__Q53scn4step6weapon12dededehammer9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon12dededehammer9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon12dededehammer9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1 __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv - .byte4 create__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .4byte __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .4byte create__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv .global __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1 __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv - .byte4 create__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .4byte __dt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .4byte create__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv .global __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1 __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv - .byte4 create__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .4byte __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .4byte create__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv .global __vt__Q53scn4step6weapon8deespear9StateMain __vt__Q53scn4step6weapon8deespear9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon8deespear9StateMainFv - .byte4 procAnim__Q53scn4step6weapon8deespear9StateMainFv - .byte4 procMove__Q53scn4step6weapon8deespear9StateMainFv - .byte4 procConstraint__Q53scn4step6weapon8deespear9StateMainFv - .byte4 procFixPos__Q53scn4step6weapon8deespear9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon8deespear9StateMainFv + .4byte __dt__Q53scn4step6weapon8deespear9StateMainFv + .4byte procAnim__Q53scn4step6weapon8deespear9StateMainFv + .4byte procMove__Q53scn4step6weapon8deespear9StateMainFv + .4byte procConstraint__Q53scn4step6weapon8deespear9StateMainFv + .4byte procFixPos__Q53scn4step6weapon8deespear9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon8deespear9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13vacuumedblock9StateMain __vt__Q53scn4step6weapon13vacuumedblock9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon13vacuumedblock9StateMainFv - .byte4 procAnim__Q53scn4step6weapon13vacuumedblock9StateMainFv - .byte4 procMove__Q53scn4step6weapon13vacuumedblock9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon13vacuumedblock9StateMainFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon13vacuumedblock9StateMainFv + .4byte procAnim__Q53scn4step6weapon13vacuumedblock9StateMainFv + .4byte procMove__Q53scn4step6weapon13vacuumedblock9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon13vacuumedblock9StateMainFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon11hotheadfire9StateMain __vt__Q53scn4step6weapon11hotheadfire9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon11hotheadfire9StateMainFv - .byte4 procAnim__Q43scn4step6weapon9StateBaseFv - .byte4 procMove__Q53scn4step6weapon11hotheadfire9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon11hotheadfire9StateMainFv - .byte4 procObjCollReact__Q53scn4step6weapon11hotheadfire9StateMainFv + .4byte __dt__Q53scn4step6weapon11hotheadfire9StateMainFv + .4byte procAnim__Q43scn4step6weapon9StateBaseFv + .4byte procMove__Q53scn4step6weapon11hotheadfire9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon11hotheadfire9StateMainFv + .4byte procObjCollReact__Q53scn4step6weapon11hotheadfire9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon26challengemastersummonlight9StateMain __vt__Q53scn4step6weapon26challengemastersummonlight9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon26challengemastersummonlight9StateMainFv - .byte4 procAnim__Q53scn4step6weapon26challengemastersummonlight9StateMainFv - .byte4 procMove__Q53scn4step6weapon26challengemastersummonlight9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon26challengemastersummonlight9StateMainFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon26challengemastersummonlight9StateMainFv + .4byte procAnim__Q53scn4step6weapon26challengemastersummonlight9StateMainFv + .4byte procMove__Q53scn4step6weapon26challengemastersummonlight9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon26challengemastersummonlight9StateMainFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon19challengemastershot9StateMain __vt__Q53scn4step6weapon19challengemastershot9StateMain: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon19challengemastershot9StateMainFv - .byte4 procAnim__Q53scn4step6weapon19challengemastershot9StateMainFv - .byte4 procMove__Q53scn4step6weapon19challengemastershot9StateMainFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon19challengemastershot9StateMainFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon19challengemastershot9StateMainFv + .4byte procAnim__Q53scn4step6weapon19challengemastershot9StateMainFv + .4byte procMove__Q53scn4step6weapon19challengemastershot9StateMainFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon19challengemastershot9StateMainFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256519 diff --git a/asm/src/StateMasterSummon.s b/asm/src/StateMasterSummon.s index bceaad92..bbd5d968 100644 --- a/asm/src/StateMasterSummon.s +++ b/asm/src/StateMasterSummon.s @@ -564,12 +564,12 @@ lbl_8029343C: __vt__Q53scn4step5enemy6common17StateMasterSummon: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common17StateMasterSummonFv - .byte4 procAnim__Q53scn4step5enemy6common17StateMasterSummonFv - .byte4 procMove__Q53scn4step5enemy6common17StateMasterSummonFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common17StateMasterSummonFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common17StateMasterSummonFv + .4byte procAnim__Q53scn4step5enemy6common17StateMasterSummonFv + .4byte procMove__Q53scn4step5enemy6common17StateMasterSummonFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common17StateMasterSummonFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257050 diff --git a/asm/src/StateMasterSummonWait.s b/asm/src/StateMasterSummonWait.s index 10c480c3..ebe2df62 100644 --- a/asm/src/StateMasterSummonWait.s +++ b/asm/src/StateMasterSummonWait.s @@ -323,9 +323,9 @@ lbl_8029389C: __vt__Q53scn4step5enemy6common21StateMasterSummonWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common21StateMasterSummonWaitFv - .byte4 procAnim__Q53scn4step5enemy6common21StateMasterSummonWaitFv - .byte4 procMove__Q53scn4step5enemy6common21StateMasterSummonWaitFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common21StateMasterSummonWaitFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common21StateMasterSummonWaitFv + .4byte procAnim__Q53scn4step5enemy6common21StateMasterSummonWaitFv + .4byte procMove__Q53scn4step5enemy6common21StateMasterSummonWaitFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common21StateMasterSummonWaitFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateMix.s b/asm/src/StateMix.s index be257ac0..7139aedf 100644 --- a/asm/src/StateMix.s +++ b/asm/src/StateMix.s @@ -572,11 +572,11 @@ lbl_803670E0: __vt__Q53scn4step4hero6common8StateMix: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common8StateMixFv - .byte4 procAnim__Q53scn4step4hero6common8StateMixFv - .byte4 procMove__Q53scn4step4hero6common8StateMixFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common8StateMixFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common8StateMixFv + .4byte procAnim__Q53scn4step4hero6common8StateMixFv + .4byte procMove__Q53scn4step4hero6common8StateMixFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common8StateMixFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateMixPre.s b/asm/src/StateMixPre.s index 54f71449..578f89ec 100644 --- a/asm/src/StateMixPre.s +++ b/asm/src/StateMixPre.s @@ -174,17 +174,17 @@ __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common8Stat __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common8StateMix$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common8StateMix$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv - .byte4 create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common8StateMix$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv + .4byte __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common8StateMix$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv + .4byte create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common8StateMix$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv .global __vt__Q53scn4step4hero6common11StateMixPre __vt__Q53scn4step4hero6common11StateMixPre: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common11StateMixPreFv - .byte4 procAnim__Q53scn4step4hero6common11StateMixPreFv - .byte4 procMove__Q43scn4step4hero9StateBaseFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q43scn4step4hero9StateBaseFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common11StateMixPreFv + .4byte procAnim__Q53scn4step4hero6common11StateMixPreFv + .4byte procMove__Q43scn4step4hero9StateBaseFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q43scn4step4hero9StateBaseFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateMoonSault.s b/asm/src/StateMoonSault.s index 7644ed46..b142a070 100644 --- a/asm/src/StateMoonSault.s +++ b/asm/src/StateMoonSault.s @@ -204,11 +204,11 @@ procFixPos__Q53scn4step4hero7fighter14StateMoonSaultFv: __vt__Q53scn4step4hero7fighter14StateMoonSault: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter14StateMoonSaultFv - .byte4 procAnim__Q53scn4step4hero7fighter14StateMoonSaultFv - .byte4 procMove__Q53scn4step4hero7fighter14StateMoonSaultFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter14StateMoonSaultFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter14StateMoonSaultFv + .4byte procAnim__Q53scn4step4hero7fighter14StateMoonSaultFv + .4byte procMove__Q53scn4step4hero7fighter14StateMoonSaultFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter14StateMoonSaultFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateMove.s b/asm/src/StateMove.s index 341425d9..1f093275 100644 --- a/asm/src/StateMove.s +++ b/asm/src/StateMove.s @@ -7540,48 +7540,48 @@ lbl_802E9CA4: __vt__Q53scn4step5enemy7blipper9StateMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7blipper9StateMoveFv - .byte4 procAnim__Q53scn4step5enemy7blipper9StateMoveFv - .byte4 procMove__Q53scn4step5enemy7blipper9StateMoveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7blipper9StateMoveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7blipper9StateMoveFv + .4byte procAnim__Q53scn4step5enemy7blipper9StateMoveFv + .4byte procMove__Q53scn4step5enemy7blipper9StateMoveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7blipper9StateMoveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly9StateMove __vt__Q53scn4step5enemy6chilly9StateMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6chilly9StateMoveFv - .byte4 procAnim__Q53scn4step5enemy6chilly9StateMoveFv - .byte4 procMove__Q53scn4step5enemy6chilly9StateMoveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6chilly9StateMoveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6chilly9StateMoveFv + .4byte procAnim__Q53scn4step5enemy6chilly9StateMoveFv + .4byte procMove__Q53scn4step5enemy6chilly9StateMoveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6chilly9StateMoveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8dubiorjr9StateMove __vt__Q53scn4step5enemy8dubiorjr9StateMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8dubiorjr9StateMoveFv - .byte4 procAnim__Q53scn4step5enemy8dubiorjr9StateMoveFv - .byte4 procMove__Q53scn4step5enemy8dubiorjr9StateMoveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy8dubiorjr9StateMoveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8dubiorjr9StateMoveFv + .4byte procAnim__Q53scn4step5enemy8dubiorjr9StateMoveFv + .4byte procMove__Q53scn4step5enemy8dubiorjr9StateMoveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy8dubiorjr9StateMoveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4elec9StateMove __vt__Q53scn4step5enemy4elec9StateMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4elec9StateMoveFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy4elec9StateMoveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4elec9StateMoveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy4elec9StateMoveFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy4elec9StateMoveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4elec9StateMoveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .4byte 0 .4byte 0 @@ -7590,12 +7590,12 @@ __vt__Q53scn4step5enemy4elec9StateMove: __vt__Q53scn4step5enemy6flamer9StateMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6flamer9StateMoveFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy6flamer9StateMoveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6flamer9StateMoveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6flamer9StateMoveFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy6flamer9StateMoveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6flamer9StateMoveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .4byte 0 .4byte 0 @@ -7604,84 +7604,84 @@ __vt__Q53scn4step5enemy6flamer9StateMove: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5foley9StateMove __vt__Q53scn4step5enemy5foley9StateMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5foley9StateMoveFv - .byte4 procAnim__Q53scn4step5enemy5foley9StateMoveFv - .byte4 procMove__Q53scn4step5enemy5foley9StateMoveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5foley9StateMoveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5foley9StateMoveFv + .4byte procAnim__Q53scn4step5enemy5foley9StateMoveFv + .4byte procMove__Q53scn4step5enemy5foley9StateMoveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5foley9StateMoveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu9StateMove __vt__Q53scn4step5enemy4kabu9StateMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4kabu9StateMoveFv - .byte4 procAnim__Q53scn4step5enemy4kabu9StateMoveFv - .byte4 procMove__Q53scn4step5enemy4kabu9StateMoveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4kabu9StateMoveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy4kabu9StateMoveFv + .4byte procAnim__Q53scn4step5enemy4kabu9StateMoveFv + .4byte procMove__Q53scn4step5enemy4kabu9StateMoveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4kabu9StateMoveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10poppybrojr9StateMove __vt__Q53scn4step5enemy10poppybrojr9StateMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10poppybrojr9StateMoveFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy10poppybrojr9StateMoveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10poppybrojr9StateMoveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10poppybrojr9StateMoveFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy10poppybrojr9StateMoveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10poppybrojr9StateMoveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball11StateDamage$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball11StateDamage$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball11StateDamage$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball11StateDamage$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball11StateDamage$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball11StateDamage$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8rollball9StateMove __vt__Q53scn4step5enemy8rollball9StateMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8rollball9StateMoveFv - .byte4 procAnim__Q53scn4step5enemy8rollball9StateMoveFv - .byte4 procMove__Q53scn4step5enemy8rollball9StateMoveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy8rollball9StateMoveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8rollball9StateMoveFv + .4byte procAnim__Q53scn4step5enemy8rollball9StateMoveFv + .4byte procMove__Q53scn4step5enemy8rollball9StateMoveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy8rollball9StateMoveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8searches9StateMove __vt__Q53scn4step5enemy8searches9StateMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8searches9StateMoveFv - .byte4 procAnim__Q53scn4step5enemy8searches9StateMoveFv - .byte4 procMove__Q53scn4step5enemy8searches9StateMoveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy8searches9StateMoveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8searches9StateMoveFv + .4byte procAnim__Q53scn4step5enemy8searches9StateMoveFv + .4byte procMove__Q53scn4step5enemy8searches9StateMoveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy8searches9StateMoveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy3sun9StateMove __vt__Q53scn4step5enemy3sun9StateMove: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy3sun9StateMoveFv - .byte4 procAnim__Q53scn4step5enemy3sun9StateMoveFv - .byte4 procMove__Q53scn4step5enemy3sun9StateMoveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy3sun9StateMoveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy3sun9StateMoveFv + .4byte procAnim__Q53scn4step5enemy3sun9StateMoveFv + .4byte procMove__Q53scn4step5enemy3sun9StateMoveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy3sun9StateMoveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255763 diff --git a/asm/src/StateMoveAround.s b/asm/src/StateMoveAround.s index 46773bd8..1f43a978 100644 --- a/asm/src/StateMoveAround.s +++ b/asm/src/StateMoveAround.s @@ -301,12 +301,12 @@ turn__Q53scn4step5enemy4kabu15StateMoveAroundFv: __vt__Q53scn4step5enemy4kabu15StateMoveAround: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4kabu15StateMoveAroundFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy4kabu15StateMoveAroundFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4kabu15StateMoveAroundFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy4kabu15StateMoveAroundFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy4kabu15StateMoveAroundFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4kabu15StateMoveAroundFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256041 diff --git a/asm/src/StateMoveBack.s b/asm/src/StateMoveBack.s index 1bcf6bf7..b37a0ff7 100644 --- a/asm/src/StateMoveBack.s +++ b/asm/src/StateMoveBack.s @@ -85,9 +85,9 @@ procFixPos__Q53scn4step4boss6common13StateMoveBackFv: __vt__Q53scn4step4boss6common13StateMoveBack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common13StateMoveBackFv - .byte4 procAnim__Q53scn4step4boss6common13StateMoveBackFv - .byte4 procMove__Q53scn4step4boss6common13StateMoveBackFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common13StateMoveBackFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6common13StateMoveBackFv + .4byte procAnim__Q53scn4step4boss6common13StateMoveBackFv + .4byte procMove__Q53scn4step4boss6common13StateMoveBackFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common13StateMoveBackFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateMoveCircle.s b/asm/src/StateMoveCircle.s index 89d190e4..ef3967c0 100644 --- a/asm/src/StateMoveCircle.s +++ b/asm/src/StateMoveCircle.s @@ -241,12 +241,12 @@ __dt__Q53scn4step5enemy5gordo15StateMoveCircleFv: __vt__Q53scn4step5enemy5gordo15StateMoveCircle: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5gordo15StateMoveCircleFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy5gordo15StateMoveCircleFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5gordo15StateMoveCircleFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy5gordo15StateMoveCircleFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255034 diff --git a/asm/src/StateMoveForward.s b/asm/src/StateMoveForward.s index 5bffa9ef..bc3f5556 100644 --- a/asm/src/StateMoveForward.s +++ b/asm/src/StateMoveForward.s @@ -241,24 +241,24 @@ procFixPos__Q53scn4step4boss9moundeath16StateMoveForwardFv: __vt__Q53scn4step4boss6common16StateMoveForward: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common16StateMoveForwardFv - .byte4 procAnim__Q53scn4step4boss6common16StateMoveForwardFv - .byte4 procMove__Q53scn4step4boss6common16StateMoveForwardFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common16StateMoveForwardFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6common16StateMoveForwardFv + .4byte procAnim__Q53scn4step4boss6common16StateMoveForwardFv + .4byte procMove__Q53scn4step4boss6common16StateMoveForwardFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common16StateMoveForwardFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9moundeath16StateMoveForward __vt__Q53scn4step4boss9moundeath16StateMoveForward: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9moundeath16StateMoveForwardFv - .byte4 procAnim__Q53scn4step4boss9moundeath16StateMoveForwardFv - .byte4 procMove__Q53scn4step4boss9moundeath16StateMoveForwardFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9moundeath16StateMoveForwardFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9moundeath16StateMoveForwardFv + .4byte procAnim__Q53scn4step4boss9moundeath16StateMoveForwardFv + .4byte procMove__Q53scn4step4boss9moundeath16StateMoveForwardFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9moundeath16StateMoveForwardFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254872 diff --git a/asm/src/StateMoveJoint.s b/asm/src/StateMoveJoint.s index 39b7dd33..a4eec4e2 100644 --- a/asm/src/StateMoveJoint.s +++ b/asm/src/StateMoveJoint.s @@ -92,9 +92,9 @@ procFixPos__Q53scn4step4boss6common14StateMoveJointFv: __vt__Q53scn4step4boss6common14StateMoveJoint: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common14StateMoveJointFv - .byte4 procAnim__Q53scn4step4boss6common14StateMoveJointFv - .byte4 procMove__Q53scn4step4boss6common14StateMoveJointFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common14StateMoveJointFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6common14StateMoveJointFv + .4byte procAnim__Q53scn4step4boss6common14StateMoveJointFv + .4byte procMove__Q53scn4step4boss6common14StateMoveJointFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common14StateMoveJointFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateMoveSinCurve.s b/asm/src/StateMoveSinCurve.s index c77617a5..97d1a662 100644 --- a/asm/src/StateMoveSinCurve.s +++ b/asm/src/StateMoveSinCurve.s @@ -313,12 +313,12 @@ __dt__Q53scn4step5enemy5gordo17StateMoveSinCurveFv: __vt__Q53scn4step5enemy5gordo17StateMoveSinCurve: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5gordo17StateMoveSinCurveFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy5gordo17StateMoveSinCurveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5gordo17StateMoveSinCurveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5gordo17StateMoveSinCurveFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy5gordo17StateMoveSinCurveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5gordo17StateMoveSinCurveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255872 diff --git a/asm/src/StateMoveStraight.s b/asm/src/StateMoveStraight.s index f5712ee0..ce108c86 100644 --- a/asm/src/StateMoveStraight.s +++ b/asm/src/StateMoveStraight.s @@ -171,12 +171,12 @@ __dt__Q53scn4step5enemy5gordo17StateMoveStraightFv: __vt__Q53scn4step5enemy5gordo17StateMoveStraight: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5gordo17StateMoveStraightFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy5gordo17StateMoveStraightFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5gordo17StateMoveStraightFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5gordo17StateMoveStraightFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy5gordo17StateMoveStraightFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5gordo17StateMoveStraightFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255765 diff --git a/asm/src/StateMoveThunder.s b/asm/src/StateMoveThunder.s index 508bbf12..ebb9d14a 100644 --- a/asm/src/StateMoveThunder.s +++ b/asm/src/StateMoveThunder.s @@ -476,12 +476,12 @@ procFixPos__Q53scn4step4boss6dubior16StateMoveThunderFv: __vt__Q53scn4step4boss6dubior16StateMoveThunder: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6dubior16StateMoveThunderFv - .byte4 procAnim__Q53scn4step4boss6dubior16StateMoveThunderFv - .byte4 procMove__Q53scn4step4boss6dubior16StateMoveThunderFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6dubior16StateMoveThunderFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6dubior16StateMoveThunderFv + .4byte procAnim__Q53scn4step4boss6dubior16StateMoveThunderFv + .4byte procMove__Q53scn4step4boss6dubior16StateMoveThunderFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6dubior16StateMoveThunderFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257085 diff --git a/asm/src/StateMoveThunderStart.s b/asm/src/StateMoveThunderStart.s index d7426e20..9374edae 100644 --- a/asm/src/StateMoveThunderStart.s +++ b/asm/src/StateMoveThunderStart.s @@ -272,18 +272,18 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16Stat __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateMoveThunder$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateMoveThunder$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateMoveThunder$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateMoveThunder$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateMoveThunder$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6dubior21StateMoveThunderStart __vt__Q53scn4step4boss6dubior21StateMoveThunderStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6dubior21StateMoveThunderStartFv - .byte4 procAnim__Q53scn4step4boss6dubior21StateMoveThunderStartFv - .byte4 procMove__Q53scn4step4boss6dubior21StateMoveThunderStartFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6dubior21StateMoveThunderStartFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6dubior21StateMoveThunderStartFv + .4byte procAnim__Q53scn4step4boss6dubior21StateMoveThunderStartFv + .4byte procMove__Q53scn4step4boss6dubior21StateMoveThunderStartFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6dubior21StateMoveThunderStartFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256036 diff --git a/asm/src/StateMoveToOtherSide.s b/asm/src/StateMoveToOtherSide.s index dee56815..5701d4a3 100644 --- a/asm/src/StateMoveToOtherSide.s +++ b/asm/src/StateMoveToOtherSide.s @@ -426,12 +426,12 @@ WaitFrameTable__Q53scn4step4boss6dubior34$$2unnamed$$2StateMoveToOtherSide_cpp$$ __vt__Q53scn4step4boss6dubior20StateMoveToOtherSide: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6dubior20StateMoveToOtherSideFv - .byte4 procAnim__Q53scn4step4boss6dubior20StateMoveToOtherSideFv - .byte4 procMove__Q53scn4step4boss6dubior20StateMoveToOtherSideFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6dubior20StateMoveToOtherSideFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6dubior20StateMoveToOtherSideFv + .4byte procAnim__Q53scn4step4boss6dubior20StateMoveToOtherSideFv + .4byte procMove__Q53scn4step4boss6dubior20StateMoveToOtherSideFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6dubior20StateMoveToOtherSideFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256237 diff --git a/asm/src/StateNormal.s b/asm/src/StateNormal.s index dd94a098..04ad2fe8 100644 --- a/asm/src/StateNormal.s +++ b/asm/src/StateNormal.s @@ -104,12 +104,12 @@ lbl_803D8B34: __vt__Q43scn4step6weapon11StateNormal: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step6weapon11StateNormalFv - .byte4 procAnim__Q43scn4step6weapon11StateNormalFv - .byte4 procMove__Q43scn4step6weapon11StateNormalFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q43scn4step6weapon11StateNormalFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q43scn4step6weapon11StateNormalFv + .4byte procAnim__Q43scn4step6weapon11StateNormalFv + .4byte procMove__Q43scn4step6weapon11StateNormalFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q43scn4step6weapon11StateNormalFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256141 diff --git a/asm/src/StateNoseDive.s b/asm/src/StateNoseDive.s index 37e3c88a..06d6fb95 100644 --- a/asm/src/StateNoseDive.s +++ b/asm/src/StateNoseDive.s @@ -567,24 +567,24 @@ __dt__Q53scn4step5enemy10parasoldoo13StateNoseDiveFv: __vt__Q53scn4step5enemy10parasoldee13StateNoseDive: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10parasoldee13StateNoseDiveFv - .byte4 procAnim__Q53scn4step5enemy10parasoldee13StateNoseDiveFv - .byte4 procMove__Q53scn4step5enemy10parasoldee13StateNoseDiveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10parasoldee13StateNoseDiveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10parasoldee13StateNoseDiveFv + .4byte procAnim__Q53scn4step5enemy10parasoldee13StateNoseDiveFv + .4byte procMove__Q53scn4step5enemy10parasoldee13StateNoseDiveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10parasoldee13StateNoseDiveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo13StateNoseDive __vt__Q53scn4step5enemy10parasoldoo13StateNoseDive: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10parasoldoo13StateNoseDiveFv - .byte4 procAnim__Q53scn4step5enemy10parasoldoo13StateNoseDiveFv - .byte4 procMove__Q53scn4step5enemy10parasoldoo13StateNoseDiveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10parasoldoo13StateNoseDiveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10parasoldoo13StateNoseDiveFv + .4byte procAnim__Q53scn4step5enemy10parasoldoo13StateNoseDiveFv + .4byte procMove__Q53scn4step5enemy10parasoldoo13StateNoseDiveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10parasoldoo13StateNoseDiveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257074 diff --git a/asm/src/StatePanic.s b/asm/src/StatePanic.s index 09342b0d..aae28ede 100644 --- a/asm/src/StatePanic.s +++ b/asm/src/StatePanic.s @@ -255,15 +255,15 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StatePanic$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StatePanic$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StatePanic$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StatePanic$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StatePanic$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster10StatePanic __vt__Q53scn4step4boss15challengemaster10StatePanic: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster10StatePanicFv - .byte4 procAnim__Q53scn4step4boss15challengemaster10StatePanicFv - .byte4 procMove__Q53scn4step4boss15challengemaster10StatePanicFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster10StatePanicFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster10StatePanicFv + .4byte procAnim__Q53scn4step4boss15challengemaster10StatePanicFv + .4byte procMove__Q53scn4step4boss15challengemaster10StatePanicFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster10StatePanicFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateParasolCapture.s b/asm/src/StateParasolCapture.s index 37137c09..d23d4ed1 100644 --- a/asm/src/StateParasolCapture.s +++ b/asm/src/StateParasolCapture.s @@ -415,20 +415,20 @@ __sinit_$$3StateParasolCapture_cpp: /* 80392EFC 0038ED3C 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3StateParasolCapture_cpp + .4byte __sinit_$$3StateParasolCapture_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7parasol19StateParasolCapture __vt__Q53scn4step4hero7parasol19StateParasolCapture: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7parasol19StateParasolCaptureFv - .byte4 procAnim__Q53scn4step4hero7parasol19StateParasolCaptureFv - .byte4 procMove__Q53scn4step4hero7parasol19StateParasolCaptureFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7parasol19StateParasolCaptureFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7parasol19StateParasolCaptureFv + .4byte procAnim__Q53scn4step4hero7parasol19StateParasolCaptureFv + .4byte procMove__Q53scn4step4hero7parasol19StateParasolCaptureFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7parasol19StateParasolCaptureFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateParasolDive.s b/asm/src/StateParasolDive.s index 47c9a7ca..29097c17 100644 --- a/asm/src/StateParasolDive.s +++ b/asm/src/StateParasolDive.s @@ -417,25 +417,25 @@ __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25St __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolParachuteFall$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolParachuteFall$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolParachuteFall$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolParachuteFall$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolParachuteFall$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol16StateParasolDive$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol16StateParasolDive$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol16StateParasolDive$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol16StateParasolDive$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol16StateParasolDive$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol16StateParasolDive$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7parasol16StateParasolDive __vt__Q53scn4step4hero7parasol16StateParasolDive: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7parasol16StateParasolDiveFv - .byte4 procAnim__Q53scn4step4hero7parasol16StateParasolDiveFv - .byte4 procMove__Q53scn4step4hero7parasol16StateParasolDiveFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7parasol16StateParasolDiveFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7parasol16StateParasolDiveFv + .4byte procAnim__Q53scn4step4hero7parasol16StateParasolDiveFv + .4byte procMove__Q53scn4step4hero7parasol16StateParasolDiveFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7parasol16StateParasolDiveFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateParasolDrill.s b/asm/src/StateParasolDrill.s index 588150fa..4ff1f8d8 100644 --- a/asm/src/StateParasolDrill.s +++ b/asm/src/StateParasolDrill.s @@ -416,25 +416,25 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol20St __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol20StateParasolDrillEnd$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol20StateParasolDrillEnd$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol20StateParasolDrillEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol20StateParasolDrillEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol20StateParasolDrillEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolDrill$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolDrill$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolDrill$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolDrill$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolDrill$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolDrill$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7parasol17StateParasolDrill __vt__Q53scn4step4hero7parasol17StateParasolDrill: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7parasol17StateParasolDrillFv - .byte4 procAnim__Q53scn4step4hero7parasol17StateParasolDrillFv - .byte4 procMove__Q53scn4step4hero7parasol17StateParasolDrillFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7parasol17StateParasolDrillFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7parasol17StateParasolDrillFv + .4byte procAnim__Q53scn4step4hero7parasol17StateParasolDrillFv + .4byte procMove__Q53scn4step4hero7parasol17StateParasolDrillFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7parasol17StateParasolDrillFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateParasolDrillEnd.s b/asm/src/StateParasolDrillEnd.s index 8f4bd67a..82b79151 100644 --- a/asm/src/StateParasolDrillEnd.s +++ b/asm/src/StateParasolDrillEnd.s @@ -109,11 +109,11 @@ procFixPos__Q53scn4step4hero7parasol20StateParasolDrillEndFv: __vt__Q53scn4step4hero7parasol20StateParasolDrillEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7parasol20StateParasolDrillEndFv - .byte4 procAnim__Q53scn4step4hero7parasol20StateParasolDrillEndFv - .byte4 procMove__Q53scn4step4hero7parasol20StateParasolDrillEndFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7parasol20StateParasolDrillEndFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7parasol20StateParasolDrillEndFv + .4byte procAnim__Q53scn4step4hero7parasol20StateParasolDrillEndFv + .4byte procMove__Q53scn4step4hero7parasol20StateParasolDrillEndFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7parasol20StateParasolDrillEndFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateParasolFall.s b/asm/src/StateParasolFall.s index 916ec9b6..bdf33e7d 100644 --- a/asm/src/StateParasolFall.s +++ b/asm/src/StateParasolFall.s @@ -476,24 +476,24 @@ __dt__Q53scn4step5enemy10parasoldoo16StateParasolFallFv: __vt__Q53scn4step5enemy10parasoldee16StateParasolFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10parasoldee16StateParasolFallFv - .byte4 procAnim__Q53scn4step5enemy10parasoldee16StateParasolFallFv - .byte4 procMove__Q53scn4step5enemy10parasoldee16StateParasolFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10parasoldee16StateParasolFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10parasoldee16StateParasolFallFv + .4byte procAnim__Q53scn4step5enemy10parasoldee16StateParasolFallFv + .4byte procMove__Q53scn4step5enemy10parasoldee16StateParasolFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10parasoldee16StateParasolFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo16StateParasolFall __vt__Q53scn4step5enemy10parasoldoo16StateParasolFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10parasoldoo16StateParasolFallFv - .byte4 procAnim__Q53scn4step5enemy10parasoldoo16StateParasolFallFv - .byte4 procMove__Q53scn4step5enemy10parasoldoo16StateParasolFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10parasoldoo16StateParasolFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10parasoldoo16StateParasolFallFv + .4byte procAnim__Q53scn4step5enemy10parasoldoo16StateParasolFallFv + .4byte procMove__Q53scn4step5enemy10parasoldoo16StateParasolFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10parasoldoo16StateParasolFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256866 diff --git a/asm/src/StateParasolParachute.s b/asm/src/StateParasolParachute.s index 10fd4e50..1a0dbee4 100644 --- a/asm/src/StateParasolParachute.s +++ b/asm/src/StateParasolParachute.s @@ -493,19 +493,19 @@ __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21St __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolParachute$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolParachute$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolParachute$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolParachute$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolParachute$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7parasol21StateParasolParachute __vt__Q53scn4step4hero7parasol21StateParasolParachute: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7parasol21StateParasolParachuteFv - .byte4 procAnim__Q53scn4step4hero7parasol21StateParasolParachuteFv - .byte4 procMove__Q53scn4step4hero7parasol21StateParasolParachuteFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7parasol21StateParasolParachuteFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7parasol21StateParasolParachuteFv + .4byte procAnim__Q53scn4step4hero7parasol21StateParasolParachuteFv + .4byte procMove__Q53scn4step4hero7parasol21StateParasolParachuteFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7parasol21StateParasolParachuteFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateParasolParachuteFall.s b/asm/src/StateParasolParachuteFall.s index 171134f1..2b65a191 100644 --- a/asm/src/StateParasolParachuteFall.s +++ b/asm/src/StateParasolParachuteFall.s @@ -314,13 +314,13 @@ lbl_803946FC: __vt__Q53scn4step4hero7parasol25StateParasolParachuteFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7parasol25StateParasolParachuteFallFv - .byte4 procAnim__Q53scn4step4hero7parasol25StateParasolParachuteFallFv - .byte4 procMove__Q53scn4step4hero7parasol25StateParasolParachuteFallFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7parasol25StateParasolParachuteFallFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7parasol25StateParasolParachuteFallFv + .4byte procAnim__Q53scn4step4hero7parasol25StateParasolParachuteFallFv + .4byte procMove__Q53scn4step4hero7parasol25StateParasolParachuteFallFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7parasol25StateParasolParachuteFallFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateParasolRelease.s b/asm/src/StateParasolRelease.s index 46035b8f..250fa5ff 100644 --- a/asm/src/StateParasolRelease.s +++ b/asm/src/StateParasolRelease.s @@ -365,12 +365,12 @@ procObjCollReact__Q53scn4step5enemy6damage19StateParasolReleaseFv: __vt__Q53scn4step5enemy6damage19StateParasolRelease: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6damage19StateParasolReleaseFv - .byte4 procAnim__Q53scn4step5enemy6damage19StateParasolReleaseFv - .byte4 procMove__Q53scn4step5enemy6damage19StateParasolReleaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6damage19StateParasolReleaseFv - .byte4 procObjCollReact__Q53scn4step5enemy6damage19StateParasolReleaseFv + .4byte __dt__Q53scn4step5enemy6damage19StateParasolReleaseFv + .4byte procAnim__Q53scn4step5enemy6damage19StateParasolReleaseFv + .4byte procMove__Q53scn4step5enemy6damage19StateParasolReleaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6damage19StateParasolReleaseFv + .4byte procObjCollReact__Q53scn4step5enemy6damage19StateParasolReleaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257646 diff --git a/asm/src/StateParasolShield.s b/asm/src/StateParasolShield.s index 3780cd16..7b909b16 100644 --- a/asm/src/StateParasolShield.s +++ b/asm/src/StateParasolShield.s @@ -130,11 +130,11 @@ procFixPos__Q53scn4step4hero7parasol18StateParasolShieldFv: __vt__Q53scn4step4hero7parasol18StateParasolShield: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7parasol18StateParasolShieldFv - .byte4 procAnim__Q53scn4step4hero7parasol18StateParasolShieldFv - .byte4 procMove__Q53scn4step4hero7parasol18StateParasolShieldFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7parasol18StateParasolShieldFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7parasol18StateParasolShieldFv + .4byte procAnim__Q53scn4step4hero7parasol18StateParasolShieldFv + .4byte procMove__Q53scn4step4hero7parasol18StateParasolShieldFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7parasol18StateParasolShieldFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateParasolSwing.s b/asm/src/StateParasolSwing.s index 5cd90b3d..a364f700 100644 --- a/asm/src/StateParasolSwing.s +++ b/asm/src/StateParasolSwing.s @@ -710,37 +710,37 @@ __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedParasol$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedParasol$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedParasol$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedParasol$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedParasol$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol19StateParasolCapture$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol19StateParasolCapture$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol19StateParasolCapture$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol19StateParasolCapture$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol19StateParasolCapture$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol19StateParasolCapture$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol18StateParasolShield$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol18StateParasolShield$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol18StateParasolShield$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol18StateParasolShield$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol18StateParasolShield$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol18StateParasolShield$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolSwing$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolSwing$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolSwing$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolSwing$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolSwing$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolSwing$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7parasol17StateParasolSwing __vt__Q53scn4step4hero7parasol17StateParasolSwing: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7parasol17StateParasolSwingFv - .byte4 procAnim__Q53scn4step4hero7parasol17StateParasolSwingFv - .byte4 procMove__Q53scn4step4hero7parasol17StateParasolSwingFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7parasol17StateParasolSwingFv - .byte4 procObjCollReact__Q53scn4step4hero7parasol17StateParasolSwingFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7parasol17StateParasolSwingFv + .4byte procAnim__Q53scn4step4hero7parasol17StateParasolSwingFv + .4byte procMove__Q53scn4step4hero7parasol17StateParasolSwingFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7parasol17StateParasolSwingFv + .4byte procObjCollReact__Q53scn4step4hero7parasol17StateParasolSwingFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateParasolUnder.s b/asm/src/StateParasolUnder.s index 7fdf4fb5..19ef73e3 100644 --- a/asm/src/StateParasolUnder.s +++ b/asm/src/StateParasolUnder.s @@ -305,17 +305,17 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17Sta __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolUnder$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolUnder$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolUnder$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolUnder$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolUnder$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7parasol17StateParasolUnder __vt__Q53scn4step4hero7parasol17StateParasolUnder: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7parasol17StateParasolUnderFv - .byte4 procAnim__Q53scn4step4hero7parasol17StateParasolUnderFv - .byte4 procMove__Q53scn4step4hero7parasol17StateParasolUnderFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7parasol17StateParasolUnderFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7parasol17StateParasolUnderFv + .4byte procAnim__Q53scn4step4hero7parasol17StateParasolUnderFv + .4byte procMove__Q53scn4step4hero7parasol17StateParasolUnderFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7parasol17StateParasolUnderFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateParasolWaterDive.s b/asm/src/StateParasolWaterDive.s index eb790a19..64988b90 100644 --- a/asm/src/StateParasolWaterDive.s +++ b/asm/src/StateParasolWaterDive.s @@ -520,19 +520,19 @@ __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21St __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolWaterDive$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolWaterDive$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolWaterDive$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolWaterDive$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolWaterDive$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7parasol21StateParasolWaterDive __vt__Q53scn4step4hero7parasol21StateParasolWaterDive: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7parasol21StateParasolWaterDiveFv - .byte4 procAnim__Q53scn4step4hero7parasol21StateParasolWaterDiveFv - .byte4 procMove__Q53scn4step4hero7parasol21StateParasolWaterDiveFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7parasol21StateParasolWaterDiveFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7parasol21StateParasolWaterDiveFv + .4byte procAnim__Q53scn4step4hero7parasol21StateParasolWaterDiveFv + .4byte procMove__Q53scn4step4hero7parasol21StateParasolWaterDiveFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7parasol21StateParasolWaterDiveFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateParasolWaterDrill.s b/asm/src/StateParasolWaterDrill.s index 88211ac7..ccb1c261 100644 --- a/asm/src/StateParasolWaterDrill.s +++ b/asm/src/StateParasolWaterDrill.s @@ -560,25 +560,25 @@ __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25St __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolWaterDrillEnd$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolWaterDrillEnd$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolWaterDrillEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolWaterDrillEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolWaterDrillEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol22StateParasolWaterDrill$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol22StateParasolWaterDrill$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol22StateParasolWaterDrill$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol22StateParasolWaterDrill$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol22StateParasolWaterDrill$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol22StateParasolWaterDrill$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7parasol22StateParasolWaterDrill __vt__Q53scn4step4hero7parasol22StateParasolWaterDrill: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7parasol22StateParasolWaterDrillFv - .byte4 procAnim__Q53scn4step4hero7parasol22StateParasolWaterDrillFv - .byte4 procMove__Q53scn4step4hero7parasol22StateParasolWaterDrillFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7parasol22StateParasolWaterDrillFv - .byte4 procObjCollReact__Q53scn4step4hero7parasol22StateParasolWaterDrillFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7parasol22StateParasolWaterDrillFv + .4byte procAnim__Q53scn4step4hero7parasol22StateParasolWaterDrillFv + .4byte procMove__Q53scn4step4hero7parasol22StateParasolWaterDrillFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7parasol22StateParasolWaterDrillFv + .4byte procObjCollReact__Q53scn4step4hero7parasol22StateParasolWaterDrillFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateParasolWaterDrillEnd.s b/asm/src/StateParasolWaterDrillEnd.s index 90a55298..8bc18d9e 100644 --- a/asm/src/StateParasolWaterDrillEnd.s +++ b/asm/src/StateParasolWaterDrillEnd.s @@ -198,11 +198,11 @@ procFixPos__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFv: __vt__Q53scn4step4hero7parasol25StateParasolWaterDrillEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFv - .byte4 procAnim__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFv - .byte4 procMove__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFv + .4byte procAnim__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFv + .4byte procMove__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StatePick.s b/asm/src/StatePick.s index fd91f18d..8f84e7d9 100644 --- a/asm/src/StatePick.s +++ b/asm/src/StatePick.s @@ -198,18 +198,18 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee8St __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee8StateRun$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee8StateRun$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee8StateRun$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee8StateRun$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee8StateRun$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9creditdee9StatePick __vt__Q53scn4step4boss9creditdee9StatePick: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9creditdee9StatePickFv - .byte4 procAnim__Q53scn4step4boss9creditdee9StatePickFv - .byte4 procMove__Q53scn4step4boss9creditdee9StatePickFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9creditdee9StatePickFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9creditdee9StatePickFv + .4byte procAnim__Q53scn4step4boss9creditdee9StatePickFv + .4byte procMove__Q53scn4step4boss9creditdee9StatePickFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9creditdee9StatePickFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255433 diff --git a/asm/src/StatePiggyback.s b/asm/src/StatePiggyback.s index 9ee752b5..b78e4d59 100644 --- a/asm/src/StatePiggyback.s +++ b/asm/src/StatePiggyback.s @@ -376,13 +376,13 @@ procFixPos__Q53scn4step4hero12interference14StatePiggybackFv: __vt__Q53scn4step4hero12interference14StatePiggyback: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero12interference14StatePiggybackFv - .byte4 procAnim__Q53scn4step4hero12interference14StatePiggybackFv - .byte4 procMove__Q53scn4step4hero12interference14StatePiggybackFv - .byte4 procConstraint__Q53scn4step4hero12interference14StatePiggybackFv - .byte4 procFixPos__Q53scn4step4hero12interference14StatePiggybackFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero12interference14StatePiggybackFv + .4byte procAnim__Q53scn4step4hero12interference14StatePiggybackFv + .4byte procMove__Q53scn4step4hero12interference14StatePiggybackFv + .4byte procConstraint__Q53scn4step4hero12interference14StatePiggybackFv + .4byte procFixPos__Q53scn4step4hero12interference14StatePiggybackFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StatePlancher.s b/asm/src/StatePlancher.s index 75f0c4b6..de800619 100644 --- a/asm/src/StatePlancher.s +++ b/asm/src/StatePlancher.s @@ -396,19 +396,19 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16Stat __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StatePlancherHit$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StatePlancherHit$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StatePlancherHit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StatePlancherHit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StatePlancherHit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common13StatePlancher __vt__Q53scn4step4hero6common13StatePlancher: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common13StatePlancherFv - .byte4 procAnim__Q53scn4step4hero6common13StatePlancherFv - .byte4 procMove__Q53scn4step4hero6common13StatePlancherFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common13StatePlancherFv - .byte4 procObjCollReact__Q53scn4step4hero6common13StatePlancherFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common13StatePlancherFv + .4byte procAnim__Q53scn4step4hero6common13StatePlancherFv + .4byte procMove__Q53scn4step4hero6common13StatePlancherFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common13StatePlancherFv + .4byte procObjCollReact__Q53scn4step4hero6common13StatePlancherFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StatePlancherBound.s b/asm/src/StatePlancherBound.s index 174f8688..976b426e 100644 --- a/asm/src/StatePlancherBound.s +++ b/asm/src/StatePlancherBound.s @@ -295,13 +295,13 @@ lbl_80367CB0: __vt__Q53scn4step4hero6common18StatePlancherBound: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common18StatePlancherBoundFv - .byte4 procAnim__Q53scn4step4hero6common18StatePlancherBoundFv - .byte4 procMove__Q53scn4step4hero6common18StatePlancherBoundFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common18StatePlancherBoundFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common18StatePlancherBoundFv + .4byte procAnim__Q53scn4step4hero6common18StatePlancherBoundFv + .4byte procMove__Q53scn4step4hero6common18StatePlancherBoundFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common18StatePlancherBoundFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StatePlancherHit.s b/asm/src/StatePlancherHit.s index 506dd6cc..6abf29ea 100644 --- a/asm/src/StatePlancherHit.s +++ b/asm/src/StatePlancherHit.s @@ -334,13 +334,13 @@ lbl_80368164: __vt__Q53scn4step4hero6common16StatePlancherHit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common16StatePlancherHitFv - .byte4 procAnim__Q53scn4step4hero6common16StatePlancherHitFv - .byte4 procMove__Q53scn4step4hero6common16StatePlancherHitFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common16StatePlancherHitFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common16StatePlancherHitFv + .4byte procAnim__Q53scn4step4hero6common16StatePlancherHitFv + .4byte procMove__Q53scn4step4hero6common16StatePlancherHitFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common16StatePlancherHitFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StatePlancherLanding.s b/asm/src/StatePlancherLanding.s index 6f30a215..660ff198 100644 --- a/asm/src/StatePlancherLanding.s +++ b/asm/src/StatePlancherLanding.s @@ -323,25 +323,25 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common18Stat __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common18StatePlancherBound$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common18StatePlancherBound$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common18StatePlancherBound$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common18StatePlancherBound$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common18StatePlancherBound$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common20StatePlancherLanding$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common20StatePlancherLanding$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common20StatePlancherLanding$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common20StatePlancherLanding$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common20StatePlancherLanding$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common20StatePlancherLanding$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common20StatePlancherLanding __vt__Q53scn4step4hero6common20StatePlancherLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common20StatePlancherLandingFv - .byte4 procAnim__Q53scn4step4hero6common20StatePlancherLandingFv - .byte4 procMove__Q53scn4step4hero6common20StatePlancherLandingFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common20StatePlancherLandingFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common20StatePlancherLandingFv + .4byte procAnim__Q53scn4step4hero6common20StatePlancherLandingFv + .4byte procMove__Q53scn4step4hero6common20StatePlancherLandingFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common20StatePlancherLandingFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StatePraise.s b/asm/src/StatePraise.s index 896428b9..d4fdbb03 100644 --- a/asm/src/StatePraise.s +++ b/asm/src/StatePraise.s @@ -1140,90 +1140,90 @@ procFixPos__Q53scn4step5enemy6sparky11StatePraiseFv: __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede11StatePraise$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss12creditdedede11StatePraise __vt__Q53scn4step4boss12creditdedede11StatePraise: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss12creditdedede11StatePraiseFv - .byte4 procAnim__Q53scn4step4boss12creditdedede11StatePraiseFv - .byte4 procMove__Q53scn4step4boss12creditdedede11StatePraiseFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss12creditdedede11StatePraiseFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss12creditdedede11StatePraiseFv + .4byte procAnim__Q53scn4step4boss12creditdedede11StatePraiseFv + .4byte procMove__Q53scn4step4boss12creditdedede11StatePraiseFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss12creditdedede11StatePraiseFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee11StatePraise$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee11StatePraise$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9creditdee11StatePraise __vt__Q53scn4step4boss9creditdee11StatePraise: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9creditdee11StatePraiseFv - .byte4 procAnim__Q53scn4step4boss9creditdee11StatePraiseFv - .byte4 procMove__Q53scn4step4boss9creditdee11StatePraiseFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9creditdee11StatePraiseFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9creditdee11StatePraiseFv + .4byte procAnim__Q53scn4step4boss9creditdee11StatePraiseFv + .4byte procMove__Q53scn4step4boss9creditdee11StatePraiseFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9creditdee11StatePraiseFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta11StatePraise$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta11StatePraise$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss10creditmeta11StatePraise __vt__Q53scn4step4boss10creditmeta11StatePraise: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss10creditmeta11StatePraiseFv - .byte4 procAnim__Q53scn4step4boss10creditmeta11StatePraiseFv - .byte4 procMove__Q53scn4step4boss10creditmeta11StatePraiseFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss10creditmeta11StatePraiseFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss10creditmeta11StatePraiseFv + .4byte procAnim__Q53scn4step4boss10creditmeta11StatePraiseFv + .4byte procMove__Q53scn4step4boss10creditmeta11StatePraiseFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss10creditmeta11StatePraiseFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common11StatePraise __vt__Q53scn4step5enemy6common11StatePraise: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common11StatePraiseFv - .byte4 procAnim__Q53scn4step5enemy6common11StatePraiseFv - .byte4 procMove__Q53scn4step5enemy6common11StatePraiseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common11StatePraiseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common11StatePraiseFv + .4byte procAnim__Q53scn4step5enemy6common11StatePraiseFv + .4byte procMove__Q53scn4step5enemy6common11StatePraiseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common11StatePraiseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy11StatePraise __vt__Q53scn4step5enemy6bouncy11StatePraise: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6bouncy11StatePraiseFv - .byte4 procAnim__Q53scn4step5enemy6bouncy11StatePraiseFv - .byte4 procMove__Q53scn4step5enemy6bouncy11StatePraiseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6bouncy11StatePraiseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6bouncy11StatePraiseFv + .4byte procAnim__Q53scn4step5enemy6bouncy11StatePraiseFv + .4byte procMove__Q53scn4step5enemy6bouncy11StatePraiseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6bouncy11StatePraiseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sparky11StatePraise __vt__Q53scn4step5enemy6sparky11StatePraise: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6sparky11StatePraiseFv - .byte4 procAnim__Q53scn4step5enemy6sparky11StatePraiseFv - .byte4 procMove__Q53scn4step5enemy6sparky11StatePraiseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6sparky11StatePraiseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6sparky11StatePraiseFv + .4byte procAnim__Q53scn4step5enemy6sparky11StatePraiseFv + .4byte procMove__Q53scn4step5enemy6sparky11StatePraiseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6sparky11StatePraiseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255711 diff --git a/asm/src/StatePreciousAppear.s b/asm/src/StatePreciousAppear.s index 3b5ec67b..d4df16c7 100644 --- a/asm/src/StatePreciousAppear.s +++ b/asm/src/StatePreciousAppear.s @@ -400,16 +400,16 @@ __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateW __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateWaft$$4PQ43scn4step4item4Item$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateWaft$$4PQ43scn4step4item4Item$$1Fv - .byte4 create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateWaft$$4PQ43scn4step4item4Item$$1Fv + .4byte __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateWaft$$4PQ43scn4step4item4Item$$1Fv + .4byte create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateWaft$$4PQ43scn4step4item4Item$$1Fv .global __vt__Q53scn4step4item5state19StatePreciousAppear __vt__Q53scn4step4item5state19StatePreciousAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4item5state19StatePreciousAppearFv - .byte4 procAnim__Q53scn4step4item5state19StatePreciousAppearFv - .byte4 procMove__Q53scn4step4item5state19StatePreciousAppearFv - .byte4 procFixPos__Q43scn4step4item9StateBaseFv + .4byte __dt__Q53scn4step4item5state19StatePreciousAppearFv + .4byte procAnim__Q53scn4step4item5state19StatePreciousAppearFv + .4byte procMove__Q53scn4step4item5state19StatePreciousAppearFv + .4byte procFixPos__Q43scn4step4item9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255473 diff --git a/asm/src/StatePressFall.s b/asm/src/StatePressFall.s index 1409b9dd..dc7ce3e6 100644 --- a/asm/src/StatePressFall.s +++ b/asm/src/StatePressFall.s @@ -343,12 +343,12 @@ lbl_802564D4: __vt__Q53scn4step4boss9moundeath14StatePressFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9moundeath14StatePressFallFv - .byte4 procAnim__Q53scn4step4boss9moundeath14StatePressFallFv - .byte4 procMove__Q53scn4step4boss9moundeath14StatePressFallFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9moundeath14StatePressFallFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9moundeath14StatePressFallFv + .4byte procAnim__Q53scn4step4boss9moundeath14StatePressFallFv + .4byte procMove__Q53scn4step4boss9moundeath14StatePressFallFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9moundeath14StatePressFallFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256793 diff --git a/asm/src/StatePressFallStart.s b/asm/src/StatePressFallStart.s index ba2689b3..7d0526c7 100644 --- a/asm/src/StatePressFallStart.s +++ b/asm/src/StatePressFallStart.s @@ -205,18 +205,18 @@ __dt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14 __vt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressFall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressFall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv - .byte4 create__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressFall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv + .4byte __dt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressFall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv + .4byte create__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressFall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv .global __vt__Q53scn4step4boss9moundeath19StatePressFallStart __vt__Q53scn4step4boss9moundeath19StatePressFallStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9moundeath19StatePressFallStartFv - .byte4 procAnim__Q53scn4step4boss9moundeath19StatePressFallStartFv - .byte4 procMove__Q53scn4step4boss9moundeath19StatePressFallStartFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9moundeath19StatePressFallStartFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9moundeath19StatePressFallStartFv + .4byte procAnim__Q53scn4step4boss9moundeath19StatePressFallStartFv + .4byte procMove__Q53scn4step4boss9moundeath19StatePressFallStartFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9moundeath19StatePressFallStartFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256005 diff --git a/asm/src/StatePressJump.s b/asm/src/StatePressJump.s index edf4f11b..84b74e18 100644 --- a/asm/src/StatePressJump.s +++ b/asm/src/StatePressJump.s @@ -399,18 +399,18 @@ __dt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19 __vt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressFallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressFallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv - .byte4 create__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressFallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv + .4byte __dt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressFallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv + .4byte create__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressFallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv .global __vt__Q53scn4step4boss9moundeath14StatePressJump __vt__Q53scn4step4boss9moundeath14StatePressJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9moundeath14StatePressJumpFv - .byte4 procAnim__Q53scn4step4boss9moundeath14StatePressJumpFv - .byte4 procMove__Q53scn4step4boss9moundeath14StatePressJumpFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9moundeath14StatePressJumpFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9moundeath14StatePressJumpFv + .4byte procAnim__Q53scn4step4boss9moundeath14StatePressJumpFv + .4byte procMove__Q53scn4step4boss9moundeath14StatePressJumpFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9moundeath14StatePressJumpFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255442 diff --git a/asm/src/StatePressJumpStart.s b/asm/src/StatePressJumpStart.s index b6f68e76..3f55c00b 100644 --- a/asm/src/StatePressJumpStart.s +++ b/asm/src/StatePressJumpStart.s @@ -175,15 +175,15 @@ __dt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14 __vt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv - .byte4 create__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv + .4byte __dt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv + .4byte create__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv .global __vt__Q53scn4step4boss9moundeath19StatePressJumpStart __vt__Q53scn4step4boss9moundeath19StatePressJumpStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9moundeath19StatePressJumpStartFv - .byte4 procAnim__Q53scn4step4boss9moundeath19StatePressJumpStartFv - .byte4 procMove__Q53scn4step4boss9moundeath19StatePressJumpStartFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9moundeath19StatePressJumpStartFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9moundeath19StatePressJumpStartFv + .4byte procAnim__Q53scn4step4boss9moundeath19StatePressJumpStartFv + .4byte procMove__Q53scn4step4boss9moundeath19StatePressJumpStartFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9moundeath19StatePressJumpStartFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StatePuff.s b/asm/src/StatePuff.s index 25c50320..f65d7ddc 100644 --- a/asm/src/StatePuff.s +++ b/asm/src/StatePuff.s @@ -152,12 +152,12 @@ procMove__Q53scn4step5enemy10stareffect9StatePuffFv: __vt__Q53scn4step5enemy10stareffect9StatePuff: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10stareffect9StatePuffFv - .byte4 procAnim__Q53scn4step5enemy10stareffect9StatePuffFv - .byte4 procMove__Q53scn4step5enemy10stareffect9StatePuffFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10stareffect9StatePuffFv + .4byte procAnim__Q53scn4step5enemy10stareffect9StatePuffFv + .4byte procMove__Q53scn4step5enemy10stareffect9StatePuffFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256196 diff --git a/asm/src/StatePursuit.s b/asm/src/StatePursuit.s index 5e45dd71..69ed13e6 100644 --- a/asm/src/StatePursuit.s +++ b/asm/src/StatePursuit.s @@ -844,24 +844,24 @@ __dt__Q53scn4step5enemy10brontoburt12StatePursuitFv: __vt__Q53scn4step5enemy6common12StatePursuit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common12StatePursuitFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy6common12StatePursuitFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common12StatePursuitFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common12StatePursuitFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy6common12StatePursuitFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common12StatePursuitFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10brontoburt12StatePursuit __vt__Q53scn4step5enemy10brontoburt12StatePursuit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10brontoburt12StatePursuitFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy10brontoburt12StatePursuitFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10brontoburt12StatePursuitFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10brontoburt12StatePursuitFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy10brontoburt12StatePursuitFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10brontoburt12StatePursuitFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256157 diff --git a/asm/src/StateQuivery.s b/asm/src/StateQuivery.s index 46c6a2c2..4345714b 100644 --- a/asm/src/StateQuivery.s +++ b/asm/src/StateQuivery.s @@ -225,12 +225,12 @@ reqQuivery__Q53scn4step4boss13watergalboros12StateQuiveryFv: __vt__Q53scn4step4boss13watergalboros12StateQuivery: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss13watergalboros12StateQuiveryFv - .byte4 procAnim__Q53scn4step4boss13watergalboros12StateQuiveryFv - .byte4 procMove__Q53scn4step4boss13watergalboros12StateQuiveryFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss13watergalboros12StateQuiveryFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss13watergalboros12StateQuiveryFv + .4byte procAnim__Q53scn4step4boss13watergalboros12StateQuiveryFv + .4byte procMove__Q53scn4step4boss13watergalboros12StateQuiveryFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss13watergalboros12StateQuiveryFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256461 diff --git a/asm/src/StateRainBomb.s b/asm/src/StateRainBomb.s index f2b0fc20..7d0e1d6f 100644 --- a/asm/src/StateRainBomb.s +++ b/asm/src/StateRainBomb.s @@ -328,18 +328,18 @@ __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9State __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateFall$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateFall$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateFall$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateFall$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateFall$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss7bonkers13StateRainBomb __vt__Q53scn4step4boss7bonkers13StateRainBomb: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss7bonkers13StateRainBombFv - .byte4 procAnim__Q53scn4step4boss7bonkers13StateRainBombFv - .byte4 procMove__Q53scn4step4boss7bonkers13StateRainBombFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss7bonkers13StateRainBombFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss7bonkers13StateRainBombFv + .4byte procAnim__Q53scn4step4boss7bonkers13StateRainBombFv + .4byte procMove__Q53scn4step4boss7bonkers13StateRainBombFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss7bonkers13StateRainBombFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256362 diff --git a/asm/src/StateRainBombStart.s b/asm/src/StateRainBombStart.s index 7e4a64a5..0ffb5e6b 100644 --- a/asm/src/StateRainBombStart.s +++ b/asm/src/StateRainBombStart.s @@ -275,18 +275,18 @@ __dt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers13St __vt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateRainBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateRainBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1Fv - .byte4 create__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateRainBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1Fv + .4byte __dt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateRainBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1Fv + .4byte create__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateRainBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1Fv .global __vt__Q53scn4step4boss7bonkers18StateRainBombStart __vt__Q53scn4step4boss7bonkers18StateRainBombStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss7bonkers18StateRainBombStartFv - .byte4 procAnim__Q53scn4step4boss7bonkers18StateRainBombStartFv - .byte4 procMove__Q53scn4step4boss7bonkers18StateRainBombStartFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss7bonkers18StateRainBombStartFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss7bonkers18StateRainBombStartFv + .4byte procAnim__Q53scn4step4boss7bonkers18StateRainBombStartFv + .4byte procMove__Q53scn4step4boss7bonkers18StateRainBombStartFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss7bonkers18StateRainBombStartFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255597 diff --git a/asm/src/StateReady.s b/asm/src/StateReady.s index bfcf8d35..2e156396 100644 --- a/asm/src/StateReady.s +++ b/asm/src/StateReady.s @@ -619,18 +619,18 @@ __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challeng __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon19challengemastershot10StateReady __vt__Q53scn4step6weapon19challengemastershot10StateReady: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon19challengemastershot10StateReadyFv - .byte4 procAnim__Q53scn4step6weapon19challengemastershot10StateReadyFv - .byte4 procMove__Q53scn4step6weapon19challengemastershot10StateReadyFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon19challengemastershot10StateReadyFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon19challengemastershot10StateReadyFv + .4byte procAnim__Q53scn4step6weapon19challengemastershot10StateReadyFv + .4byte procMove__Q53scn4step6weapon19challengemastershot10StateReadyFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon19challengemastershot10StateReadyFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257357 diff --git a/asm/src/StateReflect.s b/asm/src/StateReflect.s index 1f46685b..4d8c7388 100644 --- a/asm/src/StateReflect.s +++ b/asm/src/StateReflect.s @@ -669,24 +669,24 @@ procObjCollReact__Q53scn4step6weapon8deespear12StateReflectFv: __vt__Q53scn4step6weapon10spearspear12StateReflect: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon10spearspear12StateReflectFv - .byte4 procAnim__Q53scn4step6weapon10spearspear12StateReflectFv - .byte4 procMove__Q53scn4step6weapon10spearspear12StateReflectFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon10spearspear12StateReflectFv - .byte4 procObjCollReact__Q53scn4step6weapon10spearspear12StateReflectFv + .4byte __dt__Q53scn4step6weapon10spearspear12StateReflectFv + .4byte procAnim__Q53scn4step6weapon10spearspear12StateReflectFv + .4byte procMove__Q53scn4step6weapon10spearspear12StateReflectFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon10spearspear12StateReflectFv + .4byte procObjCollReact__Q53scn4step6weapon10spearspear12StateReflectFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8deespear12StateReflect __vt__Q53scn4step6weapon8deespear12StateReflect: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon8deespear12StateReflectFv - .byte4 procAnim__Q53scn4step6weapon8deespear12StateReflectFv - .byte4 procMove__Q53scn4step6weapon8deespear12StateReflectFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon8deespear12StateReflectFv - .byte4 procObjCollReact__Q53scn4step6weapon8deespear12StateReflectFv + .4byte __dt__Q53scn4step6weapon8deespear12StateReflectFv + .4byte procAnim__Q53scn4step6weapon8deespear12StateReflectFv + .4byte procMove__Q53scn4step6weapon8deespear12StateReflectFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon8deespear12StateReflectFv + .4byte procObjCollReact__Q53scn4step6weapon8deespear12StateReflectFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257330 diff --git a/asm/src/StateReturnWarpLowper.s b/asm/src/StateReturnWarpLowper.s index acabc697..d4012910 100644 --- a/asm/src/StateReturnWarpLowper.s +++ b/asm/src/StateReturnWarpLowper.s @@ -486,19 +486,19 @@ __dt__Q24util120StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero6common9Stat __vt__Q24util120StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero6common9StateDemo$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util120StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero6common9StateDemo$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$4b$$1Fv - .byte4 create__Q24util120StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero6common9StateDemo$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$4b$$1Fv + .4byte __dt__Q24util120StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero6common9StateDemo$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$4b$$1Fv + .4byte create__Q24util120StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero6common9StateDemo$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$4b$$1Fv .global __vt__Q53scn4step4hero7gimmick21StateReturnWarpLowper __vt__Q53scn4step4hero7gimmick21StateReturnWarpLowper: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick21StateReturnWarpLowperFv - .byte4 procAnim__Q53scn4step4hero7gimmick21StateReturnWarpLowperFv - .byte4 procMove__Q53scn4step4hero7gimmick21StateReturnWarpLowperFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick21StateReturnWarpLowperFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick21StateReturnWarpLowperFv + .4byte procAnim__Q53scn4step4hero7gimmick21StateReturnWarpLowperFv + .4byte procMove__Q53scn4step4hero7gimmick21StateReturnWarpLowperFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick21StateReturnWarpLowperFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateRise.s b/asm/src/StateRise.s index a6ac73ef..6bf60bb1 100644 --- a/asm/src/StateRise.s +++ b/asm/src/StateRise.s @@ -222,12 +222,12 @@ __dt__Q53scn4step5enemy7parasol9StateRiseFv: __vt__Q53scn4step5enemy7parasol9StateRise: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7parasol9StateRiseFv - .byte4 procAnim__Q53scn4step5enemy7parasol9StateRiseFv - .byte4 procMove__Q53scn4step5enemy7parasol9StateRiseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7parasol9StateRiseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7parasol9StateRiseFv + .4byte procAnim__Q53scn4step5enemy7parasol9StateRiseFv + .4byte procMove__Q53scn4step5enemy7parasol9StateRiseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7parasol9StateRiseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255826 diff --git a/asm/src/StateRising.s b/asm/src/StateRising.s index 4070a845..d3adc356 100644 --- a/asm/src/StateRising.s +++ b/asm/src/StateRising.s @@ -557,25 +557,25 @@ lbl_8039E18C: __vt__Q53scn4step5enemy10knucklejoe11StateRising: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10knucklejoe11StateRisingFv - .byte4 procAnim__Q53scn4step5enemy10knucklejoe11StateRisingFv - .byte4 procMove__Q53scn4step5enemy10knucklejoe11StateRisingFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10knucklejoe11StateRisingFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10knucklejoe11StateRisingFv + .4byte procAnim__Q53scn4step5enemy10knucklejoe11StateRisingFv + .4byte procMove__Q53scn4step5enemy10knucklejoe11StateRisingFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10knucklejoe11StateRisingFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter11StateRising __vt__Q53scn4step4hero7fighter11StateRising: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter11StateRisingFv - .byte4 procAnim__Q53scn4step4hero7fighter11StateRisingFv - .byte4 procMove__Q53scn4step4hero7fighter11StateRisingFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter11StateRisingFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter11StateRisingFv + .4byte procAnim__Q53scn4step4hero7fighter11StateRisingFv + .4byte procMove__Q53scn4step4hero7fighter11StateRisingFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter11StateRisingFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateRoah.s b/asm/src/StateRoah.s index 529acb39..ee543b15 100644 --- a/asm/src/StateRoah.s +++ b/asm/src/StateRoah.s @@ -179,10 +179,10 @@ procFixPos__Q53scn4step4item5state9StateRoahFv: __vt__Q53scn4step4item5state9StateRoah: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4item5state9StateRoahFv - .byte4 procAnim__Q53scn4step4item5state9StateRoahFv - .byte4 procMove__Q53scn4step4item5state9StateRoahFv - .byte4 procFixPos__Q53scn4step4item5state9StateRoahFv + .4byte __dt__Q53scn4step4item5state9StateRoahFv + .4byte procAnim__Q53scn4step4item5state9StateRoahFv + .4byte procMove__Q53scn4step4item5state9StateRoahFv + .4byte procFixPos__Q53scn4step4item5state9StateRoahFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255795 diff --git a/asm/src/StateRollJump.s b/asm/src/StateRollJump.s index 0ac7e6bc..9d7535ec 100644 --- a/asm/src/StateRollJump.s +++ b/asm/src/StateRollJump.s @@ -364,12 +364,12 @@ procFixPos__Q53scn4step4boss9moundeath13StateRollJumpFv: __vt__Q53scn4step4boss9moundeath13StateRollJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9moundeath13StateRollJumpFv - .byte4 procAnim__Q53scn4step4boss9moundeath13StateRollJumpFv - .byte4 procMove__Q53scn4step4boss9moundeath13StateRollJumpFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9moundeath13StateRollJumpFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9moundeath13StateRollJumpFv + .4byte procAnim__Q53scn4step4boss9moundeath13StateRollJumpFv + .4byte procMove__Q53scn4step4boss9moundeath13StateRollJumpFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9moundeath13StateRollJumpFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256524 diff --git a/asm/src/StateRolling.s b/asm/src/StateRolling.s index 716bccf2..fd24f7ba 100644 --- a/asm/src/StateRolling.s +++ b/asm/src/StateRolling.s @@ -480,18 +480,18 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath15S __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath15StateRollingEnd$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath15StateRollingEnd$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath15StateRollingEnd$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath15StateRollingEnd$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath15StateRollingEnd$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9moundeath12StateRolling __vt__Q53scn4step4boss9moundeath12StateRolling: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9moundeath12StateRollingFv - .byte4 procAnim__Q53scn4step4boss9moundeath12StateRollingFv - .byte4 procMove__Q53scn4step4boss9moundeath12StateRollingFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9moundeath12StateRollingFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9moundeath12StateRollingFv + .4byte procAnim__Q53scn4step4boss9moundeath12StateRollingFv + .4byte procMove__Q53scn4step4boss9moundeath12StateRollingFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9moundeath12StateRollingFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257155 diff --git a/asm/src/StateRollingEnd.s b/asm/src/StateRollingEnd.s index e000e4d9..f779895b 100644 --- a/asm/src/StateRollingEnd.s +++ b/asm/src/StateRollingEnd.s @@ -69,9 +69,9 @@ procFixPos__Q53scn4step4boss9moundeath15StateRollingEndFv: __vt__Q53scn4step4boss9moundeath15StateRollingEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9moundeath15StateRollingEndFv - .byte4 procAnim__Q53scn4step4boss9moundeath15StateRollingEndFv - .byte4 procMove__Q53scn4step4boss9moundeath15StateRollingEndFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9moundeath15StateRollingEndFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9moundeath15StateRollingEndFv + .4byte procAnim__Q53scn4step4boss9moundeath15StateRollingEndFv + .4byte procMove__Q53scn4step4boss9moundeath15StateRollingEndFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9moundeath15StateRollingEndFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateRollingStart.s b/asm/src/StateRollingStart.s index a594d360..4436dd53 100644 --- a/asm/src/StateRollingStart.s +++ b/asm/src/StateRollingStart.s @@ -253,18 +253,18 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath12S __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath12StateRolling$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath12StateRolling$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath12StateRolling$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath12StateRolling$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath12StateRolling$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9moundeath17StateRollingStart __vt__Q53scn4step4boss9moundeath17StateRollingStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9moundeath17StateRollingStartFv - .byte4 procAnim__Q53scn4step4boss9moundeath17StateRollingStartFv - .byte4 procMove__Q53scn4step4boss9moundeath17StateRollingStartFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9moundeath17StateRollingStartFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9moundeath17StateRollingStartFv + .4byte procAnim__Q53scn4step4boss9moundeath17StateRollingStartFv + .4byte procMove__Q53scn4step4boss9moundeath17StateRollingStartFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9moundeath17StateRollingStartFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256231 diff --git a/asm/src/StateRoomGuarderAppear.s b/asm/src/StateRoomGuarderAppear.s index 6089b1e7..c1d723d9 100644 --- a/asm/src/StateRoomGuarderAppear.s +++ b/asm/src/StateRoomGuarderAppear.s @@ -226,12 +226,12 @@ procMove__Q53scn4step5enemy6common22StateRoomGuarderAppearFv: __vt__Q53scn4step5enemy6common22StateRoomGuarderAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common22StateRoomGuarderAppearFv - .byte4 procAnim__Q53scn4step5enemy6common22StateRoomGuarderAppearFv - .byte4 procMove__Q53scn4step5enemy6common22StateRoomGuarderAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common22StateRoomGuarderAppearFv + .4byte procAnim__Q53scn4step5enemy6common22StateRoomGuarderAppearFv + .4byte procMove__Q53scn4step5enemy6common22StateRoomGuarderAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256208 diff --git a/asm/src/StateRootAttack.s b/asm/src/StateRootAttack.s index aab07d3d..9ac992d3 100644 --- a/asm/src/StateRootAttack.s +++ b/asm/src/StateRootAttack.s @@ -149,12 +149,12 @@ procFixPos__Q53scn4step4boss6whispy15StateRootAttackFv: __vt__Q53scn4step4boss6whispy15StateRootAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy15StateRootAttackFv - .byte4 procAnim__Q53scn4step4boss6whispy15StateRootAttackFv - .byte4 procMove__Q53scn4step4boss6whispy15StateRootAttackFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy15StateRootAttackFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6whispy15StateRootAttackFv + .4byte procAnim__Q53scn4step4boss6whispy15StateRootAttackFv + .4byte procMove__Q53scn4step4boss6whispy15StateRootAttackFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy15StateRootAttackFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256375 diff --git a/asm/src/StateRun.s b/asm/src/StateRun.s index 16e7bca7..2c32e92a 100644 --- a/asm/src/StateRun.s +++ b/asm/src/StateRun.s @@ -565,31 +565,31 @@ __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8State __vt__Q53scn4step4boss9creditdee8StateRun: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9creditdee8StateRunFv - .byte4 procAnim__Q53scn4step4boss9creditdee8StateRunFv - .byte4 procMove__Q53scn4step4boss9creditdee8StateRunFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9creditdee8StateRunFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9creditdee8StateRunFv + .4byte procAnim__Q53scn4step4boss9creditdee8StateRunFv + .4byte procMove__Q53scn4step4boss9creditdee8StateRunFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9creditdee8StateRunFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateRun$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateRun$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateRun$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateRun$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateRun$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateRun$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common8StateRun __vt__Q53scn4step4hero6common8StateRun: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common8StateRunFv - .byte4 procAnim__Q53scn4step4hero6common8StateRunFv - .byte4 procMove__Q53scn4step4hero6common8StateRunFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common8StateRunFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common8StateRunFv + .4byte procAnim__Q53scn4step4hero6common8StateRunFv + .4byte procMove__Q53scn4step4hero6common8StateRunFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common8StateRunFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateRunAppear.s b/asm/src/StateRunAppear.s index 068581ed..8eedc9b2 100644 --- a/asm/src/StateRunAppear.s +++ b/asm/src/StateRunAppear.s @@ -265,24 +265,24 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9St __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StatePick$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StatePick$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StatePick$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StatePick$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StatePick$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateRunAppear$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateRunAppear$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateRunAppear$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateRunAppear$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateRunAppear$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateRunAppear$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9creditdee14StateRunAppear __vt__Q53scn4step4boss9creditdee14StateRunAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9creditdee14StateRunAppearFv - .byte4 procAnim__Q53scn4step4boss9creditdee14StateRunAppearFv - .byte4 procMove__Q53scn4step4boss9creditdee14StateRunAppearFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9creditdee14StateRunAppearFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9creditdee14StateRunAppearFv + .4byte procAnim__Q53scn4step4boss9creditdee14StateRunAppearFv + .4byte procMove__Q53scn4step4boss9creditdee14StateRunAppearFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9creditdee14StateRunAppearFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255551 diff --git a/asm/src/StateSCFlyAway.s b/asm/src/StateSCFlyAway.s index 08db5981..f2c1600f 100644 --- a/asm/src/StateSCFlyAway.s +++ b/asm/src/StateSCFlyAway.s @@ -602,18 +602,18 @@ __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCFlyAway$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCFlyAway$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCFlyAway$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCFlyAway$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCFlyAway$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster14StateSCFlyAway __vt__Q53scn4step4boss15challengemaster14StateSCFlyAway: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster14StateSCFlyAwayFv - .byte4 procAnim__Q53scn4step4boss15challengemaster14StateSCFlyAwayFv - .byte4 procMove__Q53scn4step4boss15challengemaster14StateSCFlyAwayFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster14StateSCFlyAwayFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster14StateSCFlyAwayFv + .4byte procAnim__Q53scn4step4boss15challengemaster14StateSCFlyAwayFv + .4byte procMove__Q53scn4step4boss15challengemaster14StateSCFlyAwayFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster14StateSCFlyAwayFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255744 diff --git a/asm/src/StateSCHide.s b/asm/src/StateSCHide.s index 013e87dd..25198ddb 100644 --- a/asm/src/StateSCHide.s +++ b/asm/src/StateSCHide.s @@ -109,9 +109,9 @@ procFixPos__Q53scn4step4boss15challengemaster11StateSCHideFv: __vt__Q53scn4step4boss15challengemaster11StateSCHide: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster11StateSCHideFv - .byte4 procAnim__Q53scn4step4boss15challengemaster11StateSCHideFv - .byte4 procMove__Q53scn4step4boss15challengemaster11StateSCHideFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster11StateSCHideFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster11StateSCHideFv + .4byte procAnim__Q53scn4step4boss15challengemaster11StateSCHideFv + .4byte procMove__Q53scn4step4boss15challengemaster11StateSCHideFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster11StateSCHideFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateSCLookFar.s b/asm/src/StateSCLookFar.s index ad00ce4a..e5e88c82 100644 --- a/asm/src/StateSCLookFar.s +++ b/asm/src/StateSCLookFar.s @@ -168,15 +168,15 @@ __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCLookFar$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCLookFar$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCLookFar$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCLookFar$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCLookFar$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster14StateSCLookFar __vt__Q53scn4step4boss15challengemaster14StateSCLookFar: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster14StateSCLookFarFv - .byte4 procAnim__Q53scn4step4boss15challengemaster14StateSCLookFarFv - .byte4 procMove__Q53scn4step4boss15challengemaster14StateSCLookFarFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster14StateSCLookFarFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster14StateSCLookFarFv + .4byte procAnim__Q53scn4step4boss15challengemaster14StateSCLookFarFv + .4byte procMove__Q53scn4step4boss15challengemaster14StateSCLookFarFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster14StateSCLookFarFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateSCLookKirby.s b/asm/src/StateSCLookKirby.s index a0a7c288..1fb871e7 100644 --- a/asm/src/StateSCLookKirby.s +++ b/asm/src/StateSCLookKirby.s @@ -318,24 +318,24 @@ __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengem __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCPursuit$$4PQ43scn4step4boss4Boss$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCPursuit$$4PQ43scn4step4boss4Boss$$4b$$1Fv - .byte4 create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCPursuit$$4PQ43scn4step4boss4Boss$$4b$$1Fv + .4byte __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCPursuit$$4PQ43scn4step4boss4Boss$$4b$$1Fv + .4byte create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCPursuit$$4PQ43scn4step4boss4Boss$$4b$$1Fv .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster16StateSCLookKirby$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster16StateSCLookKirby$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster16StateSCLookKirby$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster16StateSCLookKirby$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster16StateSCLookKirby$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster16StateSCLookKirby$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster16StateSCLookKirby __vt__Q53scn4step4boss15challengemaster16StateSCLookKirby: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster16StateSCLookKirbyFv - .byte4 procAnim__Q53scn4step4boss15challengemaster16StateSCLookKirbyFv - .byte4 procMove__Q53scn4step4boss15challengemaster16StateSCLookKirbyFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster16StateSCLookKirbyFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster16StateSCLookKirbyFv + .4byte procAnim__Q53scn4step4boss15challengemaster16StateSCLookKirbyFv + .4byte procMove__Q53scn4step4boss15challengemaster16StateSCLookKirbyFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster16StateSCLookKirbyFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255360 diff --git a/asm/src/StateSCPursuit.s b/asm/src/StateSCPursuit.s index 73e7ec39..4613a85c 100644 --- a/asm/src/StateSCPursuit.s +++ b/asm/src/StateSCPursuit.s @@ -309,12 +309,12 @@ procFixPos__Q53scn4step4boss15challengemaster14StateSCPursuitFv: __vt__Q53scn4step4boss15challengemaster14StateSCPursuit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster14StateSCPursuitFv - .byte4 procAnim__Q53scn4step4boss15challengemaster14StateSCPursuitFv - .byte4 procMove__Q53scn4step4boss15challengemaster14StateSCPursuitFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster14StateSCPursuitFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster14StateSCPursuitFv + .4byte procAnim__Q53scn4step4boss15challengemaster14StateSCPursuitFv + .4byte procMove__Q53scn4step4boss15challengemaster14StateSCPursuitFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster14StateSCPursuitFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256097 diff --git a/asm/src/StateSelect.s b/asm/src/StateSelect.s index e7f2cbae..0a3bbf2e 100644 --- a/asm/src/StateSelect.s +++ b/asm/src/StateSelect.s @@ -953,5 +953,5 @@ lbl_8035E29C: __vt__Q53scn4step4hero8inactive11StateSelect: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero8inactive11StateSelectFv - .byte4 proc__Q53scn4step4hero8inactive11StateSelectFv + .4byte __dt__Q53scn4step4hero8inactive11StateSelectFv + .4byte proc__Q53scn4step4hero8inactive11StateSelectFv diff --git a/asm/src/StateShipRepairDemo.s b/asm/src/StateShipRepairDemo.s index ffa9c3d1..803d9c96 100644 --- a/asm/src/StateShipRepairDemo.s +++ b/asm/src/StateShipRepairDemo.s @@ -395,13 +395,13 @@ procFixPos__Q53scn4step4hero6common19StateShipRepairDemoFv: __vt__Q53scn4step4hero6common19StateShipRepairDemo: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common19StateShipRepairDemoFv - .byte4 procAnim__Q53scn4step4hero6common19StateShipRepairDemoFv - .byte4 procMove__Q53scn4step4hero6common19StateShipRepairDemoFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common19StateShipRepairDemoFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common19StateShipRepairDemoFv + .4byte procAnim__Q53scn4step4hero6common19StateShipRepairDemoFv + .4byte procMove__Q53scn4step4hero6common19StateShipRepairDemoFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common19StateShipRepairDemoFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateShipRepairDemoAfter.s b/asm/src/StateShipRepairDemoAfter.s index 6b5b62a5..e2e1df43 100644 --- a/asm/src/StateShipRepairDemoAfter.s +++ b/asm/src/StateShipRepairDemoAfter.s @@ -261,13 +261,13 @@ lbl_803694DC: __vt__Q53scn4step4hero6common24StateShipRepairDemoAfter: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common24StateShipRepairDemoAfterFv - .byte4 procAnim__Q53scn4step4hero6common24StateShipRepairDemoAfterFv - .byte4 procMove__Q53scn4step4hero6common24StateShipRepairDemoAfterFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common24StateShipRepairDemoAfterFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common24StateShipRepairDemoAfterFv + .4byte procAnim__Q53scn4step4hero6common24StateShipRepairDemoAfterFv + .4byte procMove__Q53scn4step4hero6common24StateShipRepairDemoAfterFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common24StateShipRepairDemoAfterFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateShipRepairDemoAfterFollow.s b/asm/src/StateShipRepairDemoAfterFollow.s index 417984c2..a5d9a583 100644 --- a/asm/src/StateShipRepairDemoAfterFollow.s +++ b/asm/src/StateShipRepairDemoAfterFollow.s @@ -423,13 +423,13 @@ T_DEPTH_LIST3__44$$2unnamed$$2StateShipRepairDemoAfterFollow_cpp$$2: __vt__Q53scn4step4hero6common30StateShipRepairDemoAfterFollow: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common30StateShipRepairDemoAfterFollowFv - .byte4 procAnim__Q53scn4step4hero6common30StateShipRepairDemoAfterFollowFv - .byte4 procMove__Q53scn4step4hero6common30StateShipRepairDemoAfterFollowFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common30StateShipRepairDemoAfterFollowFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common30StateShipRepairDemoAfterFollowFv + .4byte procAnim__Q53scn4step4hero6common30StateShipRepairDemoAfterFollowFv + .4byte procMove__Q53scn4step4hero6common30StateShipRepairDemoAfterFollowFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common30StateShipRepairDemoAfterFollowFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateShipRepairDemoFollow.s b/asm/src/StateShipRepairDemoFollow.s index 2558614a..ccfb7199 100644 --- a/asm/src/StateShipRepairDemoFollow.s +++ b/asm/src/StateShipRepairDemoFollow.s @@ -439,13 +439,13 @@ ROT_LIST__39$$2unnamed$$2StateShipRepairDemoFollow_cpp$$2: __vt__Q53scn4step4hero6common25StateShipRepairDemoFollow: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common25StateShipRepairDemoFollowFv - .byte4 procAnim__Q53scn4step4hero6common25StateShipRepairDemoFollowFv - .byte4 procMove__Q53scn4step4hero6common25StateShipRepairDemoFollowFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common25StateShipRepairDemoFollowFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common25StateShipRepairDemoFollowFv + .4byte procAnim__Q53scn4step4hero6common25StateShipRepairDemoFollowFv + .4byte procMove__Q53scn4step4hero6common25StateShipRepairDemoFollowFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common25StateShipRepairDemoFollowFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateShot.s b/asm/src/StateShot.s index e4cb14d9..49d44d8b 100644 --- a/asm/src/StateShot.s +++ b/asm/src/StateShot.s @@ -3107,115 +3107,115 @@ lbl_8039E640: __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateShot$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateShot$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateShot$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateShot$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateShot$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster9StateShot __vt__Q53scn4step4boss15challengemaster9StateShot: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster9StateShotFv - .byte4 procAnim__Q53scn4step4boss15challengemaster9StateShotFv - .byte4 procMove__Q53scn4step4boss15challengemaster9StateShotFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster9StateShotFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster9StateShotFv + .4byte procAnim__Q53scn4step4boss15challengemaster9StateShotFv + .4byte procMove__Q53scn4step4boss15challengemaster9StateShotFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster9StateShotFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior9StateShot __vt__Q53scn4step4boss6dubior9StateShot: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6dubior9StateShotFv - .byte4 procAnim__Q53scn4step4boss6dubior9StateShotFv - .byte4 procMove__Q53scn4step4boss6dubior9StateShotFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6dubior9StateShotFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6dubior9StateShotFv + .4byte procAnim__Q53scn4step4boss6dubior9StateShotFv + .4byte procMove__Q53scn4step4boss6dubior9StateShotFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6dubior9StateShotFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss10gigantedge9StateShot __vt__Q53scn4step4boss10gigantedge9StateShot: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss10gigantedge9StateShotFv - .byte4 procAnim__Q53scn4step4boss10gigantedge9StateShotFv - .byte4 procMove__Q53scn4step4boss10gigantedge9StateShotFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss10gigantedge9StateShotFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss10gigantedge9StateShotFv + .4byte procAnim__Q53scn4step4boss10gigantedge9StateShotFv + .4byte procMove__Q53scn4step4boss10gigantedge9StateShotFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss10gigantedge9StateShotFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11bonkersbomb9StateShot __vt__Q53scn4step5enemy11bonkersbomb9StateShot: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11bonkersbomb9StateShotFv - .byte4 procAnim__Q53scn4step5enemy11bonkersbomb9StateShotFv - .byte4 procMove__Q53scn4step5enemy11bonkersbomb9StateShotFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11bonkersbomb9StateShotFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11bonkersbomb9StateShotFv + .4byte procAnim__Q53scn4step5enemy11bonkersbomb9StateShotFv + .4byte procMove__Q53scn4step5enemy11bonkersbomb9StateShotFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11bonkersbomb9StateShotFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11dubiorspark9StateShot __vt__Q53scn4step5enemy11dubiorspark9StateShot: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11dubiorspark9StateShotFv - .byte4 procAnim__Q53scn4step5enemy11dubiorspark9StateShotFv - .byte4 procMove__Q53scn4step5enemy11dubiorspark9StateShotFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11dubiorspark9StateShotFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11dubiorspark9StateShotFv + .4byte procAnim__Q53scn4step5enemy11dubiorspark9StateShotFv + .4byte procMove__Q53scn4step5enemy11dubiorspark9StateShotFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11dubiorspark9StateShotFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy14poppybrojrbomb9StateShot __vt__Q53scn4step5enemy14poppybrojrbomb9StateShot: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy14poppybrojrbomb9StateShotFv - .byte4 procAnim__Q53scn4step5enemy14poppybrojrbomb9StateShotFv - .byte4 procMove__Q53scn4step5enemy14poppybrojrbomb9StateShotFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy14poppybrojrbomb9StateShotFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy14poppybrojrbomb9StateShotFv + .4byte procAnim__Q53scn4step5enemy14poppybrojrbomb9StateShotFv + .4byte procMove__Q53scn4step5enemy14poppybrojrbomb9StateShotFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy14poppybrojrbomb9StateShotFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo9StateShot __vt__Q53scn4step5enemy6shotzo9StateShot: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6shotzo9StateShotFv - .byte4 procAnim__Q53scn4step5enemy6shotzo9StateShotFv - .byte4 procMove__Q53scn4step5enemy6shotzo9StateShotFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6shotzo9StateShotFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6shotzo9StateShotFv + .4byte procAnim__Q53scn4step5enemy6shotzo9StateShotFv + .4byte procMove__Q53scn4step5enemy6shotzo9StateShotFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6shotzo9StateShotFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5spark9StateShot$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5spark9StateShot$$4PQ43scn4step4hero4Hero$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5spark9StateShot$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv - .byte4 create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5spark9StateShot$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5spark9StateShot$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5spark9StateShot$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q53scn4step4hero5spark9StateShot __vt__Q53scn4step4hero5spark9StateShot: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5spark9StateShotFv - .byte4 procAnim__Q53scn4step4hero5spark9StateShotFv - .byte4 procMove__Q53scn4step4hero5spark9StateShotFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5spark9StateShotFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5spark9StateShotFv + .4byte procAnim__Q53scn4step4hero5spark9StateShotFv + .4byte procMove__Q53scn4step4hero5spark9StateShotFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5spark9StateShotFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -3223,19 +3223,19 @@ __vt__Q53scn4step4hero5spark9StateShot: __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateShot$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateShot$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateShot$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateShot$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateShot$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4wing9StateShot __vt__Q53scn4step4hero4wing9StateShot: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4wing9StateShotFv - .byte4 procAnim__Q53scn4step4hero4wing9StateShotFv - .byte4 procMove__Q53scn4step4hero4wing9StateShotFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4wing9StateShotFv - .byte4 procObjCollReact__Q53scn4step4hero4wing9StateShotFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4wing9StateShotFv + .4byte procAnim__Q53scn4step4hero4wing9StateShotFv + .4byte procMove__Q53scn4step4hero4wing9StateShotFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4wing9StateShotFv + .4byte procObjCollReact__Q53scn4step4hero4wing9StateShotFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -3243,13 +3243,13 @@ __vt__Q53scn4step4hero4wing9StateShot: __vt__Q53scn4step4hero7fighter9StateShot: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter9StateShotFv - .byte4 procAnim__Q53scn4step4hero7fighter9StateShotFv - .byte4 procMove__Q53scn4step4hero7fighter9StateShotFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter9StateShotFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter9StateShotFv + .4byte procAnim__Q53scn4step4hero7fighter9StateShotFv + .4byte procMove__Q53scn4step4hero7fighter9StateShotFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter9StateShotFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateShotAirBall.s b/asm/src/StateShotAirBall.s index 384404d7..88bff481 100644 --- a/asm/src/StateShotAirBall.s +++ b/asm/src/StateShotAirBall.s @@ -358,13 +358,13 @@ procFixPos__Q53scn4step4hero6common16StateShotAirBallFv: __vt__Q53scn4step4boss6whispy16StateShotAirBall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy16StateShotAirBallFv - .byte4 procAnim__Q53scn4step4boss6whispy20StateShotAirBallBaseFv - .byte4 procMove__Q53scn4step4boss6whispy20StateShotAirBallBaseFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy20StateShotAirBallBaseFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv - .byte4 reqAirBall__Q53scn4step4boss6whispy16StateShotAirBallFv + .4byte __dt__Q53scn4step4boss6whispy16StateShotAirBallFv + .4byte procAnim__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .4byte procMove__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte reqAirBall__Q53scn4step4boss6whispy16StateShotAirBallFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -372,13 +372,13 @@ __vt__Q53scn4step4boss6whispy16StateShotAirBall: __vt__Q53scn4step4hero6common16StateShotAirBall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common16StateShotAirBallFv - .byte4 procAnim__Q53scn4step4hero6common16StateShotAirBallFv - .byte4 procMove__Q53scn4step4hero6common16StateShotAirBallFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common16StateShotAirBallFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common16StateShotAirBallFv + .4byte procAnim__Q53scn4step4hero6common16StateShotAirBallFv + .4byte procMove__Q53scn4step4hero6common16StateShotAirBallFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common16StateShotAirBallFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateShotAirBallBase.s b/asm/src/StateShotAirBallBase.s index cf33f016..2320871a 100644 --- a/asm/src/StateShotAirBallBase.s +++ b/asm/src/StateShotAirBallBase.s @@ -154,11 +154,11 @@ procFixPos__Q53scn4step4boss6whispy20StateShotAirBallBaseFv: __vt__Q53scn4step4boss6whispy20StateShotAirBallBase: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy20StateShotAirBallBaseFv - .byte4 procAnim__Q53scn4step4boss6whispy20StateShotAirBallBaseFv - .byte4 procMove__Q53scn4step4boss6whispy20StateShotAirBallBaseFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy20StateShotAirBallBaseFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .4byte procAnim__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .4byte procMove__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .4byte 0 .4byte 0 diff --git a/asm/src/StateShotAirBallBig.s b/asm/src/StateShotAirBallBig.s index af8dbd41..5a0fb770 100644 --- a/asm/src/StateShotAirBallBig.s +++ b/asm/src/StateShotAirBallBig.s @@ -218,11 +218,11 @@ __dt__Q53scn4step4boss6whispy19StateShotAirBallBigFv: __vt__Q53scn4step4boss6whispy19StateShotAirBallBig: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy19StateShotAirBallBigFv - .byte4 procAnim__Q53scn4step4boss6whispy20StateShotAirBallBaseFv - .byte4 procMove__Q53scn4step4boss6whispy20StateShotAirBallBaseFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy20StateShotAirBallBaseFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv - .byte4 reqAirBall__Q53scn4step4boss6whispy19StateShotAirBallBigFv + .4byte __dt__Q53scn4step4boss6whispy19StateShotAirBallBigFv + .4byte procAnim__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .4byte procMove__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte reqAirBall__Q53scn4step4boss6whispy19StateShotAirBallBigFv .4byte 0 diff --git a/asm/src/StateShotAirBallTornado.s b/asm/src/StateShotAirBallTornado.s index bce934f5..37e5f07a 100644 --- a/asm/src/StateShotAirBallTornado.s +++ b/asm/src/StateShotAirBallTornado.s @@ -156,13 +156,13 @@ __dt__Q53scn4step4boss6whispy23StateShotAirBallTornadoFv: __vt__Q53scn4step4boss6whispy23StateShotAirBallTornado: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy23StateShotAirBallTornadoFv - .byte4 procAnim__Q53scn4step4boss6whispy20StateShotAirBallBaseFv - .byte4 procMove__Q53scn4step4boss6whispy20StateShotAirBallBaseFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy20StateShotAirBallBaseFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv - .byte4 reqAirBall__Q53scn4step4boss6whispy23StateShotAirBallTornadoFv + .4byte __dt__Q53scn4step4boss6whispy23StateShotAirBallTornadoFv + .4byte procAnim__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .4byte procMove__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte reqAirBall__Q53scn4step4boss6whispy23StateShotAirBallTornadoFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateShuttleLoop.s b/asm/src/StateShuttleLoop.s index c1d088d4..3f1b620c 100644 --- a/asm/src/StateShuttleLoop.s +++ b/asm/src/StateShuttleLoop.s @@ -663,49 +663,49 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateS __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta14StateGlideAway$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta14StateGlideAway$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta14StateGlideAway$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta14StateGlideAway$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta14StateGlideAway$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta16StateShuttleLoop$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta16StateShuttleLoop$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta16StateShuttleLoop$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta16StateShuttleLoop$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta16StateShuttleLoop$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta16StateShuttleLoop$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss10creditmeta16StateShuttleLoop __vt__Q53scn4step4boss10creditmeta16StateShuttleLoop: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss10creditmeta16StateShuttleLoopFv - .byte4 procAnim__Q53scn4step4boss10creditmeta16StateShuttleLoopFv - .byte4 procMove__Q53scn4step4boss10creditmeta16StateShuttleLoopFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss10creditmeta16StateShuttleLoopFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss10creditmeta16StateShuttleLoopFv + .4byte procAnim__Q53scn4step4boss10creditmeta16StateShuttleLoopFv + .4byte procMove__Q53scn4step4boss10creditmeta16StateShuttleLoopFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss10creditmeta16StateShuttleLoopFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateShuttleLoopEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateShuttleLoopEnd$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateShuttleLoopEnd$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateShuttleLoopEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateShuttleLoopEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateShuttleLoopEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateShuttleLoop$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateShuttleLoop$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateShuttleLoop$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateShuttleLoop$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateShuttleLoop$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateShuttleLoop$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4wing16StateShuttleLoop __vt__Q53scn4step4hero4wing16StateShuttleLoop: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4wing16StateShuttleLoopFv - .byte4 procAnim__Q53scn4step4hero4wing16StateShuttleLoopFv - .byte4 procMove__Q53scn4step4hero4wing16StateShuttleLoopFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4wing16StateShuttleLoopFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4wing16StateShuttleLoopFv + .4byte procAnim__Q53scn4step4hero4wing16StateShuttleLoopFv + .4byte procMove__Q53scn4step4hero4wing16StateShuttleLoopFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4wing16StateShuttleLoopFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateShuttleLoopEnd.s b/asm/src/StateShuttleLoopEnd.s index e521ae21..8b12856a 100644 --- a/asm/src/StateShuttleLoopEnd.s +++ b/asm/src/StateShuttleLoopEnd.s @@ -191,11 +191,11 @@ procFixPos__Q53scn4step4hero4wing19StateShuttleLoopEndFv: __vt__Q53scn4step4hero4wing19StateShuttleLoopEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4wing19StateShuttleLoopEndFv - .byte4 procAnim__Q53scn4step4hero4wing19StateShuttleLoopEndFv - .byte4 procMove__Q53scn4step4hero4wing19StateShuttleLoopEndFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4wing19StateShuttleLoopEndFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4wing19StateShuttleLoopEndFv + .4byte procAnim__Q53scn4step4hero4wing19StateShuttleLoopEndFv + .4byte procMove__Q53scn4step4hero4wing19StateShuttleLoopEndFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4wing19StateShuttleLoopEndFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSkinned.s b/asm/src/StateSkinned.s index b59feda5..d8ff6240 100644 --- a/asm/src/StateSkinned.s +++ b/asm/src/StateSkinned.s @@ -319,9 +319,9 @@ lbl_802A3900: __vt__Q53scn4step5enemy5cappy12StateSkinned: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5cappy12StateSkinnedFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy5cappy12StateSkinnedFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5cappy12StateSkinnedFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5cappy12StateSkinnedFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy5cappy12StateSkinnedFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5cappy12StateSkinnedFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateSkyKick.s b/asm/src/StateSkyKick.s index 86fe4345..a93b33a4 100644 --- a/asm/src/StateSkyKick.s +++ b/asm/src/StateSkyKick.s @@ -314,23 +314,23 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15Sta __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateSkyKickHit$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateSkyKickHit$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateSkyKickHit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateSkyKickHit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateSkyKickHit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter12StateSkyKick$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter12StateSkyKick$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter12StateSkyKick$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter12StateSkyKick$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter12StateSkyKick$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter12StateSkyKick$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7fighter12StateSkyKick __vt__Q53scn4step4hero7fighter12StateSkyKick: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter12StateSkyKickFv - .byte4 procAnim__Q53scn4step4hero7fighter12StateSkyKickFv - .byte4 procMove__Q53scn4step4hero7fighter12StateSkyKickFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter12StateSkyKickFv - .byte4 procObjCollReact__Q53scn4step4hero7fighter12StateSkyKickFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter12StateSkyKickFv + .4byte procAnim__Q53scn4step4hero7fighter12StateSkyKickFv + .4byte procMove__Q53scn4step4hero7fighter12StateSkyKickFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter12StateSkyKickFv + .4byte procObjCollReact__Q53scn4step4hero7fighter12StateSkyKickFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSkyKickHit.s b/asm/src/StateSkyKickHit.s index c54c5c5e..68aa791a 100644 --- a/asm/src/StateSkyKickHit.s +++ b/asm/src/StateSkyKickHit.s @@ -272,13 +272,13 @@ procFixPos__Q53scn4step4hero7fighter15StateSkyKickHitFv: __vt__Q53scn4step4hero7fighter15StateSkyKickHit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter15StateSkyKickHitFv - .byte4 procAnim__Q53scn4step4hero7fighter15StateSkyKickHitFv - .byte4 procMove__Q53scn4step4hero7fighter15StateSkyKickHitFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter15StateSkyKickHitFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter15StateSkyKickHitFv + .4byte procAnim__Q53scn4step4hero7fighter15StateSkyKickHitFv + .4byte procMove__Q53scn4step4hero7fighter15StateSkyKickHitFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter15StateSkyKickHitFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSlant.s b/asm/src/StateSlant.s index 753c5f32..275f96d6 100644 --- a/asm/src/StateSlant.s +++ b/asm/src/StateSlant.s @@ -273,12 +273,12 @@ lbl_802F3468: __vt__Q53scn4step5enemy15zankibblecutter10StateSlant: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy15zankibblecutter10StateSlantFv - .byte4 procAnim__Q53scn4step5enemy15zankibblecutter10StateSlantFv - .byte4 procMove__Q53scn4step5enemy15zankibblecutter10StateSlantFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy15zankibblecutter10StateSlantFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy15zankibblecutter10StateSlantFv + .4byte procAnim__Q53scn4step5enemy15zankibblecutter10StateSlantFv + .4byte procMove__Q53scn4step5enemy15zankibblecutter10StateSlantFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy15zankibblecutter10StateSlantFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256064 diff --git a/asm/src/StateSliding.s b/asm/src/StateSliding.s index f5548701..46973f16 100644 --- a/asm/src/StateSliding.s +++ b/asm/src/StateSliding.s @@ -486,25 +486,25 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15Stat __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSlidingHit$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSlidingHit$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSlidingHit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSlidingHit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSlidingHit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateSliding$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateSliding$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateSliding$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateSliding$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateSliding$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateSliding$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common12StateSliding __vt__Q53scn4step4hero6common12StateSliding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common12StateSlidingFv - .byte4 procAnim__Q53scn4step4hero6common12StateSlidingFv - .byte4 procMove__Q53scn4step4hero6common12StateSlidingFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common12StateSlidingFv - .byte4 procObjCollReact__Q53scn4step4hero6common12StateSlidingFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common12StateSlidingFv + .4byte procAnim__Q53scn4step4hero6common12StateSlidingFv + .4byte procMove__Q53scn4step4hero6common12StateSlidingFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common12StateSlidingFv + .4byte procObjCollReact__Q53scn4step4hero6common12StateSlidingFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSlidingHit.s b/asm/src/StateSlidingHit.s index 61f23ed9..6f43f038 100644 --- a/asm/src/StateSlidingHit.s +++ b/asm/src/StateSlidingHit.s @@ -154,13 +154,13 @@ procFixPos__Q53scn4step4hero6common15StateSlidingHitFv: __vt__Q53scn4step4hero6common15StateSlidingHit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common15StateSlidingHitFv - .byte4 procAnim__Q53scn4step4hero6common15StateSlidingHitFv - .byte4 procMove__Q53scn4step4hero6common15StateSlidingHitFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common15StateSlidingHitFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common15StateSlidingHitFv + .4byte procAnim__Q53scn4step4hero6common15StateSlidingHitFv + .4byte procMove__Q53scn4step4hero6common15StateSlidingHitFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common15StateSlidingHitFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSlip.s b/asm/src/StateSlip.s index d0b8c07d..e28029fd 100644 --- a/asm/src/StateSlip.s +++ b/asm/src/StateSlip.s @@ -479,13 +479,13 @@ lbl_80391514: __vt__Q53scn4step4hero5stone9StateSlip: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5stone9StateSlipFv - .byte4 procAnim__Q53scn4step4hero5stone9StateSlipFv - .byte4 procMove__Q53scn4step4hero5stone9StateSlipFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5stone9StateSlipFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5stone9StateSlipFv + .4byte procAnim__Q53scn4step4hero5stone9StateSlipFv + .4byte procMove__Q53scn4step4hero5stone9StateSlipFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5stone9StateSlipFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSlope.s b/asm/src/StateSlope.s index e952b547..1aded730 100644 --- a/asm/src/StateSlope.s +++ b/asm/src/StateSlope.s @@ -293,12 +293,12 @@ lbl_802D5228: __vt__Q53scn4step5enemy5rocky10StateSlope: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5rocky10StateSlopeFv - .byte4 procAnim__Q53scn4step5enemy5rocky10StateSlopeFv - .byte4 procMove__Q53scn4step5enemy5rocky10StateSlopeFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5rocky10StateSlopeFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5rocky10StateSlopeFv + .4byte procAnim__Q53scn4step5enemy5rocky10StateSlopeFv + .4byte procMove__Q53scn4step5enemy5rocky10StateSlopeFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5rocky10StateSlopeFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256183 diff --git a/asm/src/StateSmash.s b/asm/src/StateSmash.s index 6ded9ee1..c98bcfeb 100644 --- a/asm/src/StateSmash.s +++ b/asm/src/StateSmash.s @@ -157,13 +157,13 @@ createWeapon__Q53scn4step4hero7fighter10StateSmashFv: __vt__Q53scn4step4hero7fighter10StateSmash: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter10StateSmashFv - .byte4 procAnim__Q53scn4step4hero7fighter10StateSmashFv - .byte4 procMove__Q53scn4step4hero7fighter10StateSmashFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter10StateSmashFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter10StateSmashFv + .4byte procAnim__Q53scn4step4hero7fighter10StateSmashFv + .4byte procMove__Q53scn4step4hero7fighter10StateSmashFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter10StateSmashFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSmashKick.s b/asm/src/StateSmashKick.s index def14f40..5e28aad9 100644 --- a/asm/src/StateSmashKick.s +++ b/asm/src/StateSmashKick.s @@ -220,11 +220,11 @@ procFixPos__Q53scn4step4hero5smash14StateSmashKickFv: __vt__Q53scn4step4hero5smash14StateSmashKick: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5smash14StateSmashKickFv - .byte4 procAnim__Q53scn4step4hero5smash14StateSmashKickFv - .byte4 procMove__Q53scn4step4hero5smash14StateSmashKickFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5smash14StateSmashKickFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5smash14StateSmashKickFv + .4byte procAnim__Q53scn4step4hero5smash14StateSmashKickFv + .4byte procMove__Q53scn4step4hero5smash14StateSmashKickFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5smash14StateSmashKickFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSmashKickCharge.s b/asm/src/StateSmashKickCharge.s index e162dd9f..76de76f8 100644 --- a/asm/src/StateSmashKickCharge.s +++ b/asm/src/StateSmashKickCharge.s @@ -251,23 +251,23 @@ __dt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5smash14Stat __vt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5smash14StateSmashKick$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero5smash11ChargeLevel$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5smash14StateSmashKick$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero5smash11ChargeLevel$$1Fv - .byte4 create__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5smash14StateSmashKick$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero5smash11ChargeLevel$$1Fv + .4byte __dt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5smash14StateSmashKick$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero5smash11ChargeLevel$$1Fv + .4byte create__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5smash14StateSmashKick$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero5smash11ChargeLevel$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateSmashKickCharge$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateSmashKickCharge$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateSmashKickCharge$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateSmashKickCharge$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateSmashKickCharge$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateSmashKickCharge$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5smash20StateSmashKickCharge __vt__Q53scn4step4hero5smash20StateSmashKickCharge: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5smash20StateSmashKickChargeFv - .byte4 procAnim__Q53scn4step4hero5smash20StateSmashKickChargeFv - .byte4 procMove__Q53scn4step4hero5smash20StateSmashKickChargeFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5smash20StateSmashKickChargeFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5smash20StateSmashKickChargeFv + .4byte procAnim__Q53scn4step4hero5smash20StateSmashKickChargeFv + .4byte procMove__Q53scn4step4hero5smash20StateSmashKickChargeFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5smash20StateSmashKickChargeFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSmashed.s b/asm/src/StateSmashed.s index ce3f4daa..abdf68a2 100644 --- a/asm/src/StateSmashed.s +++ b/asm/src/StateSmashed.s @@ -794,36 +794,36 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5sheld12StateSmashed __vt__Q53scn4step5enemy5sheld12StateSmashed: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5sheld12StateSmashedFv - .byte4 procAnim__Q53scn4step5enemy5sheld12StateSmashedFv - .byte4 procMove__Q53scn4step5enemy5sheld12StateSmashedFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5sheld12StateSmashedFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5sheld12StateSmashedFv + .4byte procAnim__Q53scn4step5enemy5sheld12StateSmashedFv + .4byte procMove__Q53scn4step5enemy5sheld12StateSmashedFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5sheld12StateSmashedFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee12StateSmashed __vt__Q53scn4step5enemy9waddledee12StateSmashed: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledee12StateSmashedFv - .byte4 procAnim__Q53scn4step5enemy9waddledee12StateSmashedFv - .byte4 procMove__Q53scn4step5enemy9waddledee12StateSmashedFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9waddledee12StateSmashedFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9waddledee12StateSmashedFv + .4byte procAnim__Q53scn4step5enemy9waddledee12StateSmashedFv + .4byte procMove__Q53scn4step5enemy9waddledee12StateSmashedFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9waddledee12StateSmashedFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256802 diff --git a/asm/src/StateSmashedEnd.s b/asm/src/StateSmashedEnd.s index 48b1423a..2a28c912 100644 --- a/asm/src/StateSmashedEnd.s +++ b/asm/src/StateSmashedEnd.s @@ -432,24 +432,24 @@ procFixPos__Q53scn4step5enemy9waddledee15StateSmashedEndFv: __vt__Q53scn4step5enemy5sheld15StateSmashedEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5sheld15StateSmashedEndFv - .byte4 procAnim__Q53scn4step5enemy5sheld15StateSmashedEndFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5sheld15StateSmashedEndFv + .4byte procAnim__Q53scn4step5enemy5sheld15StateSmashedEndFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledee15StateSmashedEnd __vt__Q53scn4step5enemy9waddledee15StateSmashedEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledee15StateSmashedEndFv - .byte4 procAnim__Q53scn4step5enemy9waddledee15StateSmashedEndFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9waddledee15StateSmashedEndFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9waddledee15StateSmashedEndFv + .4byte procAnim__Q53scn4step5enemy9waddledee15StateSmashedEndFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9waddledee15StateSmashedEndFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256208 diff --git a/asm/src/StateSpaceJump.s b/asm/src/StateSpaceJump.s index fe887b7d..c17e9ce2 100644 --- a/asm/src/StateSpaceJump.s +++ b/asm/src/StateSpaceJump.s @@ -1049,13 +1049,13 @@ init__Q53scn4step4hero12interference14StateSpaceJumpFv: __vt__Q53scn4step4hero12interference14StateSpaceJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero12interference14StateSpaceJumpFv - .byte4 procAnim__Q53scn4step4hero12interference14StateSpaceJumpFv - .byte4 procMove__Q53scn4step4hero12interference14StateSpaceJumpFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero12interference14StateSpaceJumpFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero12interference14StateSpaceJumpFv + .4byte procAnim__Q53scn4step4hero12interference14StateSpaceJumpFv + .4byte procMove__Q53scn4step4hero12interference14StateSpaceJumpFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero12interference14StateSpaceJumpFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSparkLv1.s b/asm/src/StateSparkLv1.s index 307f1310..bd7c6cbc 100644 --- a/asm/src/StateSparkLv1.s +++ b/asm/src/StateSparkLv1.s @@ -144,13 +144,13 @@ procFixPos__Q53scn4step4hero6damage13StateSparkLv1Fv: __vt__Q53scn4step4hero6damage13StateSparkLv1: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6damage13StateSparkLv1Fv - .byte4 procAnim__Q53scn4step4hero6damage13StateSparkLv1Fv - .byte4 procMove__Q53scn4step4hero6damage13StateSparkLv1Fv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6damage13StateSparkLv1Fv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6damage13StateSparkLv1Fv + .4byte procAnim__Q53scn4step4hero6damage13StateSparkLv1Fv + .4byte procMove__Q53scn4step4hero6damage13StateSparkLv1Fv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6damage13StateSparkLv1Fv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSparkLv2.s b/asm/src/StateSparkLv2.s index 74ef8d89..c2c5026c 100644 --- a/asm/src/StateSparkLv2.s +++ b/asm/src/StateSparkLv2.s @@ -339,13 +339,13 @@ lbl_80377B94: __vt__Q53scn4step4hero6damage13StateSparkLv2: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6damage13StateSparkLv2Fv - .byte4 procAnim__Q53scn4step4hero6damage13StateSparkLv2Fv - .byte4 procMove__Q53scn4step4hero6damage13StateSparkLv2Fv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6damage13StateSparkLv2Fv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6damage13StateSparkLv2Fv + .4byte procAnim__Q53scn4step4hero6damage13StateSparkLv2Fv + .4byte procMove__Q53scn4step4hero6damage13StateSparkLv2Fv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6damage13StateSparkLv2Fv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSparkLv3.s b/asm/src/StateSparkLv3.s index 0fd5b5d2..beeb296a 100644 --- a/asm/src/StateSparkLv3.s +++ b/asm/src/StateSparkLv3.s @@ -259,13 +259,13 @@ procFixPos__Q53scn4step4hero6damage13StateSparkLv3Fv: __vt__Q53scn4step4hero6damage13StateSparkLv3: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6damage13StateSparkLv3Fv - .byte4 procAnim__Q53scn4step4hero6damage13StateSparkLv3Fv - .byte4 procMove__Q53scn4step4hero6damage13StateSparkLv3Fv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6damage13StateSparkLv3Fv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6damage13StateSparkLv3Fv + .4byte procAnim__Q53scn4step4hero6damage13StateSparkLv3Fv + .4byte procMove__Q53scn4step4hero6damage13StateSparkLv3Fv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6damage13StateSparkLv3Fv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSpin.s b/asm/src/StateSpin.s index 6304e650..3f0afb85 100644 --- a/asm/src/StateSpin.s +++ b/asm/src/StateSpin.s @@ -715,37 +715,37 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6hammer10Stat __vt__Q53scn4step5enemy10knucklejoe9StateSpin: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10knucklejoe9StateSpinFv - .byte4 procAnim__Q53scn4step5enemy10knucklejoe9StateSpinFv - .byte4 procMove__Q53scn4step5enemy10knucklejoe9StateSpinFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10knucklejoe9StateSpinFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10knucklejoe9StateSpinFv + .4byte procAnim__Q53scn4step5enemy10knucklejoe9StateSpinFv + .4byte procMove__Q53scn4step5enemy10knucklejoe9StateSpinFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10knucklejoe9StateSpinFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6hammer10StateThrow$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6hammer10StateThrow$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6hammer10StateThrow$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6hammer10StateThrow$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6hammer10StateThrow$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6hammer10StateThrow$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6hammer9StateSpin$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6hammer9StateSpin$$4PQ43scn4step4hero4Hero$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6hammer9StateSpin$$4PQ43scn4step4hero4Hero$$4b$$1Fv - .byte4 create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6hammer9StateSpin$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6hammer9StateSpin$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6hammer9StateSpin$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero6hammer9StateSpin __vt__Q53scn4step4hero6hammer9StateSpin: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6hammer9StateSpinFv - .byte4 procAnim__Q53scn4step4hero6hammer9StateSpinFv - .byte4 procMove__Q53scn4step4hero6hammer9StateSpinFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6hammer9StateSpinFv - .byte4 procObjCollReact__Q53scn4step4hero6hammer9StateSpinFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6hammer9StateSpinFv + .4byte procAnim__Q53scn4step4hero6hammer9StateSpinFv + .4byte procMove__Q53scn4step4hero6hammer9StateSpinFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6hammer9StateSpinFv + .4byte procObjCollReact__Q53scn4step4hero6hammer9StateSpinFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSpinKick.s b/asm/src/StateSpinKick.s index 98a0b554..61f8e1cb 100644 --- a/asm/src/StateSpinKick.s +++ b/asm/src/StateSpinKick.s @@ -317,11 +317,11 @@ lbl_8039F494: __vt__Q53scn4step4hero7fighter13StateSpinKick: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter13StateSpinKickFv - .byte4 procAnim__Q53scn4step4hero7fighter13StateSpinKickFv - .byte4 procMove__Q53scn4step4hero7fighter13StateSpinKickFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter13StateSpinKickFv - .byte4 procObjCollReact__Q53scn4step4hero7fighter13StateSpinKickFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter13StateSpinKickFv + .4byte procAnim__Q53scn4step4hero7fighter13StateSpinKickFv + .4byte procMove__Q53scn4step4hero7fighter13StateSpinKickFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter13StateSpinKickFv + .4byte procObjCollReact__Q53scn4step4hero7fighter13StateSpinKickFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSpine.s b/asm/src/StateSpine.s index 0479a6c8..93e552a3 100644 --- a/asm/src/StateSpine.s +++ b/asm/src/StateSpine.s @@ -225,13 +225,13 @@ procFixPos__Q53scn4step4hero6damage10StateSpineFv: __vt__Q53scn4step4hero6damage10StateSpine: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6damage10StateSpineFv - .byte4 procAnim__Q53scn4step4hero6damage10StateSpineFv - .byte4 procMove__Q53scn4step4hero6damage10StateSpineFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6damage10StateSpineFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6damage10StateSpineFv + .4byte procAnim__Q53scn4step4hero6damage10StateSpineFv + .4byte procMove__Q53scn4step4hero6damage10StateSpineFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6damage10StateSpineFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSquashRoof.s b/asm/src/StateSquashRoof.s index ff4fb9d0..bc920176 100644 --- a/asm/src/StateSquashRoof.s +++ b/asm/src/StateSquashRoof.s @@ -288,19 +288,19 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15Stat __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashRoof$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashRoof$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashRoof$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashRoof$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashRoof$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common15StateSquashRoof __vt__Q53scn4step4hero6common15StateSquashRoof: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common15StateSquashRoofFv - .byte4 procAnim__Q53scn4step4hero6common15StateSquashRoofFv - .byte4 procMove__Q53scn4step4hero6common15StateSquashRoofFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common15StateSquashRoofFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common15StateSquashRoofFv + .4byte procAnim__Q53scn4step4hero6common15StateSquashRoofFv + .4byte procMove__Q53scn4step4hero6common15StateSquashRoofFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common15StateSquashRoofFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSquashWall.s b/asm/src/StateSquashWall.s index 271c894e..c01e1476 100644 --- a/asm/src/StateSquashWall.s +++ b/asm/src/StateSquashWall.s @@ -444,19 +444,19 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15Stat __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashWall$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashWall$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashWall$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashWall$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashWall$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common15StateSquashWall __vt__Q53scn4step4hero6common15StateSquashWall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common15StateSquashWallFv - .byte4 procAnim__Q53scn4step4hero6common15StateSquashWallFv - .byte4 procMove__Q53scn4step4hero6common15StateSquashWallFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common15StateSquashWallFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common15StateSquashWallFv + .4byte procAnim__Q53scn4step4hero6common15StateSquashWallFv + .4byte procMove__Q53scn4step4hero6common15StateSquashWallFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common15StateSquashWallFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSquat.s b/asm/src/StateSquat.s index 4542e4f1..432af8a9 100644 --- a/asm/src/StateSquat.s +++ b/asm/src/StateSquat.s @@ -361,19 +361,19 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10Stat __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateSquat$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateSquat$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateSquat$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateSquat$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateSquat$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common10StateSquat __vt__Q53scn4step4hero6common10StateSquat: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common10StateSquatFv - .byte4 procAnim__Q53scn4step4hero6common10StateSquatFv - .byte4 procMove__Q53scn4step4hero6common10StateSquatFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common10StateSquatFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common10StateSquatFv + .4byte procAnim__Q53scn4step4hero6common10StateSquatFv + .4byte procMove__Q53scn4step4hero6common10StateSquatFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common10StateSquatFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateStamp.s b/asm/src/StateStamp.s index 6b798c3a..604205bf 100644 --- a/asm/src/StateStamp.s +++ b/asm/src/StateStamp.s @@ -171,17 +171,17 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13Sta __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateStampHit$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateStampHit$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateStampHit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateStampHit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateStampHit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7fighter10StateStamp __vt__Q53scn4step4hero7fighter10StateStamp: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter10StateStampFv - .byte4 procAnim__Q53scn4step4hero7fighter10StateStampFv - .byte4 procMove__Q53scn4step4hero7fighter10StateStampFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter10StateStampFv - .byte4 procObjCollReact__Q53scn4step4hero7fighter10StateStampFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter10StateStampFv + .4byte procAnim__Q53scn4step4hero7fighter10StateStampFv + .4byte procMove__Q53scn4step4hero7fighter10StateStampFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter10StateStampFv + .4byte procObjCollReact__Q53scn4step4hero7fighter10StateStampFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateStampHit.s b/asm/src/StateStampHit.s index 9742ea1d..73b82ffb 100644 --- a/asm/src/StateStampHit.s +++ b/asm/src/StateStampHit.s @@ -202,13 +202,13 @@ procFixPos__Q53scn4step4hero7fighter13StateStampHitFv: __vt__Q53scn4step4hero7fighter13StateStampHit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter13StateStampHitFv - .byte4 procAnim__Q53scn4step4hero7fighter13StateStampHitFv - .byte4 procMove__Q53scn4step4hero7fighter13StateStampHitFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter13StateStampHitFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter13StateStampHitFv + .4byte procAnim__Q53scn4step4hero7fighter13StateStampHitFv + .4byte procMove__Q53scn4step4hero7fighter13StateStampHitFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter13StateStampHitFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateStartJump.s b/asm/src/StateStartJump.s index 57c833ab..7cf67b9c 100644 --- a/asm/src/StateStartJump.s +++ b/asm/src/StateStartJump.s @@ -237,11 +237,11 @@ lbl_8039185C: __vt__Q53scn4step4hero5stone14StateStartJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5stone14StateStartJumpFv - .byte4 procAnim__Q53scn4step4hero5stone14StateStartJumpFv - .byte4 procMove__Q53scn4step4hero5stone14StateStartJumpFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5stone14StateStartJumpFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5stone14StateStartJumpFv + .4byte procAnim__Q53scn4step4hero5stone14StateStartJumpFv + .4byte procMove__Q53scn4step4hero5stone14StateStartJumpFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5stone14StateStartJumpFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateStartWait.s b/asm/src/StateStartWait.s index 66d0ae54..839d52be 100644 --- a/asm/src/StateStartWait.s +++ b/asm/src/StateStartWait.s @@ -113,9 +113,9 @@ procFixPos__Q53scn4step4boss15challengemaster14StateStartWaitFv: __vt__Q53scn4step4boss15challengemaster14StateStartWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster14StateStartWaitFv - .byte4 procAnim__Q53scn4step4boss15challengemaster14StateStartWaitFv - .byte4 procMove__Q53scn4step4boss15challengemaster14StateStartWaitFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster14StateStartWaitFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster14StateStartWaitFv + .4byte procAnim__Q53scn4step4boss15challengemaster14StateStartWaitFv + .4byte procMove__Q53scn4step4boss15challengemaster14StateStartWaitFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster14StateStartWaitFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateStay.s b/asm/src/StateStay.s index 5a0cccaf..05c62d11 100644 --- a/asm/src/StateStay.s +++ b/asm/src/StateStay.s @@ -438,30 +438,30 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11Stat __vt__Q53scn4step5enemy5nruff9StateStay: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5nruff9StateStayFv - .byte4 procAnim__Q53scn4step5enemy5nruff9StateStayFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5nruff9StateStayFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5nruff9StateStayFv + .4byte procAnim__Q53scn4step5enemy5nruff9StateStayFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5nruff9StateStayFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5rocky9StateStay __vt__Q53scn4step5enemy5rocky9StateStay: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5rocky9StateStayFv - .byte4 procAnim__Q53scn4step5enemy5rocky9StateStayFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5rocky9StateStayFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5rocky9StateStayFv + .4byte procAnim__Q53scn4step5enemy5rocky9StateStayFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5rocky9StateStayFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256196 diff --git a/asm/src/StateStepBack.s b/asm/src/StateStepBack.s index c3df8f49..56794aca 100644 --- a/asm/src/StateStepBack.s +++ b/asm/src/StateStepBack.s @@ -244,9 +244,9 @@ lbl_80298394: __vt__Q53scn4step5enemy11bladeknight13StateStepBack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11bladeknight13StateStepBackFv - .byte4 procAnim__Q53scn4step5enemy11bladeknight13StateStepBackFv - .byte4 procMove__Q53scn4step5enemy11bladeknight13StateStepBackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11bladeknight13StateStepBackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11bladeknight13StateStepBackFv + .4byte procAnim__Q53scn4step5enemy11bladeknight13StateStepBackFv + .4byte procMove__Q53scn4step5enemy11bladeknight13StateStepBackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11bladeknight13StateStepBackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateStickObj.s b/asm/src/StateStickObj.s index 4f5b1bcd..48c577f1 100644 --- a/asm/src/StateStickObj.s +++ b/asm/src/StateStickObj.s @@ -247,21 +247,21 @@ procMove__Q53scn4step6weapon8deespear13StateStickObjFv: __vt__Q53scn4step6weapon10spearspear13StateStickObj: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon10spearspear13StateStickObjFv - .byte4 procAnim__Q53scn4step6weapon10spearspear13StateStickObjFv - .byte4 procMove__Q53scn4step6weapon10spearspear13StateStickObjFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q43scn4step6weapon9StateBaseFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon10spearspear13StateStickObjFv + .4byte procAnim__Q53scn4step6weapon10spearspear13StateStickObjFv + .4byte procMove__Q53scn4step6weapon10spearspear13StateStickObjFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q43scn4step6weapon9StateBaseFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8deespear13StateStickObj __vt__Q53scn4step6weapon8deespear13StateStickObj: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon8deespear13StateStickObjFv - .byte4 procAnim__Q53scn4step6weapon8deespear13StateStickObjFv - .byte4 procMove__Q53scn4step6weapon8deespear13StateStickObjFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q43scn4step6weapon9StateBaseFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon8deespear13StateStickObjFv + .4byte procAnim__Q53scn4step6weapon8deespear13StateStickObjFv + .4byte procMove__Q53scn4step6weapon8deespear13StateStickObjFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q43scn4step6weapon9StateBaseFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv diff --git a/asm/src/StateStickWall.s b/asm/src/StateStickWall.s index 69ed01da..7eab52d5 100644 --- a/asm/src/StateStickWall.s +++ b/asm/src/StateStickWall.s @@ -399,24 +399,24 @@ procObjCollReact__Q53scn4step6weapon8deespear14StateStickWallFv: __vt__Q53scn4step6weapon10spearspear14StateStickWall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon10spearspear14StateStickWallFv - .byte4 procAnim__Q53scn4step6weapon10spearspear14StateStickWallFv - .byte4 procMove__Q53scn4step6weapon10spearspear14StateStickWallFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon10spearspear14StateStickWallFv - .byte4 procObjCollReact__Q53scn4step6weapon10spearspear14StateStickWallFv + .4byte __dt__Q53scn4step6weapon10spearspear14StateStickWallFv + .4byte procAnim__Q53scn4step6weapon10spearspear14StateStickWallFv + .4byte procMove__Q53scn4step6weapon10spearspear14StateStickWallFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon10spearspear14StateStickWallFv + .4byte procObjCollReact__Q53scn4step6weapon10spearspear14StateStickWallFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8deespear14StateStickWall __vt__Q53scn4step6weapon8deespear14StateStickWall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon8deespear14StateStickWallFv - .byte4 procAnim__Q53scn4step6weapon8deespear14StateStickWallFv - .byte4 procMove__Q53scn4step6weapon8deespear14StateStickWallFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon8deespear14StateStickWallFv - .byte4 procObjCollReact__Q53scn4step6weapon8deespear14StateStickWallFv + .4byte __dt__Q53scn4step6weapon8deespear14StateStickWallFv + .4byte procAnim__Q53scn4step6weapon8deespear14StateStickWallFv + .4byte procMove__Q53scn4step6weapon8deespear14StateStickWallFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon8deespear14StateStickWallFv + .4byte procObjCollReact__Q53scn4step6weapon8deespear14StateStickWallFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256411 diff --git a/asm/src/StateStop.s b/asm/src/StateStop.s index 94a575d2..86585f6b 100644 --- a/asm/src/StateStop.s +++ b/asm/src/StateStop.s @@ -231,12 +231,12 @@ lbl_802C8E1C: __vt__Q53scn4step5enemy5nruff9StateStop: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5nruff9StateStopFv - .byte4 procAnim__Q53scn4step5enemy5nruff9StateStopFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5nruff9StateStopFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5nruff9StateStopFv + .4byte procAnim__Q53scn4step5enemy5nruff9StateStopFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5nruff9StateStopFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256172 diff --git a/asm/src/StateStopAir.s b/asm/src/StateStopAir.s index f9d92209..03196a13 100644 --- a/asm/src/StateStopAir.s +++ b/asm/src/StateStopAir.s @@ -224,12 +224,12 @@ lbl_802C9134: __vt__Q53scn4step5enemy5nruff12StateStopAir: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5nruff12StateStopAirFv - .byte4 procAnim__Q53scn4step5enemy5nruff12StateStopAirFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5nruff12StateStopAirFv + .4byte procAnim__Q53scn4step5enemy5nruff12StateStopAirFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255952 diff --git a/asm/src/StateStraight.s b/asm/src/StateStraight.s index 25354a4e..1de42147 100644 --- a/asm/src/StateStraight.s +++ b/asm/src/StateStraight.s @@ -346,12 +346,12 @@ lbl_802F3944: __vt__Q53scn4step5enemy15zankibblecutter13StateStraight: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy15zankibblecutter13StateStraightFv - .byte4 procAnim__Q53scn4step5enemy15zankibblecutter13StateStraightFv - .byte4 procMove__Q53scn4step5enemy15zankibblecutter13StateStraightFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy15zankibblecutter13StateStraightFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy15zankibblecutter13StateStraightFv + .4byte procAnim__Q53scn4step5enemy15zankibblecutter13StateStraightFv + .4byte procMove__Q53scn4step5enemy15zankibblecutter13StateStraightFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy15zankibblecutter13StateStraightFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256486 diff --git a/asm/src/StateSummon.s b/asm/src/StateSummon.s index b0edd5bc..ed1a4be2 100644 --- a/asm/src/StateSummon.s +++ b/asm/src/StateSummon.s @@ -150,9 +150,9 @@ procFixPos__Q53scn4step4boss15challengemaster11StateSummonFv: __vt__Q53scn4step4boss15challengemaster11StateSummon: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster11StateSummonFv - .byte4 procAnim__Q53scn4step4boss15challengemaster11StateSummonFv - .byte4 procMove__Q53scn4step4boss15challengemaster11StateSummonFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster11StateSummonFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster11StateSummonFv + .4byte procAnim__Q53scn4step4boss15challengemaster11StateSummonFv + .4byte procMove__Q53scn4step4boss15challengemaster11StateSummonFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster11StateSummonFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateSuperAppear.s b/asm/src/StateSuperAppear.s index 94436df8..ce608a84 100644 --- a/asm/src/StateSuperAppear.s +++ b/asm/src/StateSuperAppear.s @@ -362,12 +362,12 @@ procFixPos__Q53scn4step5enemy6common16StateSuperAppearFv: __vt__Q53scn4step5enemy6common16StateSuperAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common16StateSuperAppearFv - .byte4 procAnim__Q53scn4step5enemy6common16StateSuperAppearFv - .byte4 procMove__Q53scn4step5enemy6common16StateSuperAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common16StateSuperAppearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common16StateSuperAppearFv + .4byte procAnim__Q53scn4step5enemy6common16StateSuperAppearFv + .4byte procMove__Q53scn4step5enemy6common16StateSuperAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common16StateSuperAppearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257491 diff --git a/asm/src/StateSuperAppearPre.s b/asm/src/StateSuperAppearPre.s index 14f81930..c87fb1cc 100644 --- a/asm/src/StateSuperAppearPre.s +++ b/asm/src/StateSuperAppearPre.s @@ -202,15 +202,15 @@ __dt__Q24util121StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6common16St __vt__Q24util121StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6common16StateSuperAppear$$4PQ43scn4step5enemy5Enemy$$4Q25ostop9ReqHandle$$4i$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util121StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6common16StateSuperAppear$$4PQ43scn4step5enemy5Enemy$$4Q25ostop9ReqHandle$$4i$$1Fv - .byte4 create__Q24util121StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6common16StateSuperAppear$$4PQ43scn4step5enemy5Enemy$$4Q25ostop9ReqHandle$$4i$$1Fv + .4byte __dt__Q24util121StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6common16StateSuperAppear$$4PQ43scn4step5enemy5Enemy$$4Q25ostop9ReqHandle$$4i$$1Fv + .4byte create__Q24util121StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6common16StateSuperAppear$$4PQ43scn4step5enemy5Enemy$$4Q25ostop9ReqHandle$$4i$$1Fv .global __vt__Q53scn4step5enemy6common19StateSuperAppearPre __vt__Q53scn4step5enemy6common19StateSuperAppearPre: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common19StateSuperAppearPreFv - .byte4 procAnim__Q53scn4step5enemy6common19StateSuperAppearPreFv - .byte4 procMove__Q53scn4step5enemy6common19StateSuperAppearPreFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common19StateSuperAppearPreFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common19StateSuperAppearPreFv + .4byte procAnim__Q53scn4step5enemy6common19StateSuperAppearPreFv + .4byte procMove__Q53scn4step5enemy6common19StateSuperAppearPreFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common19StateSuperAppearPreFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateSuperFirst.s b/asm/src/StateSuperFirst.s index 392eb681..127a5f31 100644 --- a/asm/src/StateSuperFirst.s +++ b/asm/src/StateSuperFirst.s @@ -600,24 +600,24 @@ __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common19St __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common19StateSuperAppearPre$$4PQ43scn4step5enemy5Enemy$$4i$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common19StateSuperAppearPre$$4PQ43scn4step5enemy5Enemy$$4i$$1Fv - .byte4 create__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common19StateSuperAppearPre$$4PQ43scn4step5enemy5Enemy$$4i$$1Fv + .4byte __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common19StateSuperAppearPre$$4PQ43scn4step5enemy5Enemy$$4i$$1Fv + .4byte create__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common19StateSuperAppearPre$$4PQ43scn4step5enemy5Enemy$$4i$$1Fv .global __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common15StateSuperFirst$$4PQ43scn4step5enemy5Enemy$$4i$$1 __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common15StateSuperFirst$$4PQ43scn4step5enemy5Enemy$$4i$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common15StateSuperFirst$$4PQ43scn4step5enemy5Enemy$$4i$$1Fv - .byte4 create__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common15StateSuperFirst$$4PQ43scn4step5enemy5Enemy$$4i$$1Fv + .4byte __dt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common15StateSuperFirst$$4PQ43scn4step5enemy5Enemy$$4i$$1Fv + .4byte create__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common15StateSuperFirst$$4PQ43scn4step5enemy5Enemy$$4i$$1Fv .global __vt__Q53scn4step5enemy6common15StateSuperFirst __vt__Q53scn4step5enemy6common15StateSuperFirst: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common15StateSuperFirstFv - .byte4 procAnim__Q53scn4step5enemy6common15StateSuperFirstFv - .byte4 procMove__Q53scn4step5enemy6common15StateSuperFirstFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common15StateSuperFirstFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common15StateSuperFirstFv + .4byte procAnim__Q53scn4step5enemy6common15StateSuperFirstFv + .4byte procMove__Q53scn4step5enemy6common15StateSuperFirstFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common15StateSuperFirstFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258008 diff --git a/asm/src/StateSuperJump.s b/asm/src/StateSuperJump.s index 5878c27b..f101da00 100644 --- a/asm/src/StateSuperJump.s +++ b/asm/src/StateSuperJump.s @@ -250,13 +250,13 @@ procFixPos__Q53scn4step4hero6common14StateSuperJumpFv: __vt__Q53scn4step4hero6common14StateSuperJump: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common14StateSuperJumpFv - .byte4 procAnim__Q53scn4step4hero6common14StateSuperJumpFv - .byte4 procMove__Q53scn4step4hero6common14StateSuperJumpFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common14StateSuperJumpFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common14StateSuperJumpFv + .4byte procAnim__Q53scn4step4hero6common14StateSuperJumpFv + .4byte procMove__Q53scn4step4hero6common14StateSuperJumpFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common14StateSuperJumpFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSuperTeamAttack.s b/asm/src/StateSuperTeamAttack.s index eed9590c..52551d84 100644 --- a/asm/src/StateSuperTeamAttack.s +++ b/asm/src/StateSuperTeamAttack.s @@ -187,13 +187,13 @@ procFixPos__Q53scn4step4hero6damage20StateSuperTeamAttackFv: __vt__Q53scn4step4hero6damage20StateSuperTeamAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6damage20StateSuperTeamAttackFv - .byte4 procAnim__Q53scn4step4hero6damage20StateSuperTeamAttackFv - .byte4 procMove__Q53scn4step4hero6damage20StateSuperTeamAttackFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6damage20StateSuperTeamAttackFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6damage20StateSuperTeamAttackFv + .4byte procAnim__Q53scn4step4hero6damage20StateSuperTeamAttackFv + .4byte procMove__Q53scn4step4hero6damage20StateSuperTeamAttackFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6damage20StateSuperTeamAttackFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSwim.s b/asm/src/StateSwim.s index 70e07787..2eb3fa0a 100644 --- a/asm/src/StateSwim.s +++ b/asm/src/StateSwim.s @@ -745,13 +745,13 @@ lbl_8036C8B8: __vt__Q53scn4step4hero6common9StateSwim: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common9StateSwimFv - .byte4 procAnim__Q53scn4step4hero6common9StateSwimFv - .byte4 procMove__Q53scn4step4hero6common9StateSwimFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common9StateSwimFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common9StateSwimFv + .4byte procAnim__Q53scn4step4hero6common9StateSwimFv + .4byte procMove__Q53scn4step4hero6common9StateSwimFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common9StateSwimFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSwing.s b/asm/src/StateSwing.s index a5781f3d..de2a43ce 100644 --- a/asm/src/StateSwing.s +++ b/asm/src/StateSwing.s @@ -315,15 +315,15 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers13Sta __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateSwingEnd$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateSwingEnd$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateSwingEnd$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateSwingEnd$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateSwingEnd$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss7bonkers10StateSwing __vt__Q53scn4step4boss7bonkers10StateSwing: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss7bonkers10StateSwingFv - .byte4 procAnim__Q53scn4step4boss7bonkers10StateSwingFv - .byte4 procMove__Q53scn4step4boss7bonkers10StateSwingFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss7bonkers10StateSwingFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss7bonkers10StateSwingFv + .4byte procAnim__Q53scn4step4boss7bonkers10StateSwingFv + .4byte procMove__Q53scn4step4boss7bonkers10StateSwingFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss7bonkers10StateSwingFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateSwingEnd.s b/asm/src/StateSwingEnd.s index b159681f..e88e442b 100644 --- a/asm/src/StateSwingEnd.s +++ b/asm/src/StateSwingEnd.s @@ -108,9 +108,9 @@ procFixPos__Q53scn4step4boss7bonkers13StateSwingEndFv: __vt__Q53scn4step4boss7bonkers13StateSwingEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss7bonkers13StateSwingEndFv - .byte4 procAnim__Q53scn4step4boss7bonkers13StateSwingEndFv - .byte4 procMove__Q53scn4step4boss7bonkers13StateSwingEndFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss7bonkers13StateSwingEndFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss7bonkers13StateSwingEndFv + .4byte procAnim__Q53scn4step4boss7bonkers13StateSwingEndFv + .4byte procMove__Q53scn4step4boss7bonkers13StateSwingEndFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss7bonkers13StateSwingEndFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateSwingPursuit.s b/asm/src/StateSwingPursuit.s index 08d80d31..03156ecb 100644 --- a/asm/src/StateSwingPursuit.s +++ b/asm/src/StateSwingPursuit.s @@ -398,12 +398,12 @@ lbl_80239B08: __vt__Q53scn4step4boss7bonkers17StateSwingPursuit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss7bonkers17StateSwingPursuitFv - .byte4 procAnim__Q53scn4step4boss7bonkers17StateSwingPursuitFv - .byte4 procMove__Q53scn4step4boss7bonkers17StateSwingPursuitFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss7bonkers17StateSwingPursuitFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss7bonkers17StateSwingPursuitFv + .4byte procAnim__Q53scn4step4boss7bonkers17StateSwingPursuitFv + .4byte procMove__Q53scn4step4boss7bonkers17StateSwingPursuitFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss7bonkers17StateSwingPursuitFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256457 diff --git a/asm/src/StateSwordAirSpin.s b/asm/src/StateSwordAirSpin.s index 7e383676..88339696 100644 --- a/asm/src/StateSwordAirSpin.s +++ b/asm/src/StateSwordAirSpin.s @@ -291,17 +291,17 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17State __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordAirSpin$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordAirSpin$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordAirSpin$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordAirSpin$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordAirSpin$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword17StateSwordAirSpin __vt__Q53scn4step4hero5sword17StateSwordAirSpin: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword17StateSwordAirSpinFv - .byte4 procAnim__Q53scn4step4hero5sword17StateSwordAirSpinFv - .byte4 procMove__Q53scn4step4hero5sword17StateSwordAirSpinFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword17StateSwordAirSpinFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword17StateSwordAirSpinFv + .4byte procAnim__Q53scn4step4hero5sword17StateSwordAirSpinFv + .4byte procMove__Q53scn4step4hero5sword17StateSwordAirSpinFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword17StateSwordAirSpinFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordAttack.s b/asm/src/StateSwordAttack.s index d16b8082..df463fcf 100644 --- a/asm/src/StateSwordAttack.s +++ b/asm/src/StateSwordAttack.s @@ -401,25 +401,25 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21Stat __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChargeStart$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChargeStart$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChargeStart$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChargeStart$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChargeStart$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordAttack$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordAttack$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordAttack$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordAttack$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordAttack$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword16StateSwordAttack __vt__Q53scn4step4hero5sword16StateSwordAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword16StateSwordAttackFv - .byte4 procAnim__Q53scn4step4hero5sword16StateSwordAttackFv - .byte4 procMove__Q53scn4step4hero5sword16StateSwordAttackFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword16StateSwordAttackFv - .byte4 procObjCollReact__Q53scn4step4hero5sword16StateSwordAttackFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword16StateSwordAttackFv + .4byte procAnim__Q53scn4step4hero5sword16StateSwordAttackFv + .4byte procMove__Q53scn4step4hero5sword16StateSwordAttackFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword16StateSwordAttackFv + .4byte procObjCollReact__Q53scn4step4hero5sword16StateSwordAttackFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSwordAttackFinish.s b/asm/src/StateSwordAttackFinish.s index 7a9b75b9..855ac8da 100644 --- a/asm/src/StateSwordAttackFinish.s +++ b/asm/src/StateSwordAttackFinish.s @@ -271,17 +271,17 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword22Stat __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword22StateSwordAttackFinish$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword22StateSwordAttackFinish$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword22StateSwordAttackFinish$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword22StateSwordAttackFinish$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword22StateSwordAttackFinish$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword22StateSwordAttackFinish __vt__Q53scn4step4hero5sword22StateSwordAttackFinish: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword22StateSwordAttackFinishFv - .byte4 procAnim__Q53scn4step4hero5sword22StateSwordAttackFinishFv - .byte4 procMove__Q53scn4step4hero5sword22StateSwordAttackFinishFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword22StateSwordAttackFinishFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword22StateSwordAttackFinishFv + .4byte procAnim__Q53scn4step4hero5sword22StateSwordAttackFinishFv + .4byte procMove__Q53scn4step4hero5sword22StateSwordAttackFinishFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword22StateSwordAttackFinishFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordCharge.s b/asm/src/StateSwordCharge.s index 6f2a4160..2efbd4be 100644 --- a/asm/src/StateSwordCharge.s +++ b/asm/src/StateSwordCharge.s @@ -116,17 +116,17 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword14State __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword14StateSwordSpin$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword14StateSwordSpin$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword14StateSwordSpin$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword14StateSwordSpin$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword14StateSwordSpin$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword16StateSwordCharge __vt__Q53scn4step4hero5sword16StateSwordCharge: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword16StateSwordChargeFv - .byte4 procAnim__Q53scn4step4hero5sword16StateSwordChargeFv - .byte4 procMove__Q53scn4step4hero5sword16StateSwordChargeFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword16StateSwordChargeFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword16StateSwordChargeFv + .4byte procAnim__Q53scn4step4hero5sword16StateSwordChargeFv + .4byte procMove__Q53scn4step4hero5sword16StateSwordChargeFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword16StateSwordChargeFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordChargeStart.s b/asm/src/StateSwordChargeStart.s index 20ee3118..23ae3909 100644 --- a/asm/src/StateSwordChargeStart.s +++ b/asm/src/StateSwordChargeStart.s @@ -181,17 +181,17 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16State __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordCharge$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordCharge$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordCharge$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordCharge$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordCharge$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword21StateSwordChargeStart __vt__Q53scn4step4hero5sword21StateSwordChargeStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword21StateSwordChargeStartFv - .byte4 procAnim__Q53scn4step4hero5sword21StateSwordChargeStartFv - .byte4 procMove__Q53scn4step4hero5sword21StateSwordChargeStartFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword21StateSwordChargeStartFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword21StateSwordChargeStartFv + .4byte procAnim__Q53scn4step4hero5sword21StateSwordChargeStartFv + .4byte procMove__Q53scn4step4hero5sword21StateSwordChargeStartFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword21StateSwordChargeStartFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordChopping.s b/asm/src/StateSwordChopping.s index 1770afa2..42b862ab 100644 --- a/asm/src/StateSwordChopping.s +++ b/asm/src/StateSwordChopping.s @@ -336,23 +336,23 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21Stat __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChoppingHit$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChoppingHit$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChoppingHit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChoppingHit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChoppingHit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5sword18StateSwordChopping$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5sword18StateSwordChopping$$4PQ43scn4step4hero4Hero$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5sword18StateSwordChopping$$4PQ43scn4step4hero4Hero$$4b$$1Fv - .byte4 create__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5sword18StateSwordChopping$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte __dt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5sword18StateSwordChopping$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte create__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5sword18StateSwordChopping$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero5sword18StateSwordChopping __vt__Q53scn4step4hero5sword18StateSwordChopping: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword18StateSwordChoppingFv - .byte4 procAnim__Q53scn4step4hero5sword18StateSwordChoppingFv - .byte4 procMove__Q53scn4step4hero5sword18StateSwordChoppingFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword18StateSwordChoppingFv - .byte4 procObjCollReact__Q53scn4step4hero5sword18StateSwordChoppingFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword18StateSwordChoppingFv + .4byte procAnim__Q53scn4step4hero5sword18StateSwordChoppingFv + .4byte procMove__Q53scn4step4hero5sword18StateSwordChoppingFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword18StateSwordChoppingFv + .4byte procObjCollReact__Q53scn4step4hero5sword18StateSwordChoppingFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordChoppingHit.s b/asm/src/StateSwordChoppingHit.s index b77ded1b..216f18ea 100644 --- a/asm/src/StateSwordChoppingHit.s +++ b/asm/src/StateSwordChoppingHit.s @@ -200,13 +200,13 @@ procFixPos__Q53scn4step4hero5sword21StateSwordChoppingHitFv: __vt__Q53scn4step4hero5sword21StateSwordChoppingHit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword21StateSwordChoppingHitFv - .byte4 procAnim__Q53scn4step4hero5sword21StateSwordChoppingHitFv - .byte4 procMove__Q53scn4step4hero5sword21StateSwordChoppingHitFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword21StateSwordChoppingHitFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword21StateSwordChoppingHitFv + .4byte procAnim__Q53scn4step4hero5sword21StateSwordChoppingHitFv + .4byte procMove__Q53scn4step4hero5sword21StateSwordChoppingHitFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword21StateSwordChoppingHitFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSwordFloatSpin.s b/asm/src/StateSwordFloatSpin.s index 127c5007..6a9f2a40 100644 --- a/asm/src/StateSwordFloatSpin.s +++ b/asm/src/StateSwordFloatSpin.s @@ -387,19 +387,19 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19State __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordFloatSpin$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordFloatSpin$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordFloatSpin$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordFloatSpin$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordFloatSpin$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword19StateSwordFloatSpin __vt__Q53scn4step4hero5sword19StateSwordFloatSpin: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword19StateSwordFloatSpinFv - .byte4 procAnim__Q53scn4step4hero5sword19StateSwordFloatSpinFv - .byte4 procMove__Q53scn4step4hero5sword19StateSwordFloatSpinFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword19StateSwordFloatSpinFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword19StateSwordFloatSpinFv + .4byte procAnim__Q53scn4step4hero5sword19StateSwordFloatSpinFv + .4byte procMove__Q53scn4step4hero5sword19StateSwordFloatSpinFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword19StateSwordFloatSpinFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSwordMeteor.s b/asm/src/StateSwordMeteor.s index 9c3fcc95..9531708d 100644 --- a/asm/src/StateSwordMeteor.s +++ b/asm/src/StateSwordMeteor.s @@ -301,23 +301,23 @@ __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword23Stat __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword23StateSwordMeteorLanding$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword23StateSwordMeteorLanding$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword23StateSwordMeteorLanding$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword23StateSwordMeteorLanding$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword23StateSwordMeteorLanding$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordMeteor$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordMeteor$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordMeteor$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordMeteor$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordMeteor$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordMeteor$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword16StateSwordMeteor __vt__Q53scn4step4hero5sword16StateSwordMeteor: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword16StateSwordMeteorFv - .byte4 procAnim__Q53scn4step4hero5sword16StateSwordMeteorFv - .byte4 procMove__Q53scn4step4hero5sword16StateSwordMeteorFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword16StateSwordMeteorFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword16StateSwordMeteorFv + .4byte procAnim__Q53scn4step4hero5sword16StateSwordMeteorFv + .4byte procMove__Q53scn4step4hero5sword16StateSwordMeteorFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword16StateSwordMeteorFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordMeteorLanding.s b/asm/src/StateSwordMeteorLanding.s index f070c6bd..4f24fd88 100644 --- a/asm/src/StateSwordMeteorLanding.s +++ b/asm/src/StateSwordMeteorLanding.s @@ -117,11 +117,11 @@ procFixPos__Q53scn4step4hero5sword23StateSwordMeteorLandingFv: __vt__Q53scn4step4hero5sword23StateSwordMeteorLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword23StateSwordMeteorLandingFv - .byte4 procAnim__Q53scn4step4hero5sword23StateSwordMeteorLandingFv - .byte4 procMove__Q53scn4step4hero5sword23StateSwordMeteorLandingFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword23StateSwordMeteorLandingFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword23StateSwordMeteorLandingFv + .4byte procAnim__Q53scn4step4hero5sword23StateSwordMeteorLandingFv + .4byte procMove__Q53scn4step4hero5sword23StateSwordMeteorLandingFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword23StateSwordMeteorLandingFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordMince.s b/asm/src/StateSwordMince.s index 9d85fa43..2087c2c0 100644 --- a/asm/src/StateSwordMince.s +++ b/asm/src/StateSwordMince.s @@ -226,17 +226,17 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword15State __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword15StateSwordMince$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword15StateSwordMince$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword15StateSwordMince$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword15StateSwordMince$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword15StateSwordMince$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword15StateSwordMince __vt__Q53scn4step4hero5sword15StateSwordMince: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword15StateSwordMinceFv - .byte4 procAnim__Q53scn4step4hero5sword15StateSwordMinceFv - .byte4 procMove__Q53scn4step4hero5sword15StateSwordMinceFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword15StateSwordMinceFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword15StateSwordMinceFv + .4byte procAnim__Q53scn4step4hero5sword15StateSwordMinceFv + .4byte procMove__Q53scn4step4hero5sword15StateSwordMinceFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword15StateSwordMinceFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordRaising.s b/asm/src/StateSwordRaising.s index 8f0b49db..a77ce5ef 100644 --- a/asm/src/StateSwordRaising.s +++ b/asm/src/StateSwordRaising.s @@ -301,25 +301,25 @@ __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword20Stat __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword20StateSwordRaisingEnd$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword20StateSwordRaisingEnd$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword20StateSwordRaisingEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword20StateSwordRaisingEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword20StateSwordRaisingEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordRaising$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordRaising$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordRaising$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordRaising$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordRaising$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordRaising$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword17StateSwordRaising __vt__Q53scn4step4hero5sword17StateSwordRaising: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword17StateSwordRaisingFv - .byte4 procAnim__Q53scn4step4hero5sword17StateSwordRaisingFv - .byte4 procMove__Q53scn4step4hero5sword17StateSwordRaisingFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword17StateSwordRaisingFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword17StateSwordRaisingFv + .4byte procAnim__Q53scn4step4hero5sword17StateSwordRaisingFv + .4byte procMove__Q53scn4step4hero5sword17StateSwordRaisingFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword17StateSwordRaisingFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSwordRaisingEnd.s b/asm/src/StateSwordRaisingEnd.s index c751d972..a06109a6 100644 --- a/asm/src/StateSwordRaisingEnd.s +++ b/asm/src/StateSwordRaisingEnd.s @@ -87,11 +87,11 @@ procFixPos__Q53scn4step4hero5sword20StateSwordRaisingEndFv: __vt__Q53scn4step4hero5sword20StateSwordRaisingEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword20StateSwordRaisingEndFv - .byte4 procAnim__Q53scn4step4hero5sword20StateSwordRaisingEndFv - .byte4 procMove__Q53scn4step4hero5sword20StateSwordRaisingEndFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword20StateSwordRaisingEndFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword20StateSwordRaisingEndFv + .4byte procAnim__Q53scn4step4hero5sword20StateSwordRaisingEndFv + .4byte procMove__Q53scn4step4hero5sword20StateSwordRaisingEndFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword20StateSwordRaisingEndFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordSpin.s b/asm/src/StateSwordSpin.s index 3c7e367a..f906d179 100644 --- a/asm/src/StateSwordSpin.s +++ b/asm/src/StateSwordSpin.s @@ -150,11 +150,11 @@ procFixPos__Q53scn4step4hero5sword14StateSwordSpinFv: __vt__Q53scn4step4hero5sword14StateSwordSpin: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword14StateSwordSpinFv - .byte4 procAnim__Q53scn4step4hero5sword14StateSwordSpinFv - .byte4 procMove__Q53scn4step4hero5sword14StateSwordSpinFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword14StateSwordSpinFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword14StateSwordSpinFv + .4byte procAnim__Q53scn4step4hero5sword14StateSwordSpinFv + .4byte procMove__Q53scn4step4hero5sword14StateSwordSpinFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword14StateSwordSpinFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordThrust.s b/asm/src/StateSwordThrust.s index 5ee4d4b6..e065c4d5 100644 --- a/asm/src/StateSwordThrust.s +++ b/asm/src/StateSwordThrust.s @@ -367,25 +367,25 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19State __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordThrustEnd$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordThrustEnd$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordThrustEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordThrustEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordThrustEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordThrust$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordThrust$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordThrust$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordThrust$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordThrust$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordThrust$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword16StateSwordThrust __vt__Q53scn4step4hero5sword16StateSwordThrust: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword16StateSwordThrustFv - .byte4 procAnim__Q53scn4step4hero5sword16StateSwordThrustFv - .byte4 procMove__Q53scn4step4hero5sword16StateSwordThrustFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword16StateSwordThrustFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword16StateSwordThrustFv + .4byte procAnim__Q53scn4step4hero5sword16StateSwordThrustFv + .4byte procMove__Q53scn4step4hero5sword16StateSwordThrustFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword16StateSwordThrustFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSwordThrustEnd.s b/asm/src/StateSwordThrustEnd.s index 9d2f28a7..8e048ffb 100644 --- a/asm/src/StateSwordThrustEnd.s +++ b/asm/src/StateSwordThrustEnd.s @@ -46,11 +46,11 @@ procFixPos__Q53scn4step4hero5sword19StateSwordThrustEndFv: __vt__Q53scn4step4hero5sword19StateSwordThrustEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword19StateSwordThrustEndFv - .byte4 procAnim__Q53scn4step4hero5sword19StateSwordThrustEndFv - .byte4 procMove__Q53scn4step4hero5sword19StateSwordThrustEndFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword19StateSwordThrustEndFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword19StateSwordThrustEndFv + .4byte procAnim__Q53scn4step4hero5sword19StateSwordThrustEndFv + .4byte procMove__Q53scn4step4hero5sword19StateSwordThrustEndFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword19StateSwordThrustEndFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordUnderThrust.s b/asm/src/StateSwordUnderThrust.s index 4bc4e62e..81fc32c8 100644 --- a/asm/src/StateSwordUnderThrust.s +++ b/asm/src/StateSwordUnderThrust.s @@ -197,19 +197,19 @@ __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword28Stat __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword28StateSwordUnderThrustLanding$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword28StateSwordUnderThrustLanding$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword28StateSwordUnderThrustLanding$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword28StateSwordUnderThrustLanding$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword28StateSwordUnderThrustLanding$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword21StateSwordUnderThrust __vt__Q53scn4step4hero5sword21StateSwordUnderThrust: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword21StateSwordUnderThrustFv - .byte4 procAnim__Q53scn4step4hero5sword21StateSwordUnderThrustFv - .byte4 procMove__Q53scn4step4hero5sword21StateSwordUnderThrustFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword21StateSwordUnderThrustFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword21StateSwordUnderThrustFv + .4byte procAnim__Q53scn4step4hero5sword21StateSwordUnderThrustFv + .4byte procMove__Q53scn4step4hero5sword21StateSwordUnderThrustFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword21StateSwordUnderThrustFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSwordUnderThrustLanding.s b/asm/src/StateSwordUnderThrustLanding.s index 9a24d9ff..eec45c8a 100644 --- a/asm/src/StateSwordUnderThrustLanding.s +++ b/asm/src/StateSwordUnderThrustLanding.s @@ -105,11 +105,11 @@ procFixPos__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv: __vt__Q53scn4step4hero5sword28StateSwordUnderThrustLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv - .byte4 procAnim__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv - .byte4 procMove__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv + .4byte procAnim__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv + .4byte procMove__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordUnderThrustStart.s b/asm/src/StateSwordUnderThrustStart.s index 679c6f78..a9e312cb 100644 --- a/asm/src/StateSwordUnderThrustStart.s +++ b/asm/src/StateSwordUnderThrustStart.s @@ -208,23 +208,23 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21Stat __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordUnderThrust$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordUnderThrust$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordUnderThrust$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordUnderThrust$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordUnderThrust$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword26StateSwordUnderThrustStart$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword26StateSwordUnderThrustStart$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword26StateSwordUnderThrustStart$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword26StateSwordUnderThrustStart$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword26StateSwordUnderThrustStart$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword26StateSwordUnderThrustStart$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword26StateSwordUnderThrustStart __vt__Q53scn4step4hero5sword26StateSwordUnderThrustStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword26StateSwordUnderThrustStartFv - .byte4 procAnim__Q53scn4step4hero5sword26StateSwordUnderThrustStartFv - .byte4 procMove__Q53scn4step4hero5sword26StateSwordUnderThrustStartFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword26StateSwordUnderThrustStartFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword26StateSwordUnderThrustStartFv + .4byte procAnim__Q53scn4step4hero5sword26StateSwordUnderThrustStartFv + .4byte procMove__Q53scn4step4hero5sword26StateSwordUnderThrustStartFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword26StateSwordUnderThrustStartFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordWaterSpin.s b/asm/src/StateSwordWaterSpin.s index cec7631b..b03f8771 100644 --- a/asm/src/StateSwordWaterSpin.s +++ b/asm/src/StateSwordWaterSpin.s @@ -166,17 +166,17 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19State __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordWaterSpin$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordWaterSpin$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordWaterSpin$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordWaterSpin$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordWaterSpin$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword19StateSwordWaterSpin __vt__Q53scn4step4hero5sword19StateSwordWaterSpin: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword19StateSwordWaterSpinFv - .byte4 procAnim__Q53scn4step4hero5sword19StateSwordWaterSpinFv - .byte4 procMove__Q53scn4step4hero5sword19StateSwordWaterSpinFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5sword19StateSwordWaterSpinFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5sword19StateSwordWaterSpinFv + .4byte procAnim__Q53scn4step4hero5sword19StateSwordWaterSpinFv + .4byte procMove__Q53scn4step4hero5sword19StateSwordWaterSpinFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5sword19StateSwordWaterSpinFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateTakeOff.s b/asm/src/StateTakeOff.s index 732b9839..c2d21e95 100644 --- a/asm/src/StateTakeOff.s +++ b/asm/src/StateTakeOff.s @@ -166,12 +166,12 @@ __dt__Q53scn4step5enemy10brontoburt12StateTakeOffFv: __vt__Q53scn4step5enemy10brontoburt12StateTakeOff: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10brontoburt12StateTakeOffFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy10brontoburt12StateTakeOffFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10brontoburt12StateTakeOffFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy10brontoburt12StateTakeOffFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255068 diff --git a/asm/src/StateTeleport.s b/asm/src/StateTeleport.s index f76a579e..464b67a3 100644 --- a/asm/src/StateTeleport.s +++ b/asm/src/StateTeleport.s @@ -563,12 +563,12 @@ lbl_802BEC48: __vt__Q53scn4step5enemy4kabu13StateTeleport: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy4kabu13StateTeleportFv - .byte4 procAnim__Q53scn4step5enemy4kabu13StateTeleportFv - .byte4 procMove__Q53scn4step5enemy4kabu13StateTeleportFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy4kabu13StateTeleportFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy4kabu13StateTeleportFv + .4byte procAnim__Q53scn4step5enemy4kabu13StateTeleportFv + .4byte procMove__Q53scn4step5enemy4kabu13StateTeleportFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy4kabu13StateTeleportFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257445 diff --git a/asm/src/StateThrow.s b/asm/src/StateThrow.s index 58e69b67..5f30beca 100644 --- a/asm/src/StateThrow.s +++ b/asm/src/StateThrow.s @@ -1153,37 +1153,37 @@ lbl_803A00F0: __vt__Q53scn4step5enemy8cappyhat10StateThrow: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8cappyhat10StateThrowFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy8cappyhat10StateThrowFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy8cappyhat10StateThrowFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8cappyhat10StateThrowFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy8cappyhat10StateThrowFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy8cappyhat10StateThrowFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10poppybrojr10StateThrow __vt__Q53scn4step5enemy10poppybrojr10StateThrow: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10poppybrojr10StateThrowFv - .byte4 procAnim__Q53scn4step5enemy10poppybrojr10StateThrowFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10poppybrojr10StateThrowFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10poppybrojr10StateThrowFv + .4byte procAnim__Q53scn4step5enemy10poppybrojr10StateThrowFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10poppybrojr10StateThrowFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6hammer10StateThrow __vt__Q53scn4step4hero6hammer10StateThrow: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6hammer10StateThrowFv - .byte4 procAnim__Q53scn4step4hero6hammer10StateThrowFv - .byte4 procMove__Q53scn4step4hero6hammer10StateThrowFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6hammer10StateThrowFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6hammer10StateThrowFv + .4byte procAnim__Q53scn4step4hero6hammer10StateThrowFv + .4byte procMove__Q53scn4step4hero6hammer10StateThrowFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6hammer10StateThrowFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1191,13 +1191,13 @@ __vt__Q53scn4step4hero6hammer10StateThrow: __vt__Q53scn4step4hero7fighter10StateThrow: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter10StateThrowFv - .byte4 procAnim__Q53scn4step4hero7fighter10StateThrowFv - .byte4 procMove__Q53scn4step4hero7fighter10StateThrowFv - .byte4 procConstraint__Q53scn4step4hero7fighter10StateThrowFv - .byte4 procFixPos__Q53scn4step4hero7fighter10StateThrowFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter10StateThrowFv + .4byte procAnim__Q53scn4step4hero7fighter10StateThrowFv + .4byte procMove__Q53scn4step4hero7fighter10StateThrowFv + .4byte procConstraint__Q53scn4step4hero7fighter10StateThrowFv + .4byte procFixPos__Q53scn4step4hero7fighter10StateThrowFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateThrownFighter.s b/asm/src/StateThrownFighter.s index febdf584..a5470ad9 100644 --- a/asm/src/StateThrownFighter.s +++ b/asm/src/StateThrownFighter.s @@ -502,12 +502,12 @@ lbl_802AC23C: __vt__Q53scn4step5enemy6damage18StateThrownFighter: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6damage18StateThrownFighterFv - .byte4 procAnim__Q53scn4step5enemy6damage18StateThrownFighterFv - .byte4 procMove__Q53scn4step5enemy6damage18StateThrownFighterFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6damage18StateThrownFighterFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6damage18StateThrownFighterFv + .4byte procAnim__Q53scn4step5enemy6damage18StateThrownFighterFv + .4byte procMove__Q53scn4step5enemy6damage18StateThrownFighterFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6damage18StateThrownFighterFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257792 diff --git a/asm/src/StateThunder.s b/asm/src/StateThunder.s index 8a510493..d0a065b6 100644 --- a/asm/src/StateThunder.s +++ b/asm/src/StateThunder.s @@ -168,9 +168,9 @@ procFixPos__Q53scn4step4boss6dubior12StateThunderFv: __vt__Q53scn4step4boss6dubior12StateThunder: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6dubior12StateThunderFv - .byte4 procAnim__Q53scn4step4boss6dubior12StateThunderFv - .byte4 procMove__Q53scn4step4boss6dubior12StateThunderFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6dubior12StateThunderFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6dubior12StateThunderFv + .4byte procAnim__Q53scn4step4boss6dubior12StateThunderFv + .4byte procMove__Q53scn4step4boss6dubior12StateThunderFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6dubior12StateThunderFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateThunderStart.s b/asm/src/StateThunderStart.s index 4c3ea689..9be798a4 100644 --- a/asm/src/StateThunderStart.s +++ b/asm/src/StateThunderStart.s @@ -395,18 +395,18 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior12Stat __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior12StateThunder$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior12StateThunder$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior12StateThunder$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior12StateThunder$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior12StateThunder$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6dubior17StateThunderStart __vt__Q53scn4step4boss6dubior17StateThunderStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6dubior17StateThunderStartFv - .byte4 procAnim__Q53scn4step4boss6dubior17StateThunderStartFv - .byte4 procMove__Q53scn4step4boss6dubior17StateThunderStartFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6dubior17StateThunderStartFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6dubior17StateThunderStartFv + .4byte procAnim__Q53scn4step4boss6dubior17StateThunderStartFv + .4byte procMove__Q53scn4step4boss6dubior17StateThunderStartFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6dubior17StateThunderStartFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global WaitFrameTable__Q53scn4step4boss6dubior31$$2unnamed$$2StateThunderStart_cpp$$2 diff --git a/asm/src/StateTornadoChase.s b/asm/src/StateTornadoChase.s index 4eb8c7f4..2f2f1fb3 100644 --- a/asm/src/StateTornadoChase.s +++ b/asm/src/StateTornadoChase.s @@ -409,12 +409,12 @@ lbl_8025854C: __vt__Q53scn4step4boss9moundeath17StateTornadoChase: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9moundeath17StateTornadoChaseFv - .byte4 procAnim__Q53scn4step4boss9moundeath17StateTornadoChaseFv - .byte4 procMove__Q53scn4step4boss9moundeath17StateTornadoChaseFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9moundeath17StateTornadoChaseFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9moundeath17StateTornadoChaseFv + .4byte procAnim__Q53scn4step4boss9moundeath17StateTornadoChaseFv + .4byte procMove__Q53scn4step4boss9moundeath17StateTornadoChaseFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9moundeath17StateTornadoChaseFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257129 diff --git a/asm/src/StateTornadoRise.s b/asm/src/StateTornadoRise.s index 98aded67..b0dc15c7 100644 --- a/asm/src/StateTornadoRise.s +++ b/asm/src/StateTornadoRise.s @@ -284,18 +284,18 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateTornadoChase$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateTornadoChase$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateTornadoChase$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateTornadoChase$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateTornadoChase$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9moundeath16StateTornadoRise __vt__Q53scn4step4boss9moundeath16StateTornadoRise: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss9moundeath16StateTornadoRiseFv - .byte4 procAnim__Q53scn4step4boss9moundeath16StateTornadoRiseFv - .byte4 procMove__Q53scn4step4boss9moundeath16StateTornadoRiseFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss9moundeath16StateTornadoRiseFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss9moundeath16StateTornadoRiseFv + .4byte procAnim__Q53scn4step4boss9moundeath16StateTornadoRiseFv + .4byte procMove__Q53scn4step4boss9moundeath16StateTornadoRiseFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss9moundeath16StateTornadoRiseFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256270 diff --git a/asm/src/StateToss.s b/asm/src/StateToss.s index 3ac6ba35..35de8992 100644 --- a/asm/src/StateToss.s +++ b/asm/src/StateToss.s @@ -402,19 +402,19 @@ __dt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateTo __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateToss$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateToss$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateToss$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateToss$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateToss$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4wing9StateToss __vt__Q53scn4step4hero4wing9StateToss: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4wing9StateTossFv - .byte4 procAnim__Q53scn4step4hero4wing9StateTossFv - .byte4 procMove__Q53scn4step4hero4wing9StateTossFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4wing9StateTossFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4wing9StateTossFv + .4byte procAnim__Q53scn4step4hero4wing9StateTossFv + .4byte procMove__Q53scn4step4hero4wing9StateTossFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4wing9StateTossFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateUnderAttack.s b/asm/src/StateUnderAttack.s index 3dd9e0d0..95df8e47 100644 --- a/asm/src/StateUnderAttack.s +++ b/asm/src/StateUnderAttack.s @@ -412,13 +412,13 @@ lbl_8039AB00: __vt__Q53scn4step4hero4wing16StateUnderAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4wing16StateUnderAttackFv - .byte4 procAnim__Q53scn4step4hero4wing16StateUnderAttackFv - .byte4 procMove__Q53scn4step4hero4wing16StateUnderAttackFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4wing16StateUnderAttackFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4wing16StateUnderAttackFv + .4byte procAnim__Q53scn4step4hero4wing16StateUnderAttackFv + .4byte procMove__Q53scn4step4hero4wing16StateUnderAttackFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4wing16StateUnderAttackFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateUnderAttackLanding.s b/asm/src/StateUnderAttackLanding.s index aaae8280..3bdb07ff 100644 --- a/asm/src/StateUnderAttackLanding.s +++ b/asm/src/StateUnderAttackLanding.s @@ -336,13 +336,13 @@ lbl_8039AF24: __vt__Q53scn4step4hero4wing23StateUnderAttackLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4wing23StateUnderAttackLandingFv - .byte4 procAnim__Q53scn4step4hero4wing23StateUnderAttackLandingFv - .byte4 procMove__Q53scn4step4hero4wing23StateUnderAttackLandingFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4wing23StateUnderAttackLandingFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4wing23StateUnderAttackLandingFv + .4byte procAnim__Q53scn4step4hero4wing23StateUnderAttackLandingFv + .4byte procMove__Q53scn4step4hero4wing23StateUnderAttackLandingFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4wing23StateUnderAttackLandingFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/StateUnlockLvMapDoor.s b/asm/src/StateUnlockLvMapDoor.s index c373df2e..0c82e3ea 100644 --- a/asm/src/StateUnlockLvMapDoor.s +++ b/asm/src/StateUnlockLvMapDoor.s @@ -235,11 +235,11 @@ procFixPos__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv: __vt__Q53scn4step4hero7gimmick20StateUnlockLvMapDoor: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv - .byte4 procAnim__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv - .byte4 procMove__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv + .4byte procAnim__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv + .4byte procMove__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateVacuum.s b/asm/src/StateVacuum.s index 1eba60af..ceb41e4d 100644 --- a/asm/src/StateVacuum.s +++ b/asm/src/StateVacuum.s @@ -1134,55 +1134,55 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14Stat __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateCapture$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateCapture$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateCapture$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateCapture$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateCapture$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateVacuumEnd$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateVacuumEnd$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateVacuumEnd$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateVacuumEnd$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateVacuumEnd$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateVacuumEnd$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6whispy11StateVacuum __vt__Q53scn4step4boss6whispy11StateVacuum: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy11StateVacuumFv - .byte4 procAnim__Q53scn4step4boss6whispy11StateVacuumFv - .byte4 procMove__Q53scn4step4boss6whispy11StateVacuumFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q43scn4step4boss9StateBaseFv - .byte4 procObjCollReact__Q53scn4step4boss6whispy11StateVacuumFv + .4byte __dt__Q53scn4step4boss6whispy11StateVacuumFv + .4byte procAnim__Q53scn4step4boss6whispy11StateVacuumFv + .4byte procMove__Q53scn4step4boss6whispy11StateVacuumFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q43scn4step4boss9StateBaseFv + .4byte procObjCollReact__Q53scn4step4boss6whispy11StateVacuumFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateVacuumEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateVacuumEnd$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateVacuumEnd$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateVacuumEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateVacuumEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateVacuumEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateEat$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateEat$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateEat$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateEat$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateEat$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateEat$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateVacuum$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateVacuum$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateVacuum$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateVacuum$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateVacuum$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateVacuum$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common11StateVacuum __vt__Q53scn4step4hero6common11StateVacuum: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common11StateVacuumFv - .byte4 procAnim__Q53scn4step4hero6common11StateVacuumFv - .byte4 procMove__Q53scn4step4hero6common11StateVacuumFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common11StateVacuumFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common11StateVacuumFv + .4byte procAnim__Q53scn4step4hero6common11StateVacuumFv + .4byte procMove__Q53scn4step4hero6common11StateVacuumFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common11StateVacuumFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateVacuumEnd.s b/asm/src/StateVacuumEnd.s index d515daf6..572b4d62 100644 --- a/asm/src/StateVacuumEnd.s +++ b/asm/src/StateVacuumEnd.s @@ -195,23 +195,23 @@ procFixPos__Q53scn4step4hero6common14StateVacuumEndFv: __vt__Q53scn4step4boss6whispy14StateVacuumEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy14StateVacuumEndFv - .byte4 procAnim__Q53scn4step4boss6whispy14StateVacuumEndFv - .byte4 procMove__Q53scn4step4boss6whispy14StateVacuumEndFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy14StateVacuumEndFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6whispy14StateVacuumEndFv + .4byte procAnim__Q53scn4step4boss6whispy14StateVacuumEndFv + .4byte procMove__Q53scn4step4boss6whispy14StateVacuumEndFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy14StateVacuumEndFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common14StateVacuumEnd __vt__Q53scn4step4hero6common14StateVacuumEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common14StateVacuumEndFv - .byte4 procAnim__Q53scn4step4hero6common14StateVacuumEndFv - .byte4 procMove__Q53scn4step4hero6common14StateVacuumEndFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common14StateVacuumEndFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common14StateVacuumEndFv + .4byte procAnim__Q53scn4step4hero6common14StateVacuumEndFv + .4byte procMove__Q53scn4step4hero6common14StateVacuumEndFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common14StateVacuumEndFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateVacuumReceive.s b/asm/src/StateVacuumReceive.s index a976f4c2..7cc3a0ad 100644 --- a/asm/src/StateVacuumReceive.s +++ b/asm/src/StateVacuumReceive.s @@ -1320,37 +1320,37 @@ procFixPos__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFv: __vt__Q53scn4step4boss6common18StateVacuumReceive: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common18StateVacuumReceiveFv - .byte4 procAnim__Q53scn4step4boss6common18StateVacuumReceiveFv - .byte4 procMove__Q53scn4step4boss6common18StateVacuumReceiveFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common18StateVacuumReceiveFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6common18StateVacuumReceiveFv + .4byte procAnim__Q53scn4step4boss6common18StateVacuumReceiveFv + .4byte procMove__Q53scn4step4boss6common18StateVacuumReceiveFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common18StateVacuumReceiveFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common18StateVacuumReceive __vt__Q53scn4step5enemy6common18StateVacuumReceive: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common18StateVacuumReceiveFv - .byte4 procAnim__Q53scn4step5enemy6common18StateVacuumReceiveFv - .byte4 procMove__Q53scn4step5enemy6common18StateVacuumReceiveFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common18StateVacuumReceiveFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common18StateVacuumReceiveFv + .4byte procAnim__Q53scn4step5enemy6common18StateVacuumReceiveFv + .4byte procMove__Q53scn4step5enemy6common18StateVacuumReceiveFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common18StateVacuumReceiveFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero12interference18StateVacuumReceive __vt__Q53scn4step4hero12interference18StateVacuumReceive: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero12interference18StateVacuumReceiveFv - .byte4 procAnim__Q53scn4step4hero12interference18StateVacuumReceiveFv - .byte4 procMove__Q53scn4step4hero12interference18StateVacuumReceiveFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero12interference18StateVacuumReceiveFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero12interference18StateVacuumReceiveFv + .4byte procAnim__Q53scn4step4hero12interference18StateVacuumReceiveFv + .4byte procMove__Q53scn4step4hero12interference18StateVacuumReceiveFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero12interference18StateVacuumReceiveFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1358,22 +1358,22 @@ __vt__Q53scn4step4hero12interference18StateVacuumReceive: __vt__Q53scn4step4item5state18StateVacuumReceive: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4item5state18StateVacuumReceiveFv - .byte4 procAnim__Q53scn4step4item5state18StateVacuumReceiveFv - .byte4 procMove__Q43scn4step4item9StateBaseFv - .byte4 procFixPos__Q53scn4step4item5state18StateVacuumReceiveFv + .4byte __dt__Q53scn4step4item5state18StateVacuumReceiveFv + .4byte procAnim__Q53scn4step4item5state18StateVacuumReceiveFv + .4byte procMove__Q43scn4step4item9StateBaseFv + .4byte procFixPos__Q53scn4step4item5state18StateVacuumReceiveFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13vacuumedblock18StateVacuumReceive __vt__Q53scn4step6weapon13vacuumedblock18StateVacuumReceive: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFv - .byte4 procAnim__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFv - .byte4 procMove__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFv + .4byte procAnim__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFv + .4byte procMove__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256631 diff --git a/asm/src/StateVacuumStart.s b/asm/src/StateVacuumStart.s index 84dd04c2..ea373154 100644 --- a/asm/src/StateVacuumStart.s +++ b/asm/src/StateVacuumStart.s @@ -113,15 +113,15 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11Stat __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateVacuum$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateVacuum$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateVacuum$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateVacuum$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateVacuum$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6whispy16StateVacuumStart __vt__Q53scn4step4boss6whispy16StateVacuumStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy16StateVacuumStartFv - .byte4 procAnim__Q53scn4step4boss6whispy16StateVacuumStartFv - .byte4 procMove__Q53scn4step4boss6whispy16StateVacuumStartFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy16StateVacuumStartFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6whispy16StateVacuumStartFv + .4byte procAnim__Q53scn4step4boss6whispy16StateVacuumStartFv + .4byte procMove__Q53scn4step4boss6whispy16StateVacuumStartFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy16StateVacuumStartFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateVanish.s b/asm/src/StateVanish.s index 40b0576d..0bfef6fe 100644 --- a/asm/src/StateVanish.s +++ b/asm/src/StateVanish.s @@ -391,24 +391,24 @@ procObjCollReact__Q53scn4step6weapon8deespear11StateVanishFv: __vt__Q53scn4step6weapon10spearspear11StateVanish: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon10spearspear11StateVanishFv - .byte4 procAnim__Q53scn4step6weapon10spearspear11StateVanishFv - .byte4 procMove__Q53scn4step6weapon10spearspear11StateVanishFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon10spearspear11StateVanishFv - .byte4 procObjCollReact__Q53scn4step6weapon10spearspear11StateVanishFv + .4byte __dt__Q53scn4step6weapon10spearspear11StateVanishFv + .4byte procAnim__Q53scn4step6weapon10spearspear11StateVanishFv + .4byte procMove__Q53scn4step6weapon10spearspear11StateVanishFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon10spearspear11StateVanishFv + .4byte procObjCollReact__Q53scn4step6weapon10spearspear11StateVanishFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8deespear11StateVanish __vt__Q53scn4step6weapon8deespear11StateVanish: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon8deespear11StateVanishFv - .byte4 procAnim__Q53scn4step6weapon8deespear11StateVanishFv - .byte4 procMove__Q53scn4step6weapon8deespear11StateVanishFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon8deespear11StateVanishFv - .byte4 procObjCollReact__Q53scn4step6weapon8deespear11StateVanishFv + .4byte __dt__Q53scn4step6weapon8deespear11StateVanishFv + .4byte procAnim__Q53scn4step6weapon8deespear11StateVanishFv + .4byte procMove__Q53scn4step6weapon8deespear11StateVanishFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon8deespear11StateVanishFv + .4byte procObjCollReact__Q53scn4step6weapon8deespear11StateVanishFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256857 diff --git a/asm/src/StateVomit.s b/asm/src/StateVomit.s index 4b5ae051..fcf2afed 100644 --- a/asm/src/StateVomit.s +++ b/asm/src/StateVomit.s @@ -506,41 +506,41 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10Stat __vt__Q53scn4step4boss13watergalboros10StateVomit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss13watergalboros10StateVomitFv - .byte4 procAnim__Q53scn4step4boss13watergalboros10StateVomitFv - .byte4 procMove__Q53scn4step4boss13watergalboros10StateVomitFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss13watergalboros10StateVomitFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss13watergalboros10StateVomitFv + .4byte procAnim__Q53scn4step4boss13watergalboros10StateVomitFv + .4byte procMove__Q53scn4step4boss13watergalboros10StateVomitFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss13watergalboros10StateVomitFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy10StateVomit __vt__Q53scn4step4boss6whispy10StateVomit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy10StateVomitFv - .byte4 procAnim__Q53scn4step4boss6whispy10StateVomitFv - .byte4 procMove__Q53scn4step4boss6whispy10StateVomitFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy10StateVomitFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6whispy10StateVomitFv + .4byte procAnim__Q53scn4step4boss6whispy10StateVomitFv + .4byte procMove__Q53scn4step4boss6whispy10StateVomitFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy10StateVomitFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateVomit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateVomit$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateVomit$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateVomit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateVomit$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateVomit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common10StateVomit __vt__Q53scn4step4hero6common10StateVomit: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common10StateVomitFv - .byte4 procAnim__Q53scn4step4hero6common10StateVomitFv - .byte4 procMove__Q53scn4step4hero6common10StateVomitFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common10StateVomitFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common10StateVomitFv + .4byte procAnim__Q53scn4step4hero6common10StateVomitFv + .4byte procMove__Q53scn4step4hero6common10StateVomitFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common10StateVomitFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateVomited.s b/asm/src/StateVomited.s index bae7be86..6ce941d1 100644 --- a/asm/src/StateVomited.s +++ b/asm/src/StateVomited.s @@ -810,13 +810,13 @@ lbl_8037555C: __vt__Q53scn4step4hero12interference12StateVomited: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero12interference12StateVomitedFv - .byte4 procAnim__Q53scn4step4hero12interference12StateVomitedFv - .byte4 procMove__Q53scn4step4hero12interference12StateVomitedFv - .byte4 procConstraint__Q53scn4step4hero12interference12StateVomitedFv - .byte4 procFixPos__Q53scn4step4hero12interference12StateVomitedFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero12interference12StateVomitedFv + .4byte procAnim__Q53scn4step4hero12interference12StateVomitedFv + .4byte procMove__Q53scn4step4hero12interference12StateVomitedFv + .4byte procConstraint__Q53scn4step4hero12interference12StateVomitedFv + .4byte procFixPos__Q53scn4step4hero12interference12StateVomitedFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateVulcan.s b/asm/src/StateVulcan.s index 3cb09977..79229d3f 100644 --- a/asm/src/StateVulcan.s +++ b/asm/src/StateVulcan.s @@ -581,31 +581,31 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash14State __vt__Q53scn4step5enemy10knucklejoe11StateVulcan: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10knucklejoe11StateVulcanFv - .byte4 procAnim__Q53scn4step5enemy10knucklejoe11StateVulcanFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10knucklejoe11StateVulcanFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10knucklejoe11StateVulcanFv + .4byte procAnim__Q53scn4step5enemy10knucklejoe11StateVulcanFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10knucklejoe11StateVulcanFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$4b$$1Fv - .byte4 create__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte __dt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .4byte create__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero7fighter11StateVulcan __vt__Q53scn4step4hero7fighter11StateVulcan: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter11StateVulcanFv - .byte4 procAnim__Q53scn4step4hero7fighter11StateVulcanFv - .byte4 procMove__Q53scn4step4hero7fighter11StateVulcanFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter11StateVulcanFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter11StateVulcanFv + .4byte procAnim__Q53scn4step4hero7fighter11StateVulcanFv + .4byte procMove__Q53scn4step4hero7fighter11StateVulcanFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter11StateVulcanFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -613,25 +613,25 @@ __vt__Q53scn4step4hero7fighter11StateVulcan: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash11StateVulcan$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash11StateVulcan$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash11StateVulcan$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash11StateVulcan$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash11StateVulcan$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash11StateVulcan$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5smash11StateVulcan __vt__Q53scn4step4hero5smash11StateVulcan: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5smash11StateVulcanFv - .byte4 procAnim__Q53scn4step4hero5smash11StateVulcanFv - .byte4 procMove__Q53scn4step4hero5smash11StateVulcanFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5smash11StateVulcanFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5smash11StateVulcanFv + .4byte procAnim__Q53scn4step4hero5smash11StateVulcanFv + .4byte procMove__Q53scn4step4hero5smash11StateVulcanFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5smash11StateVulcanFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateVulcanEnd.s b/asm/src/StateVulcanEnd.s index afec42b9..4e819964 100644 --- a/asm/src/StateVulcanEnd.s +++ b/asm/src/StateVulcanEnd.s @@ -138,13 +138,13 @@ procFixPos__Q53scn4step4hero5smash14StateVulcanEndFv: __vt__Q53scn4step4hero7fighter14StateVulcanEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7fighter14StateVulcanEndFv - .byte4 procAnim__Q53scn4step4hero7fighter14StateVulcanEndFv - .byte4 procMove__Q53scn4step4hero7fighter14StateVulcanEndFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7fighter14StateVulcanEndFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7fighter14StateVulcanEndFv + .4byte procAnim__Q53scn4step4hero7fighter14StateVulcanEndFv + .4byte procMove__Q53scn4step4hero7fighter14StateVulcanEndFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7fighter14StateVulcanEndFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -152,11 +152,11 @@ __vt__Q53scn4step4hero7fighter14StateVulcanEnd: __vt__Q53scn4step4hero5smash14StateVulcanEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5smash14StateVulcanEndFv - .byte4 procAnim__Q53scn4step4hero5smash14StateVulcanEndFv - .byte4 procMove__Q53scn4step4hero5smash14StateVulcanEndFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5smash14StateVulcanEndFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5smash14StateVulcanEndFv + .4byte procAnim__Q53scn4step4hero5smash14StateVulcanEndFv + .4byte procMove__Q53scn4step4hero5smash14StateVulcanEndFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5smash14StateVulcanEndFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWaft.s b/asm/src/StateWaft.s index 3353dead..f348c855 100644 --- a/asm/src/StateWaft.s +++ b/asm/src/StateWaft.s @@ -177,10 +177,10 @@ $$255349: __vt__Q53scn4step4item5state9StateWaft: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4item5state9StateWaftFv - .byte4 procAnim__Q53scn4step4item5state9StateWaftFv - .byte4 procMove__Q53scn4step4item5state9StateWaftFv - .byte4 procFixPos__Q43scn4step4item9StateBaseFv + .4byte __dt__Q53scn4step4item5state9StateWaftFv + .4byte procAnim__Q53scn4step4item5state9StateWaftFv + .4byte procMove__Q53scn4step4item5state9StateWaftFv + .4byte procFixPos__Q43scn4step4item9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255346 diff --git a/asm/src/StateWait.s b/asm/src/StateWait.s index c669da14..df4f53f9 100644 --- a/asm/src/StateWait.s +++ b/asm/src/StateWait.s @@ -2620,205 +2620,205 @@ __dt__Q53scn4step6weapon19challengemastershot9StateWaitFv: __vt__Q53scn4step4boss6common9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6common9StateWaitFv - .byte4 procAnim__Q53scn4step4boss6common9StateWaitFv - .byte4 procMove__Q53scn4step4boss6common9StateWaitFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6common9StateWaitFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6common9StateWaitFv + .4byte procAnim__Q53scn4step4boss6common9StateWaitFv + .4byte procMove__Q53scn4step4boss6common9StateWaitFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6common9StateWaitFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior9StateWait __vt__Q53scn4step4boss6dubior9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6dubior9StateWaitFv - .byte4 procAnim__Q53scn4step4boss6dubior9StateWaitFv - .byte4 procMove__Q53scn4step4boss6dubior9StateWaitFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6dubior9StateWaitFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6dubior9StateWaitFv + .4byte procAnim__Q53scn4step4boss6dubior9StateWaitFv + .4byte procMove__Q53scn4step4boss6dubior9StateWaitFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6dubior9StateWaitFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy9StateWait __vt__Q53scn4step4boss6whispy9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss6whispy9StateWaitFv - .byte4 procAnim__Q53scn4step4boss6whispy9StateWaitFv - .byte4 procMove__Q53scn4step4boss6whispy9StateWaitFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss6whispy9StateWaitFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss6whispy9StateWaitFv + .4byte procAnim__Q53scn4step4boss6whispy9StateWaitFv + .4byte procMove__Q53scn4step4boss6whispy9StateWaitFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss6whispy9StateWaitFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common9StateWait __vt__Q53scn4step5enemy6common9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common9StateWaitFv - .byte4 procAnim__Q53scn4step5enemy6common9StateWaitFv - .byte4 procMove__Q53scn4step5enemy6common9StateWaitFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common9StateWaitFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common9StateWaitFv + .4byte procAnim__Q53scn4step5enemy6common9StateWaitFv + .4byte procMove__Q53scn4step5enemy6common9StateWaitFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common9StateWaitFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StateTakeOff$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StateTakeOff$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StateTakeOff$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StateTakeOff$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StateTakeOff$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StateTakeOff$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10brontoburt9StateWait __vt__Q53scn4step5enemy10brontoburt9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10brontoburt9StateWaitFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10brontoburt9StateWaitFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10brontoburt9StateWaitFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10brontoburt9StateWaitFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5foley9StateWait __vt__Q53scn4step5enemy5foley9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5foley9StateWaitFv - .byte4 procAnim__Q53scn4step5enemy5foley9StateWaitFv - .byte4 procMove__Q53scn4step5enemy5foley9StateWaitFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5foley9StateWaitFv + .4byte procAnim__Q53scn4step5enemy5foley9StateWaitFv + .4byte procMove__Q53scn4step5enemy5foley9StateWaitFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7gigatzo9StateWait __vt__Q53scn4step5enemy7gigatzo9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy7gigatzo9StateWaitFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy7gigatzo9StateWaitFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy7gigatzo9StateWaitFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy7gigatzo9StateWaitFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy7gigatzo9StateWaitFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy7gigatzo9StateWaitFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer9StateWait __vt__Q53scn4step5enemy6lanzer9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6lanzer9StateWaitFv - .byte4 procAnim__Q53scn4step5enemy6lanzer9StateWaitFv - .byte4 procMove__Q53scn4step5enemy6lanzer9StateWaitFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6lanzer9StateWaitFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6lanzer9StateWaitFv + .4byte procAnim__Q53scn4step5enemy6lanzer9StateWaitFv + .4byte procMove__Q53scn4step5enemy6lanzer9StateWaitFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6lanzer9StateWaitFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6leafan9StateWait __vt__Q53scn4step5enemy6leafan9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6leafan9StateWaitFv - .byte4 procAnim__Q53scn4step5enemy6leafan9StateWaitFv - .byte4 procMove__Q53scn4step5enemy6leafan9StateWaitFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6leafan9StateWaitFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6leafan9StateWaitFv + .4byte procAnim__Q53scn4step5enemy6leafan9StateWaitFv + .4byte procMove__Q53scn4step5enemy6leafan9StateWaitFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6leafan9StateWaitFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy14poppybrojrbomb9StateWait __vt__Q53scn4step5enemy14poppybrojrbomb9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy14poppybrojrbomb9StateWaitFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy14poppybrojrbomb9StateWaitFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo9StateWait __vt__Q53scn4step5enemy6shotzo9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6shotzo9StateWaitFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy6shotzo9StateWaitFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6shotzo9StateWaitFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6shotzo9StateWaitFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy6shotzo9StateWaitFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6shotzo9StateWaitFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble10StateCatch$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble10StateCatch$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble10StateCatch$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble10StateCatch$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble10StateCatch$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble10StateCatch$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9sirkibble9StateWait __vt__Q53scn4step5enemy9sirkibble9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9sirkibble9StateWaitFv - .byte4 procAnim__Q53scn4step5enemy9sirkibble9StateWaitFv - .byte4 procMove__Q53scn4step5enemy9sirkibble9StateWaitFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9sirkibble9StateWaitFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9sirkibble9StateWaitFv + .4byte procAnim__Q53scn4step5enemy9sirkibble9StateWaitFv + .4byte procMove__Q53scn4step5enemy9sirkibble9StateWaitFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9sirkibble9StateWaitFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory9StateWait __vt__Q53scn4step5enemy6sodory9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6sodory9StateWaitFv - .byte4 procAnim__Q53scn4step5enemy6sodory9StateWaitFv - .byte4 procMove__Q53scn4step5enemy6sodory9StateWaitFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6sodory9StateWaitFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6sodory9StateWaitFv + .4byte procAnim__Q53scn4step5enemy6sodory9StateWaitFv + .4byte procMove__Q53scn4step5enemy6sodory9StateWaitFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6sodory9StateWaitFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage9StateWait __vt__Q53scn4step5enemy9tsukikage9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9tsukikage9StateWaitFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy9tsukikage9StateWaitFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9tsukikage9StateWaitFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9tsukikage9StateWaitFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy9tsukikage9StateWaitFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9tsukikage9StateWaitFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledee9StateWait __vt__Q53scn4step5enemy9waddledee9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledee9StateWaitFv - .byte4 procAnim__Q53scn4step5enemy9waddledee9StateWaitFv - .byte4 procMove__Q53scn4step5enemy9waddledee9StateWaitFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9waddledee9StateWaitFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9waddledee9StateWaitFv + .4byte procAnim__Q53scn4step5enemy9waddledee9StateWaitFv + .4byte procMove__Q53scn4step5enemy9waddledee9StateWaitFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9waddledee9StateWaitFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common9StateWait __vt__Q53scn4step4hero6common9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common9StateWaitFv - .byte4 procAnim__Q53scn4step4hero6common9StateWaitFv - .byte4 procMove__Q53scn4step4hero6common9StateWaitFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common9StateWaitFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common9StateWaitFv + .4byte procAnim__Q53scn4step4hero6common9StateWaitFv + .4byte procMove__Q53scn4step4hero6common9StateWaitFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common9StateWaitFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -2826,13 +2826,13 @@ __vt__Q53scn4step4hero6common9StateWait: __vt__Q53scn4step4hero5stone9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5stone9StateWaitFv - .byte4 procAnim__Q53scn4step4hero5stone9StateWaitFv - .byte4 procMove__Q53scn4step4hero5stone9StateWaitFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero5stone9StateWaitFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero5stone9StateWaitFv + .4byte procAnim__Q53scn4step4hero5stone9StateWaitFv + .4byte procMove__Q53scn4step4hero5stone9StateWaitFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero5stone9StateWaitFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -2840,19 +2840,19 @@ __vt__Q53scn4step4hero5stone9StateWait: __vt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWalk$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWalk$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv - .byte4 create__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWalk$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv + .4byte __dt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWalk$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv + .4byte create__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWalk$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv .global __vt__Q53scn4step4hero11staffcredit9StateWait __vt__Q53scn4step4hero11staffcredit9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero11staffcredit9StateWaitFv - .byte4 procAnim__Q53scn4step4hero11staffcredit9StateWaitFv - .byte4 procMove__Q53scn4step4hero11staffcredit9StateWaitFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero11staffcredit9StateWaitFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero11staffcredit9StateWaitFv + .4byte procAnim__Q53scn4step4hero11staffcredit9StateWaitFv + .4byte procMove__Q53scn4step4hero11staffcredit9StateWaitFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero11staffcredit9StateWaitFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -2860,12 +2860,12 @@ __vt__Q53scn4step4hero11staffcredit9StateWait: __vt__Q53scn4step6weapon19challengemastershot9StateWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon19challengemastershot9StateWaitFv - .byte4 procAnim__Q53scn4step6weapon19challengemastershot9StateWaitFv - .byte4 procMove__Q53scn4step6weapon19challengemastershot9StateWaitFv - .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv - .byte4 procFixPos__Q53scn4step6weapon19challengemastershot9StateWaitFv - .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv + .4byte __dt__Q53scn4step6weapon19challengemastershot9StateWaitFv + .4byte procAnim__Q53scn4step6weapon19challengemastershot9StateWaitFv + .4byte procMove__Q53scn4step6weapon19challengemastershot9StateWaitFv + .4byte procConstraint__Q43scn4step6weapon9StateBaseFv + .4byte procFixPos__Q53scn4step6weapon19challengemastershot9StateWaitFv + .4byte procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254787 diff --git a/asm/src/StateWaitFar.s b/asm/src/StateWaitFar.s index 84d8a2dd..437420c0 100644 --- a/asm/src/StateWaitFar.s +++ b/asm/src/StateWaitFar.s @@ -225,15 +225,15 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateWaitFar$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateWaitFar$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateWaitFar$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateWaitFar$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateWaitFar$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss10creditroah12StateWaitFar __vt__Q53scn4step4boss10creditroah12StateWaitFar: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss10creditroah12StateWaitFarFv - .byte4 procAnim__Q53scn4step4boss10creditroah12StateWaitFarFv - .byte4 procMove__Q53scn4step4boss10creditroah12StateWaitFarFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss10creditroah12StateWaitFarFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss10creditroah12StateWaitFarFv + .4byte procAnim__Q53scn4step4boss10creditroah12StateWaitFarFv + .4byte procMove__Q53scn4step4boss10creditroah12StateWaitFarFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss10creditroah12StateWaitFarFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateWakeUp.s b/asm/src/StateWakeUp.s index 4c6d75cd..847b1c20 100644 --- a/asm/src/StateWakeUp.s +++ b/asm/src/StateWakeUp.s @@ -126,11 +126,11 @@ procFixPos__Q53scn4step4hero6common11StateWakeUpFv: __vt__Q53scn4step4hero6common11StateWakeUp: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common11StateWakeUpFv - .byte4 procAnim__Q53scn4step4hero6common11StateWakeUpFv - .byte4 procMove__Q53scn4step4hero6common11StateWakeUpFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common11StateWakeUpFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common11StateWakeUpFv + .4byte procAnim__Q53scn4step4hero6common11StateWakeUpFv + .4byte procMove__Q53scn4step4hero6common11StateWakeUpFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common11StateWakeUpFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWalk.s b/asm/src/StateWalk.s index ed909aa4..d09c87cd 100644 --- a/asm/src/StateWalk.s +++ b/asm/src/StateWalk.s @@ -2751,121 +2751,121 @@ procFixPos__Q53scn4step4hero11staffcredit9StateWalkFv: __vt__Q53scn4step5enemy11bladeknight9StateWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11bladeknight9StateWalkFv - .byte4 procAnim__Q53scn4step5enemy11bladeknight9StateWalkFv - .byte4 procMove__Q53scn4step5enemy11bladeknight9StateWalkFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11bladeknight9StateWalkFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11bladeknight9StateWalkFv + .4byte procAnim__Q53scn4step5enemy11bladeknight9StateWalkFv + .4byte procMove__Q53scn4step5enemy11bladeknight9StateWalkFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11bladeknight9StateWalkFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter9StateWalk __vt__Q53scn4step5enemy11broomhatter9StateWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11broomhatter9StateWalkFv - .byte4 procAnim__Q53scn4step5enemy11broomhatter9StateWalkFv - .byte4 procMove__Q53scn4step5enemy11broomhatter9StateWalkFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11broomhatter9StateWalkFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11broomhatter9StateWalkFv + .4byte procAnim__Q53scn4step5enemy11broomhatter9StateWalkFv + .4byte procMove__Q53scn4step5enemy11broomhatter9StateWalkFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11broomhatter9StateWalkFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe9StateWalk __vt__Q53scn4step5enemy10knucklejoe9StateWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10knucklejoe9StateWalkFv - .byte4 procAnim__Q53scn4step5enemy10knucklejoe9StateWalkFv - .byte4 procMove__Q53scn4step5enemy10knucklejoe9StateWalkFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10knucklejoe9StateWalkFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10knucklejoe9StateWalkFv + .4byte procAnim__Q53scn4step5enemy10knucklejoe9StateWalkFv + .4byte procMove__Q53scn4step5enemy10knucklejoe9StateWalkFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10knucklejoe9StateWalkFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer9StateWalk __vt__Q53scn4step5enemy6lanzer9StateWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6lanzer9StateWalkFv - .byte4 procAnim__Q53scn4step5enemy6lanzer9StateWalkFv - .byte4 procMove__Q53scn4step5enemy6lanzer9StateWalkFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6lanzer9StateWalkFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6lanzer9StateWalkFv + .4byte procAnim__Q53scn4step5enemy6lanzer9StateWalkFv + .4byte procMove__Q53scn4step5enemy6lanzer9StateWalkFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6lanzer9StateWalkFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5noddy9StateWalk __vt__Q53scn4step5enemy5noddy9StateWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5noddy9StateWalkFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q53scn4step5enemy5noddy9StateWalkFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5noddy9StateWalkFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5noddy9StateWalkFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q53scn4step5enemy5noddy9StateWalkFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5noddy9StateWalkFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStop$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStop$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStop$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStop$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStop$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStop$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5nruff9StateWalk __vt__Q53scn4step5enemy5nruff9StateWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5nruff9StateWalkFv - .byte4 procAnim__Q53scn4step5enemy5nruff9StateWalkFv - .byte4 procMove__Q53scn4step5enemy5nruff9StateWalkFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5nruff9StateWalkFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5nruff9StateWalkFv + .4byte procAnim__Q53scn4step5enemy5nruff9StateWalkFv + .4byte procMove__Q53scn4step5enemy5nruff9StateWalkFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5nruff9StateWalkFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky16StateCliffAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky16StateCliffAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky16StateCliffAttack$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky16StateCliffAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky16StateCliffAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky16StateCliffAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateWalkEnd$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateWalkEnd$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateWalkEnd$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateWalkEnd$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateWalkEnd$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateWalkEnd$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5rocky9StateWalk __vt__Q53scn4step5enemy5rocky9StateWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5rocky9StateWalkFv - .byte4 procAnim__Q53scn4step5enemy5rocky9StateWalkFv - .byte4 procMove__Q53scn4step5enemy5rocky9StateWalkFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5rocky9StateWalkFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5rocky9StateWalkFv + .4byte procAnim__Q53scn4step5enemy5rocky9StateWalkFv + .4byte procMove__Q53scn4step5enemy5rocky9StateWalkFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5rocky9StateWalkFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWalk$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWalk$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWalk$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWalk$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWalk$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWalk$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common9StateWalk __vt__Q53scn4step4hero6common9StateWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common9StateWalkFv - .byte4 procAnim__Q53scn4step4hero6common9StateWalkFv - .byte4 procMove__Q53scn4step4hero6common9StateWalkFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common9StateWalkFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common9StateWalkFv + .4byte procAnim__Q53scn4step4hero6common9StateWalkFv + .4byte procMove__Q53scn4step4hero6common9StateWalkFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common9StateWalkFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -2873,13 +2873,13 @@ __vt__Q53scn4step4hero6common9StateWalk: __vt__Q53scn4step4hero11staffcredit9StateWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero11staffcredit9StateWalkFv - .byte4 procAnim__Q53scn4step4hero11staffcredit9StateWalkFv - .byte4 procMove__Q53scn4step4hero11staffcredit9StateWalkFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero11staffcredit9StateWalkFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero11staffcredit9StateWalkFv + .4byte procAnim__Q53scn4step4hero11staffcredit9StateWalkFv + .4byte procMove__Q53scn4step4hero11staffcredit9StateWalkFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero11staffcredit9StateWalkFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateWalkAround.s b/asm/src/StateWalkAround.s index 3dfd18c4..8b0948e0 100644 --- a/asm/src/StateWalkAround.s +++ b/asm/src/StateWalkAround.s @@ -1389,48 +1389,48 @@ lbl_802E6A34: __vt__Q53scn4step5enemy6common15StateWalkAround: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common15StateWalkAroundFv - .byte4 procAnim__Q53scn4step5enemy6common15StateWalkAroundFv - .byte4 procMove__Q53scn4step5enemy6common15StateWalkAroundFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common15StateWalkAroundFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common15StateWalkAroundFv + .4byte procAnim__Q53scn4step5enemy6common15StateWalkAroundFv + .4byte procMove__Q53scn4step5enemy6common15StateWalkAroundFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common15StateWalkAroundFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter15StateWalkAround __vt__Q53scn4step5enemy11broomhatter15StateWalkAround: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy11broomhatter15StateWalkAroundFv - .byte4 procAnim__Q53scn4step5enemy11broomhatter15StateWalkAroundFv - .byte4 procMove__Q53scn4step5enemy11broomhatter15StateWalkAroundFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy11broomhatter15StateWalkAroundFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy11broomhatter15StateWalkAroundFv + .4byte procAnim__Q53scn4step5enemy11broomhatter15StateWalkAroundFv + .4byte procMove__Q53scn4step5enemy11broomhatter15StateWalkAroundFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy11broomhatter15StateWalkAroundFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer15StateWalkAround __vt__Q53scn4step5enemy6lanzer15StateWalkAround: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6lanzer15StateWalkAroundFv - .byte4 procAnim__Q53scn4step5enemy6lanzer15StateWalkAroundFv - .byte4 procMove__Q53scn4step5enemy6lanzer15StateWalkAroundFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6lanzer15StateWalkAroundFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6lanzer15StateWalkAroundFv + .4byte procAnim__Q53scn4step5enemy6lanzer15StateWalkAroundFv + .4byte procMove__Q53scn4step5enemy6lanzer15StateWalkAroundFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6lanzer15StateWalkAroundFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory15StateWalkAround __vt__Q53scn4step5enemy6sodory15StateWalkAround: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6sodory15StateWalkAroundFv - .byte4 procAnim__Q53scn4step5enemy6sodory15StateWalkAroundFv - .byte4 procMove__Q53scn4step5enemy6sodory15StateWalkAroundFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6sodory15StateWalkAroundFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6sodory15StateWalkAroundFv + .4byte procAnim__Q53scn4step5enemy6sodory15StateWalkAroundFv + .4byte procMove__Q53scn4step5enemy6sodory15StateWalkAroundFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6sodory15StateWalkAroundFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255928 diff --git a/asm/src/StateWalkEnd.s b/asm/src/StateWalkEnd.s index e11d234e..c0c85289 100644 --- a/asm/src/StateWalkEnd.s +++ b/asm/src/StateWalkEnd.s @@ -93,12 +93,12 @@ lbl_802D5F54: __vt__Q53scn4step5enemy5rocky12StateWalkEnd: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5rocky12StateWalkEndFv - .byte4 procAnim__Q53scn4step5enemy5rocky12StateWalkEndFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5rocky12StateWalkEndFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5rocky12StateWalkEndFv + .4byte procAnim__Q53scn4step5enemy5rocky12StateWalkEndFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5rocky12StateWalkEndFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255720 diff --git a/asm/src/StateWalkStart.s b/asm/src/StateWalkStart.s index 32e45add..f23048d1 100644 --- a/asm/src/StateWalkStart.s +++ b/asm/src/StateWalkStart.s @@ -98,18 +98,18 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9State __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5rocky14StateWalkStart __vt__Q53scn4step5enemy5rocky14StateWalkStart: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5rocky14StateWalkStartFv - .byte4 procAnim__Q53scn4step5enemy5rocky14StateWalkStartFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5rocky14StateWalkStartFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5rocky14StateWalkStartFv + .4byte procAnim__Q53scn4step5enemy5rocky14StateWalkStartFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5rocky14StateWalkStartFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255797 diff --git a/asm/src/StateWalkStepBack.s b/asm/src/StateWalkStepBack.s index 7b6821fa..0f2df0d2 100644 --- a/asm/src/StateWalkStepBack.s +++ b/asm/src/StateWalkStepBack.s @@ -426,12 +426,12 @@ lbl_802C1718: __vt__Q53scn4step5enemy10knucklejoe17StateWalkStepBack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10knucklejoe17StateWalkStepBackFv - .byte4 procAnim__Q53scn4step5enemy10knucklejoe17StateWalkStepBackFv - .byte4 procMove__Q53scn4step5enemy10knucklejoe17StateWalkStepBackFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10knucklejoe17StateWalkStepBackFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10knucklejoe17StateWalkStepBackFv + .4byte procAnim__Q53scn4step5enemy10knucklejoe17StateWalkStepBackFv + .4byte procMove__Q53scn4step5enemy10knucklejoe17StateWalkStepBackFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10knucklejoe17StateWalkStepBackFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256282 diff --git a/asm/src/StateWalkStraight.s b/asm/src/StateWalkStraight.s index 32646bbb..4ac7735d 100644 --- a/asm/src/StateWalkStraight.s +++ b/asm/src/StateWalkStraight.s @@ -1057,48 +1057,48 @@ lbl_802CF618: __vt__Q53scn4step5enemy6common17StateWalkStraight: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6common17StateWalkStraightFv - .byte4 procAnim__Q53scn4step5enemy6common17StateWalkStraightFv - .byte4 procMove__Q53scn4step5enemy6common17StateWalkStraightFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6common17StateWalkStraightFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6common17StateWalkStraightFv + .4byte procAnim__Q53scn4step5enemy6common17StateWalkStraightFv + .4byte procMove__Q53scn4step5enemy6common17StateWalkStraightFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6common17StateWalkStraightFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8needlous17StateWalkStraight __vt__Q53scn4step5enemy8needlous17StateWalkStraight: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy8needlous17StateWalkStraightFv - .byte4 procAnim__Q53scn4step5enemy8needlous17StateWalkStraightFv - .byte4 procMove__Q53scn4step5enemy8needlous17StateWalkStraightFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy8needlous17StateWalkStraightFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy8needlous17StateWalkStraightFv + .4byte procAnim__Q53scn4step5enemy8needlous17StateWalkStraightFv + .4byte procMove__Q53scn4step5enemy8needlous17StateWalkStraightFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy8needlous17StateWalkStraightFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldee17StateWalkStraight __vt__Q53scn4step5enemy10parasoldee17StateWalkStraight: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10parasoldee17StateWalkStraightFv - .byte4 procAnim__Q53scn4step5enemy10parasoldee17StateWalkStraightFv - .byte4 procMove__Q53scn4step5enemy10parasoldee17StateWalkStraightFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10parasoldee17StateWalkStraightFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10parasoldee17StateWalkStraightFv + .4byte procAnim__Q53scn4step5enemy10parasoldee17StateWalkStraightFv + .4byte procMove__Q53scn4step5enemy10parasoldee17StateWalkStraightFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10parasoldee17StateWalkStraightFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo17StateWalkStraight __vt__Q53scn4step5enemy10parasoldoo17StateWalkStraight: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10parasoldoo17StateWalkStraightFv - .byte4 procAnim__Q53scn4step5enemy10parasoldoo17StateWalkStraightFv - .byte4 procMove__Q53scn4step5enemy10parasoldoo17StateWalkStraightFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10parasoldoo17StateWalkStraightFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10parasoldoo17StateWalkStraightFv + .4byte procAnim__Q53scn4step5enemy10parasoldoo17StateWalkStraightFv + .4byte procMove__Q53scn4step5enemy10parasoldoo17StateWalkStraightFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10parasoldoo17StateWalkStraightFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255905 diff --git a/asm/src/StateWall.s b/asm/src/StateWall.s index 386a9865..efe14fe4 100644 --- a/asm/src/StateWall.s +++ b/asm/src/StateWall.s @@ -143,12 +143,12 @@ lbl_802EC4E0: __vt__Q53scn4step5enemy9tsukikage9StateWall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9tsukikage9StateWallFv - .byte4 procAnim__Q43scn4step5enemy9StateBaseFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9tsukikage9StateWallFv + .4byte procAnim__Q43scn4step5enemy9StateBaseFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255060 diff --git a/asm/src/StateWallAttack.s b/asm/src/StateWallAttack.s index 5221a6a0..01a9d02a 100644 --- a/asm/src/StateWallAttack.s +++ b/asm/src/StateWallAttack.s @@ -176,12 +176,12 @@ lbl_802EC750: __vt__Q53scn4step5enemy9tsukikage15StateWallAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9tsukikage15StateWallAttackFv - .byte4 procAnim__Q53scn4step5enemy9tsukikage15StateWallAttackFv - .byte4 procMove__Q43scn4step5enemy9StateBaseFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9tsukikage15StateWallAttackFv + .4byte procAnim__Q53scn4step5enemy9tsukikage15StateWallAttackFv + .4byte procMove__Q43scn4step5enemy9StateBaseFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q43scn4step5enemy9StateBaseFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255084 diff --git a/asm/src/StateWarp.s b/asm/src/StateWarp.s index e3d3dc24..60e8afcf 100644 --- a/asm/src/StateWarp.s +++ b/asm/src/StateWarp.s @@ -655,12 +655,12 @@ lbl_802ED08C: __vt__Q53scn4step5enemy9tsukikage9StateWarp: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9tsukikage9StateWarpFv - .byte4 procAnim__Q53scn4step5enemy9tsukikage9StateWarpFv - .byte4 procMove__Q53scn4step5enemy9tsukikage9StateWarpFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9tsukikage9StateWarpFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9tsukikage9StateWarpFv + .4byte procAnim__Q53scn4step5enemy9tsukikage9StateWarpFv + .4byte procMove__Q53scn4step5enemy9tsukikage9StateWarpFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9tsukikage9StateWarpFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257655 diff --git a/asm/src/StateWarpStar.s b/asm/src/StateWarpStar.s index 9174afdf..7f6d8fa2 100644 --- a/asm/src/StateWarpStar.s +++ b/asm/src/StateWarpStar.s @@ -769,11 +769,11 @@ lbl_80382BAC: __vt__Q53scn4step4hero7gimmick13StateWarpStar: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick13StateWarpStarFv - .byte4 procAnim__Q53scn4step4hero7gimmick13StateWarpStarFv - .byte4 procMove__Q53scn4step4hero7gimmick13StateWarpStarFv - .byte4 procConstraint__Q53scn4step4hero7gimmick13StateWarpStarFv - .byte4 procFixPos__Q43scn4step4hero9StateBaseFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick13StateWarpStarFv + .4byte procAnim__Q53scn4step4hero7gimmick13StateWarpStarFv + .4byte procMove__Q53scn4step4hero7gimmick13StateWarpStarFv + .4byte procConstraint__Q53scn4step4hero7gimmick13StateWarpStarFv + .4byte procFixPos__Q43scn4step4hero9StateBaseFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWarpStarFall.s b/asm/src/StateWarpStarFall.s index bb12192a..421190ee 100644 --- a/asm/src/StateWarpStarFall.s +++ b/asm/src/StateWarpStarFall.s @@ -477,26 +477,26 @@ __sinit_$$3StateWarpStarFall_cpp: /* 8038330C 0037F14C 4B D3 AD B4 */ b __ct__Q34nw4r4math4VEC3Ffff .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3StateWarpStarFall_cpp + .4byte __sinit_$$3StateWarpStarFall_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay$$4PQ43scn4step4hero4Hero$$4i$$1 __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay$$4PQ43scn4step4hero4Hero$$4i$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay$$4PQ43scn4step4hero4Hero$$4i$$1Fv - .byte4 create__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay$$4PQ43scn4step4hero4Hero$$4i$$1Fv + .4byte __dt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay$$4PQ43scn4step4hero4Hero$$4i$$1Fv + .4byte create__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay$$4PQ43scn4step4hero4Hero$$4i$$1Fv .global __vt__Q53scn4step4hero7gimmick17StateWarpStarFall __vt__Q53scn4step4hero7gimmick17StateWarpStarFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick17StateWarpStarFallFv - .byte4 procAnim__Q53scn4step4hero7gimmick17StateWarpStarFallFv - .byte4 procMove__Q53scn4step4hero7gimmick17StateWarpStarFallFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero7gimmick17StateWarpStarFallFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick17StateWarpStarFallFv + .4byte procAnim__Q53scn4step4hero7gimmick17StateWarpStarFallFv + .4byte procMove__Q53scn4step4hero7gimmick17StateWarpStarFallFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero7gimmick17StateWarpStarFallFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateWarpStarIn.s b/asm/src/StateWarpStarIn.s index 7e8eabdc..62d3fe94 100644 --- a/asm/src/StateWarpStarIn.s +++ b/asm/src/StateWarpStarIn.s @@ -670,7 +670,7 @@ __sinit_$$3StateWarpStarIn_cpp: /* 80383CD4 0037FB14 4B D3 A3 EC */ b __ct__Q34nw4r4math4VEC3Ffff .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3StateWarpStarIn_cpp + .4byte __sinit_$$3StateWarpStarIn_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$260738 @@ -681,19 +681,19 @@ $$260738: __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateWarpStarFall$$4PQ43scn4step4hero4Hero$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateWarpStarFall$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv - .byte4 create__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateWarpStarFall$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte __dt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateWarpStarFall$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte create__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateWarpStarFall$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q53scn4step4hero7gimmick15StateWarpStarIn __vt__Q53scn4step4hero7gimmick15StateWarpStarIn: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero7gimmick15StateWarpStarInFv - .byte4 procAnim__Q53scn4step4hero7gimmick15StateWarpStarInFv - .byte4 procMove__Q53scn4step4hero7gimmick15StateWarpStarInFv - .byte4 procConstraint__Q53scn4step4hero7gimmick15StateWarpStarInFv - .byte4 procFixPos__Q43scn4step4hero9StateBaseFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero7gimmick15StateWarpStarInFv + .4byte procAnim__Q53scn4step4hero7gimmick15StateWarpStarInFv + .4byte procMove__Q53scn4step4hero7gimmick15StateWarpStarInFv + .4byte procConstraint__Q53scn4step4hero7gimmick15StateWarpStarInFv + .4byte procFixPos__Q43scn4step4hero9StateBaseFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/StateWaterFloat.s b/asm/src/StateWaterFloat.s index 599f0d9f..f4688cf6 100644 --- a/asm/src/StateWaterFloat.s +++ b/asm/src/StateWaterFloat.s @@ -449,17 +449,17 @@ __dt__Q24util96StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero6common9State __vt__Q24util96StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$4b$$4b$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$4b$$4b$$1Fv - .byte4 create__Q24util96StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$4b$$4b$$1Fv + .4byte __dt__Q24util96StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$4b$$4b$$1Fv + .4byte create__Q24util96StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$4b$$4b$$1Fv .global __vt__Q53scn4step4hero6common15StateWaterFloat __vt__Q53scn4step4hero6common15StateWaterFloat: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common15StateWaterFloatFv - .byte4 procAnim__Q53scn4step4hero6common15StateWaterFloatFv - .byte4 procMove__Q53scn4step4hero6common15StateWaterFloatFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common15StateWaterFloatFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common15StateWaterFloatFv + .4byte procAnim__Q53scn4step4hero6common15StateWaterFloatFv + .4byte procMove__Q53scn4step4hero6common15StateWaterFloatFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common15StateWaterFloatFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWaterPistol.s b/asm/src/StateWaterPistol.s index 5de7eaa8..45ffb4c4 100644 --- a/asm/src/StateWaterPistol.s +++ b/asm/src/StateWaterPistol.s @@ -358,19 +358,19 @@ __dt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common16Sta __vt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common16StateWaterPistol$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common16StateWaterPistol$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1Fv - .byte4 create__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common16StateWaterPistol$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1Fv + .4byte __dt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common16StateWaterPistol$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1Fv + .4byte create__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common16StateWaterPistol$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1Fv .global __vt__Q53scn4step4hero6common16StateWaterPistol __vt__Q53scn4step4hero6common16StateWaterPistol: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common16StateWaterPistolFv - .byte4 procAnim__Q53scn4step4hero6common16StateWaterPistolFv - .byte4 procMove__Q53scn4step4hero6common16StateWaterPistolFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common16StateWaterPistolFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common16StateWaterPistolFv + .4byte procAnim__Q53scn4step4hero6common16StateWaterPistolFv + .4byte procMove__Q53scn4step4hero6common16StateWaterPistolFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common16StateWaterPistolFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateWaterPistolFloat.s b/asm/src/StateWaterPistolFloat.s index d0d44032..9f0e67e4 100644 --- a/asm/src/StateWaterPistolFloat.s +++ b/asm/src/StateWaterPistolFloat.s @@ -247,19 +247,19 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common21Sta __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common21StateWaterPistolFloat$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common21StateWaterPistolFloat$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common21StateWaterPistolFloat$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common21StateWaterPistolFloat$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common21StateWaterPistolFloat$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common21StateWaterPistolFloat __vt__Q53scn4step4hero6common21StateWaterPistolFloat: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common21StateWaterPistolFloatFv - .byte4 procAnim__Q53scn4step4hero6common21StateWaterPistolFloatFv - .byte4 procMove__Q53scn4step4hero6common21StateWaterPistolFloatFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common21StateWaterPistolFloatFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common21StateWaterPistolFloatFv + .4byte procAnim__Q53scn4step4hero6common21StateWaterPistolFloatFv + .4byte procMove__Q53scn4step4hero6common21StateWaterPistolFloatFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common21StateWaterPistolFloatFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateWaterWait.s b/asm/src/StateWaterWait.s index 65eba0ae..0687a17c 100644 --- a/asm/src/StateWaterWait.s +++ b/asm/src/StateWaterWait.s @@ -435,17 +435,17 @@ __dt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common14Stat __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv - .byte4 create__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte __dt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte create__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q53scn4step4hero6common14StateWaterWait __vt__Q53scn4step4hero6common14StateWaterWait: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common14StateWaterWaitFv - .byte4 procAnim__Q53scn4step4hero6common14StateWaterWaitFv - .byte4 procMove__Q53scn4step4hero6common14StateWaterWaitFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common14StateWaterWaitFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common14StateWaterWaitFv + .4byte procAnim__Q53scn4step4hero6common14StateWaterWaitFv + .4byte procMove__Q53scn4step4hero6common14StateWaterWaitFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common14StateWaterWaitFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWaterWalk.s b/asm/src/StateWaterWalk.s index dd3c6cb6..439519cb 100644 --- a/asm/src/StateWaterWalk.s +++ b/asm/src/StateWaterWalk.s @@ -342,17 +342,17 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14Stat __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWalk$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWalk$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWalk$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWalk$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWalk$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common14StateWaterWalk __vt__Q53scn4step4hero6common14StateWaterWalk: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero6common14StateWaterWalkFv - .byte4 procAnim__Q53scn4step4hero6common14StateWaterWalkFv - .byte4 procMove__Q53scn4step4hero6common14StateWaterWalkFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero6common14StateWaterWalkFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero6common14StateWaterWalkFv + .4byte procAnim__Q53scn4step4hero6common14StateWaterWalkFv + .4byte procMove__Q53scn4step4hero6common14StateWaterWalkFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero6common14StateWaterWalkFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipAttack.s b/asm/src/StateWhipAttack.s index 069f1c2b..1cc5810a 100644 --- a/asm/src/StateWhipAttack.s +++ b/asm/src/StateWhipAttack.s @@ -59,11 +59,11 @@ procFixPos__Q53scn4step4hero4whip15StateWhipAttackFv: __vt__Q53scn4step4hero4whip15StateWhipAttack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4whip15StateWhipAttackFv - .byte4 procAnim__Q53scn4step4hero4whip15StateWhipAttackFv - .byte4 procMove__Q53scn4step4hero4whip15StateWhipAttackFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4whip15StateWhipAttackFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4whip15StateWhipAttackFv + .4byte procAnim__Q53scn4step4hero4whip15StateWhipAttackFv + .4byte procMove__Q53scn4step4hero4whip15StateWhipAttackFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4whip15StateWhipAttackFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipAttackAir.s b/asm/src/StateWhipAttackAir.s index 8ef1798b..d11cbab4 100644 --- a/asm/src/StateWhipAttackAir.s +++ b/asm/src/StateWhipAttackAir.s @@ -161,17 +161,17 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateW __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipAttackAir$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipAttackAir$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipAttackAir$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipAttackAir$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipAttackAir$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip18StateWhipAttackAir __vt__Q53scn4step4hero4whip18StateWhipAttackAir: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4whip18StateWhipAttackAirFv - .byte4 procAnim__Q53scn4step4hero4whip18StateWhipAttackAirFv - .byte4 procMove__Q53scn4step4hero4whip18StateWhipAttackAirFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4whip18StateWhipAttackAirFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4whip18StateWhipAttackAirFv + .4byte procAnim__Q53scn4step4hero4whip18StateWhipAttackAirFv + .4byte procMove__Q53scn4step4hero4whip18StateWhipAttackAirFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4whip18StateWhipAttackAirFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipAttackUp.s b/asm/src/StateWhipAttackUp.s index 201d0787..fb663768 100644 --- a/asm/src/StateWhipAttackUp.s +++ b/asm/src/StateWhipAttackUp.s @@ -114,17 +114,17 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateW __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipAttackUp$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipAttackUp$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipAttackUp$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipAttackUp$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipAttackUp$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip17StateWhipAttackUp __vt__Q53scn4step4hero4whip17StateWhipAttackUp: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4whip17StateWhipAttackUpFv - .byte4 procAnim__Q53scn4step4hero4whip17StateWhipAttackUpFv - .byte4 procMove__Q53scn4step4hero4whip17StateWhipAttackUpFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4whip17StateWhipAttackUpFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4whip17StateWhipAttackUpFv + .4byte procAnim__Q53scn4step4hero4whip17StateWhipAttackUpFv + .4byte procMove__Q53scn4step4hero4whip17StateWhipAttackUpFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4whip17StateWhipAttackUpFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipCapture.s b/asm/src/StateWhipCapture.s index 375c8b4c..300c4616 100644 --- a/asm/src/StateWhipCapture.s +++ b/asm/src/StateWhipCapture.s @@ -263,23 +263,23 @@ __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured17 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured17StateCapturedWhip$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured17StateCapturedWhip$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured17StateCapturedWhip$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured17StateCapturedWhip$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured17StateCapturedWhip$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipCatch$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipCatch$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipCatch$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipCatch$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipCatch$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipCatch$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip16StateWhipCapture __vt__Q53scn4step4hero4whip16StateWhipCapture: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4whip16StateWhipCaptureFv - .byte4 procAnim__Q53scn4step4hero4whip16StateWhipCaptureFv - .byte4 procMove__Q53scn4step4hero4whip16StateWhipCaptureFv - .byte4 procConstraint__Q53scn4step4hero4whip16StateWhipCaptureFv - .byte4 procFixPos__Q53scn4step4hero4whip16StateWhipCaptureFv - .byte4 procObjCollReact__Q53scn4step4hero4whip16StateWhipCaptureFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4whip16StateWhipCaptureFv + .4byte procAnim__Q53scn4step4hero4whip16StateWhipCaptureFv + .4byte procMove__Q53scn4step4hero4whip16StateWhipCaptureFv + .4byte procConstraint__Q53scn4step4hero4whip16StateWhipCaptureFv + .4byte procFixPos__Q53scn4step4hero4whip16StateWhipCaptureFv + .4byte procObjCollReact__Q53scn4step4hero4whip16StateWhipCaptureFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipCaptureUp.s b/asm/src/StateWhipCaptureUp.s index a2b19dfe..b785b896 100644 --- a/asm/src/StateWhipCaptureUp.s +++ b/asm/src/StateWhipCaptureUp.s @@ -107,11 +107,11 @@ procObjCollReact__Q53scn4step4hero4whip18StateWhipCaptureUpFv: __vt__Q53scn4step4hero4whip18StateWhipCaptureUp: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4whip18StateWhipCaptureUpFv - .byte4 procAnim__Q53scn4step4hero4whip18StateWhipCaptureUpFv - .byte4 procMove__Q53scn4step4hero4whip18StateWhipCaptureUpFv - .byte4 procConstraint__Q53scn4step4hero4whip18StateWhipCaptureUpFv - .byte4 procFixPos__Q53scn4step4hero4whip18StateWhipCaptureUpFv - .byte4 procObjCollReact__Q53scn4step4hero4whip18StateWhipCaptureUpFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4whip18StateWhipCaptureUpFv + .4byte procAnim__Q53scn4step4hero4whip18StateWhipCaptureUpFv + .4byte procMove__Q53scn4step4hero4whip18StateWhipCaptureUpFv + .4byte procConstraint__Q53scn4step4hero4whip18StateWhipCaptureUpFv + .4byte procFixPos__Q53scn4step4hero4whip18StateWhipCaptureUpFv + .4byte procObjCollReact__Q53scn4step4hero4whip18StateWhipCaptureUpFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipCatch.s b/asm/src/StateWhipCatch.s index 9c2bf982..9c020e8e 100644 --- a/asm/src/StateWhipCatch.s +++ b/asm/src/StateWhipCatch.s @@ -240,13 +240,13 @@ procObjCollReact__Q53scn4step4hero4whip14StateWhipCatchFv: __vt__Q53scn4step4hero4whip14StateWhipCatch: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4whip14StateWhipCatchFv - .byte4 procAnim__Q53scn4step4hero4whip14StateWhipCatchFv - .byte4 procMove__Q53scn4step4hero4whip14StateWhipCatchFv - .byte4 procConstraint__Q53scn4step4hero4whip14StateWhipCatchFv - .byte4 procFixPos__Q53scn4step4hero4whip14StateWhipCatchFv - .byte4 procObjCollReact__Q53scn4step4hero4whip14StateWhipCatchFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4whip14StateWhipCatchFv + .4byte procAnim__Q53scn4step4hero4whip14StateWhipCatchFv + .4byte procMove__Q53scn4step4hero4whip14StateWhipCatchFv + .4byte procConstraint__Q53scn4step4hero4whip14StateWhipCatchFv + .4byte procFixPos__Q53scn4step4hero4whip14StateWhipCatchFv + .4byte procObjCollReact__Q53scn4step4hero4whip14StateWhipCatchFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateWhipCharge.s b/asm/src/StateWhipCharge.s index 0a7ebeab..5be5ebed 100644 --- a/asm/src/StateWhipCharge.s +++ b/asm/src/StateWhipCharge.s @@ -407,35 +407,35 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateW __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipCaptureUp$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipCaptureUp$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipCaptureUp$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipCaptureUp$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipCaptureUp$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip16StateWhipCapture$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip16StateWhipCapture$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip16StateWhipCapture$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip16StateWhipCapture$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip16StateWhipCapture$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip16StateWhipCapture$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipAttack$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipAttack$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipAttack$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipAttack$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipAttack$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipCharge$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipCharge$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipCharge$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipCharge$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipCharge$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipCharge$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip15StateWhipCharge __vt__Q53scn4step4hero4whip15StateWhipCharge: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4whip15StateWhipChargeFv - .byte4 procAnim__Q53scn4step4hero4whip15StateWhipChargeFv - .byte4 procMove__Q53scn4step4hero4whip15StateWhipChargeFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4whip15StateWhipChargeFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4whip15StateWhipChargeFv + .4byte procAnim__Q53scn4step4hero4whip15StateWhipChargeFv + .4byte procMove__Q53scn4step4hero4whip15StateWhipChargeFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4whip15StateWhipChargeFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipDrill.s b/asm/src/StateWhipDrill.s index 6d252496..42471452 100644 --- a/asm/src/StateWhipDrill.s +++ b/asm/src/StateWhipDrill.s @@ -290,17 +290,17 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateW __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipDrill$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipDrill$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipDrill$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipDrill$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipDrill$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip14StateWhipDrill __vt__Q53scn4step4hero4whip14StateWhipDrill: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4whip14StateWhipDrillFv - .byte4 procAnim__Q53scn4step4hero4whip14StateWhipDrillFv - .byte4 procMove__Q53scn4step4hero4whip14StateWhipDrillFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4whip14StateWhipDrillFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4whip14StateWhipDrillFv + .4byte procAnim__Q53scn4step4hero4whip14StateWhipDrillFv + .4byte procMove__Q53scn4step4hero4whip14StateWhipDrillFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4whip14StateWhipDrillFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipGazerSpiral.s b/asm/src/StateWhipGazerSpiral.s index ff232f94..23fb69ae 100644 --- a/asm/src/StateWhipGazerSpiral.s +++ b/asm/src/StateWhipGazerSpiral.s @@ -320,19 +320,19 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip20StateW __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip20StateWhipGazerSpiral$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip20StateWhipGazerSpiral$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip20StateWhipGazerSpiral$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip20StateWhipGazerSpiral$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip20StateWhipGazerSpiral$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip20StateWhipGazerSpiral __vt__Q53scn4step4hero4whip20StateWhipGazerSpiral: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4whip20StateWhipGazerSpiralFv - .byte4 procAnim__Q53scn4step4hero4whip20StateWhipGazerSpiralFv - .byte4 procMove__Q53scn4step4hero4whip20StateWhipGazerSpiralFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4whip20StateWhipGazerSpiralFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4whip20StateWhipGazerSpiralFv + .4byte procAnim__Q53scn4step4hero4whip20StateWhipGazerSpiralFv + .4byte procMove__Q53scn4step4hero4whip20StateWhipGazerSpiralFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4whip20StateWhipGazerSpiralFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateWhipRush.s b/asm/src/StateWhipRush.s index e16b358c..8cf52148 100644 --- a/asm/src/StateWhipRush.s +++ b/asm/src/StateWhipRush.s @@ -241,17 +241,17 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip13StateW __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip13StateWhipRush$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip13StateWhipRush$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip13StateWhipRush$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip13StateWhipRush$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip13StateWhipRush$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip13StateWhipRush __vt__Q53scn4step4hero4whip13StateWhipRush: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4whip13StateWhipRushFv - .byte4 procAnim__Q53scn4step4hero4whip13StateWhipRushFv - .byte4 procMove__Q53scn4step4hero4whip13StateWhipRushFv - .byte4 procConstraint__Q43scn4step4hero9StateBaseFv - .byte4 procFixPos__Q53scn4step4hero4whip13StateWhipRushFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4whip13StateWhipRushFv + .4byte procAnim__Q53scn4step4hero4whip13StateWhipRushFv + .4byte procMove__Q53scn4step4hero4whip13StateWhipRushFv + .4byte procConstraint__Q43scn4step4hero9StateBaseFv + .4byte procFixPos__Q53scn4step4hero4whip13StateWhipRushFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipSlamBack.s b/asm/src/StateWhipSlamBack.s index 19e10b1c..88967cc5 100644 --- a/asm/src/StateWhipSlamBack.s +++ b/asm/src/StateWhipSlamBack.s @@ -213,17 +213,17 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateW __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamBack$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamBack$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamBack$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamBack$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamBack$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip17StateWhipSlamBack __vt__Q53scn4step4hero4whip17StateWhipSlamBack: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4whip17StateWhipSlamBackFv - .byte4 procAnim__Q53scn4step4hero4whip17StateWhipSlamBackFv - .byte4 procMove__Q53scn4step4hero4whip17StateWhipSlamBackFv - .byte4 procConstraint__Q53scn4step4hero4whip17StateWhipSlamBackFv - .byte4 procFixPos__Q53scn4step4hero4whip17StateWhipSlamBackFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4whip17StateWhipSlamBackFv + .4byte procAnim__Q53scn4step4hero4whip17StateWhipSlamBackFv + .4byte procMove__Q53scn4step4hero4whip17StateWhipSlamBackFv + .4byte procConstraint__Q53scn4step4hero4whip17StateWhipSlamBackFv + .4byte procFixPos__Q53scn4step4hero4whip17StateWhipSlamBackFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipSlamDown.s b/asm/src/StateWhipSlamDown.s index 5a429c72..29c87b4e 100644 --- a/asm/src/StateWhipSlamDown.s +++ b/asm/src/StateWhipSlamDown.s @@ -220,17 +220,17 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateW __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamDown$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamDown$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamDown$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamDown$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamDown$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip17StateWhipSlamDown __vt__Q53scn4step4hero4whip17StateWhipSlamDown: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4whip17StateWhipSlamDownFv - .byte4 procAnim__Q53scn4step4hero4whip17StateWhipSlamDownFv - .byte4 procMove__Q53scn4step4hero4whip17StateWhipSlamDownFv - .byte4 procConstraint__Q53scn4step4hero4whip17StateWhipSlamDownFv - .byte4 procFixPos__Q53scn4step4hero4whip17StateWhipSlamDownFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4whip17StateWhipSlamDownFv + .4byte procAnim__Q53scn4step4hero4whip17StateWhipSlamDownFv + .4byte procMove__Q53scn4step4hero4whip17StateWhipSlamDownFv + .4byte procConstraint__Q53scn4step4hero4whip17StateWhipSlamDownFv + .4byte procFixPos__Q53scn4step4hero4whip17StateWhipSlamDownFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipSlamFront.s b/asm/src/StateWhipSlamFront.s index 189c3975..6b8b5726 100644 --- a/asm/src/StateWhipSlamFront.s +++ b/asm/src/StateWhipSlamFront.s @@ -243,17 +243,17 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateW __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipSlamFront$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipSlamFront$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipSlamFront$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipSlamFront$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipSlamFront$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip18StateWhipSlamFront __vt__Q53scn4step4hero4whip18StateWhipSlamFront: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4whip18StateWhipSlamFrontFv - .byte4 procAnim__Q53scn4step4hero4whip18StateWhipSlamFrontFv - .byte4 procMove__Q53scn4step4hero4whip18StateWhipSlamFrontFv - .byte4 procConstraint__Q53scn4step4hero4whip18StateWhipSlamFrontFv - .byte4 procFixPos__Q53scn4step4hero4whip18StateWhipSlamFrontFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4whip18StateWhipSlamFrontFv + .4byte procAnim__Q53scn4step4hero4whip18StateWhipSlamFrontFv + .4byte procMove__Q53scn4step4hero4whip18StateWhipSlamFrontFv + .4byte procConstraint__Q53scn4step4hero4whip18StateWhipSlamFrontFv + .4byte procFixPos__Q53scn4step4hero4whip18StateWhipSlamFrontFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipSlamUp.s b/asm/src/StateWhipSlamUp.s index 6ab0d66d..1c7d12ff 100644 --- a/asm/src/StateWhipSlamUp.s +++ b/asm/src/StateWhipSlamUp.s @@ -195,17 +195,17 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateW __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipSlamUp$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipSlamUp$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipSlamUp$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipSlamUp$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipSlamUp$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip15StateWhipSlamUp __vt__Q53scn4step4hero4whip15StateWhipSlamUp: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4whip15StateWhipSlamUpFv - .byte4 procAnim__Q53scn4step4hero4whip15StateWhipSlamUpFv - .byte4 procMove__Q53scn4step4hero4whip15StateWhipSlamUpFv - .byte4 procConstraint__Q53scn4step4hero4whip15StateWhipSlamUpFv - .byte4 procFixPos__Q53scn4step4hero4whip15StateWhipSlamUpFv - .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv - .byte4 procEnd__Q43scn4step4hero9StateBaseFv + .4byte __dt__Q53scn4step4hero4whip15StateWhipSlamUpFv + .4byte procAnim__Q53scn4step4hero4whip15StateWhipSlamUpFv + .4byte procMove__Q53scn4step4hero4whip15StateWhipSlamUpFv + .4byte procConstraint__Q53scn4step4hero4whip15StateWhipSlamUpFv + .4byte procFixPos__Q53scn4step4hero4whip15StateWhipSlamUpFv + .4byte procObjCollReact__Q43scn4step4hero9StateBaseFv + .4byte procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhispyAppear.s b/asm/src/StateWhispyAppear.s index 3de65a97..5ecd9d70 100644 --- a/asm/src/StateWhispyAppear.s +++ b/asm/src/StateWhispyAppear.s @@ -990,60 +990,60 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee1 __vt__Q53scn4step5enemy10brontoburt17StateWhispyAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy10brontoburt17StateWhispyAppearFv - .byte4 procAnim__Q53scn4step5enemy10brontoburt17StateWhispyAppearFv - .byte4 procMove__Q53scn4step5enemy10brontoburt17StateWhispyAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy10brontoburt17StateWhispyAppearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy10brontoburt17StateWhispyAppearFv + .4byte procAnim__Q53scn4step5enemy10brontoburt17StateWhispyAppearFv + .4byte procMove__Q53scn4step5enemy10brontoburt17StateWhispyAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy10brontoburt17StateWhispyAppearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5gordo17StateWhispyAppear __vt__Q53scn4step5enemy5gordo17StateWhispyAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy5gordo17StateWhispyAppearFv - .byte4 procAnim__Q53scn4step5enemy5gordo17StateWhispyAppearFv - .byte4 procMove__Q53scn4step5enemy5gordo17StateWhispyAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy5gordo17StateWhispyAppearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy5gordo17StateWhispyAppearFv + .4byte procAnim__Q53scn4step5enemy5gordo17StateWhispyAppearFv + .4byte procMove__Q53scn4step5enemy5gordo17StateWhispyAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy5gordo17StateWhispyAppearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy17StateWhispyAppear __vt__Q53scn4step5enemy6scarfy17StateWhispyAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy6scarfy17StateWhispyAppearFv - .byte4 procAnim__Q53scn4step5enemy6scarfy17StateWhispyAppearFv - .byte4 procMove__Q53scn4step5enemy6scarfy17StateWhispyAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy6scarfy17StateWhispyAppearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy6scarfy17StateWhispyAppearFv + .4byte procAnim__Q53scn4step5enemy6scarfy17StateWhispyAppearFv + .4byte procMove__Q53scn4step5enemy6scarfy17StateWhispyAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy6scarfy17StateWhispyAppearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateWhispyFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateWhispyFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateWhispyFall$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateWhispyFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateWhispyFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateWhispyFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee17StateWhispyAppear __vt__Q53scn4step5enemy9waddledee17StateWhispyAppear: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledee17StateWhispyAppearFv - .byte4 procAnim__Q53scn4step5enemy9waddledee17StateWhispyAppearFv - .byte4 procMove__Q53scn4step5enemy9waddledee17StateWhispyAppearFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9waddledee17StateWhispyAppearFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9waddledee17StateWhispyAppearFv + .4byte procAnim__Q53scn4step5enemy9waddledee17StateWhispyAppearFv + .4byte procMove__Q53scn4step5enemy9waddledee17StateWhispyAppearFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9waddledee17StateWhispyAppearFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255825 diff --git a/asm/src/StateWhispyFall.s b/asm/src/StateWhispyFall.s index e0c7eeba..c8ec233e 100644 --- a/asm/src/StateWhispyFall.s +++ b/asm/src/StateWhispyFall.s @@ -195,18 +195,18 @@ __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee18StateWhispyLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee18StateWhispyLanding$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee18StateWhispyLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee18StateWhispyLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee18StateWhispyLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee15StateWhispyFall __vt__Q53scn4step5enemy9waddledee15StateWhispyFall: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledee15StateWhispyFallFv - .byte4 procAnim__Q53scn4step5enemy9waddledee15StateWhispyFallFv - .byte4 procMove__Q53scn4step5enemy9waddledee15StateWhispyFallFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9waddledee15StateWhispyFallFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9waddledee15StateWhispyFallFv + .4byte procAnim__Q53scn4step5enemy9waddledee15StateWhispyFallFv + .4byte procMove__Q53scn4step5enemy9waddledee15StateWhispyFallFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9waddledee15StateWhispyFallFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256580 diff --git a/asm/src/StateWhispyLanding.s b/asm/src/StateWhispyLanding.s index ae39ecc9..ba33504f 100644 --- a/asm/src/StateWhispyLanding.s +++ b/asm/src/StateWhispyLanding.s @@ -53,9 +53,9 @@ procFixPos__Q53scn4step5enemy9waddledee18StateWhispyLandingFv: __vt__Q53scn4step5enemy9waddledee18StateWhispyLanding: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step5enemy9waddledee18StateWhispyLandingFv - .byte4 procAnim__Q53scn4step5enemy9waddledee18StateWhispyLandingFv - .byte4 procMove__Q53scn4step5enemy9waddledee18StateWhispyLandingFv - .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv - .byte4 procFixPos__Q53scn4step5enemy9waddledee18StateWhispyLandingFv - .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .4byte __dt__Q53scn4step5enemy9waddledee18StateWhispyLandingFv + .4byte procAnim__Q53scn4step5enemy9waddledee18StateWhispyLandingFv + .4byte procMove__Q53scn4step5enemy9waddledee18StateWhispyLandingFv + .4byte procConstraint__Q43scn4step5enemy9StateBaseFv + .4byte procFixPos__Q53scn4step5enemy9waddledee18StateWhispyLandingFv + .4byte procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateWin.s b/asm/src/StateWin.s index d1bc3d80..c441c3b4 100644 --- a/asm/src/StateWin.s +++ b/asm/src/StateWin.s @@ -115,9 +115,9 @@ procFixPos__Q53scn4step4boss15challengemaster8StateWinFv: __vt__Q53scn4step4boss15challengemaster8StateWin: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster8StateWinFv - .byte4 procAnim__Q53scn4step4boss15challengemaster8StateWinFv - .byte4 procMove__Q53scn4step4boss15challengemaster8StateWinFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster8StateWinFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster8StateWinFv + .4byte procAnim__Q53scn4step4boss15challengemaster8StateWinFv + .4byte procMove__Q53scn4step4boss15challengemaster8StateWinFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster8StateWinFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateWinFly.s b/asm/src/StateWinFly.s index f7950829..eac3a3b6 100644 --- a/asm/src/StateWinFly.s +++ b/asm/src/StateWinFly.s @@ -288,18 +288,18 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengema __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateWin$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateWin$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateWin$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateWin$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateWin$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster11StateWinFly __vt__Q53scn4step4boss15challengemaster11StateWinFly: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster11StateWinFlyFv - .byte4 procAnim__Q53scn4step4boss15challengemaster11StateWinFlyFv - .byte4 procMove__Q53scn4step4boss15challengemaster11StateWinFlyFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster11StateWinFlyFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster11StateWinFlyFv + .4byte procAnim__Q53scn4step4boss15challengemaster11StateWinFlyFv + .4byte procMove__Q53scn4step4boss15challengemaster11StateWinFlyFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster11StateWinFlyFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256210 diff --git a/asm/src/StateWorrisome.s b/asm/src/StateWorrisome.s index 2c794e47..6657f23b 100644 --- a/asm/src/StateWorrisome.s +++ b/asm/src/StateWorrisome.s @@ -541,24 +541,24 @@ __dt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengem __vt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss15challengemaster8StateFly12TurnWaitType$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss15challengemaster8StateFly12TurnWaitType$$1Fv - .byte4 create__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss15challengemaster8StateFly12TurnWaitType$$1Fv + .4byte __dt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss15challengemaster8StateFly12TurnWaitType$$1Fv + .4byte create__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss15challengemaster8StateFly12TurnWaitType$$1Fv .global __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateWorrisome$$4PQ43scn4step4boss4Boss$$4f$$1 __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateWorrisome$$4PQ43scn4step4boss4Boss$$4f$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateWorrisome$$4PQ43scn4step4boss4Boss$$4f$$1Fv - .byte4 create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateWorrisome$$4PQ43scn4step4boss4Boss$$4f$$1Fv + .4byte __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateWorrisome$$4PQ43scn4step4boss4Boss$$4f$$1Fv + .4byte create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateWorrisome$$4PQ43scn4step4boss4Boss$$4f$$1Fv .global __vt__Q53scn4step4boss15challengemaster14StateWorrisome __vt__Q53scn4step4boss15challengemaster14StateWorrisome: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4boss15challengemaster14StateWorrisomeFv - .byte4 procAnim__Q53scn4step4boss15challengemaster14StateWorrisomeFv - .byte4 procMove__Q53scn4step4boss15challengemaster14StateWorrisomeFv - .byte4 procConstraint__Q43scn4step4boss9StateBaseFv - .byte4 procFixPos__Q53scn4step4boss15challengemaster14StateWorrisomeFv - .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .4byte __dt__Q53scn4step4boss15challengemaster14StateWorrisomeFv + .4byte procAnim__Q53scn4step4boss15challengemaster14StateWorrisomeFv + .4byte procMove__Q53scn4step4boss15challengemaster14StateWorrisomeFv + .4byte procConstraint__Q43scn4step4boss9StateBaseFv + .4byte procFixPos__Q53scn4step4boss15challengemaster14StateWorrisomeFv + .4byte procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256482 diff --git a/asm/src/StdResponder.s b/asm/src/StdResponder.s index 1554b9e7..2c5fcf33 100644 --- a/asm/src/StdResponder.s +++ b/asm/src/StdResponder.s @@ -223,7 +223,7 @@ lbl_801BD1F0: __vt__Q35mcoll6detail12StdResponder: .4byte 0 .4byte 0 - .byte4 __dt__Q35mcoll6detail12StdResponderFv - .byte4 onDetectStarted__Q35mcoll6detail12StdResponderFRCQ35mcoll6detail6IActorRCQ33hel4math7Vector2 - .byte4 onDetectFinished__Q35mcoll6detail12StdResponderFRCQ35mcoll6detail6IActorRCQ35mcoll6detail9ActorInfo - .byte4 onCollide__Q35mcoll6detail12StdResponderFRCQ35mcoll6detail6IActorRCQ35mcoll6detail12CollidedInfo + .4byte __dt__Q35mcoll6detail12StdResponderFv + .4byte onDetectStarted__Q35mcoll6detail12StdResponderFRCQ35mcoll6detail6IActorRCQ33hel4math7Vector2 + .4byte onDetectFinished__Q35mcoll6detail12StdResponderFRCQ35mcoll6detail6IActorRCQ35mcoll6detail9ActorInfo + .4byte onCollide__Q35mcoll6detail12StdResponderFRCQ35mcoll6detail6IActorRCQ35mcoll6detail12CollidedInfo diff --git a/asm/src/Stepping.s b/asm/src/Stepping.s index 46962dcd..90243027 100644 --- a/asm/src/Stepping.s +++ b/asm/src/Stepping.s @@ -171,8 +171,8 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14Stat __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateSuperJump$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateSuperJump$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateSuperJump$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateSuperJump$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateSuperJump$$4PQ43scn4step4hero4Hero$$1Fv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255899 diff --git a/asm/src/Stone.s b/asm/src/Stone.s index 01df93c9..efe5fd23 100644 --- a/asm/src/Stone.s +++ b/asm/src/Stone.s @@ -46,8 +46,8 @@ __dt__Q24util156StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone14Stat __vt__Q24util156StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone14StateStartJump$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util156StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone14StateStartJump$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv - .byte4 create__Q24util156StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone14StateStartJump$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .4byte __dt__Q24util156StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone14StateStartJump$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .4byte create__Q24util156StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone14StateStartJump$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2BodyModel__Q53scn4step4hero9modeldesc5StoneFv$$2desc diff --git a/asm/src/Stop.s b/asm/src/Stop.s index f388abdc..409ca1e7 100644 --- a/asm/src/Stop.s +++ b/asm/src/Stop.s @@ -857,11 +857,11 @@ lbl_803CFCE4: __vt__Q43scn4step7gimmick4Stop: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step7gimmick4StopFv - .byte4 onStopNormalStarted__Q43scn4step7gimmick4StopFRCQ25ostop5Actor - .byte4 onStopNormalFinished__Q43scn4step7gimmick4StopFRCQ25ostop5Actor - .byte4 onStopPowerfulStarted__Q43scn4step7gimmick4StopFRCQ25ostop5Actor - .byte4 onStopPowerfulFinished__Q43scn4step7gimmick4StopFRCQ25ostop5Actor + .4byte __dt__Q43scn4step7gimmick4StopFv + .4byte onStopNormalStarted__Q43scn4step7gimmick4StopFRCQ25ostop5Actor + .4byte onStopNormalFinished__Q43scn4step7gimmick4StopFRCQ25ostop5Actor + .4byte onStopPowerfulStarted__Q43scn4step7gimmick4StopFRCQ25ostop5Actor + .4byte onStopPowerfulFinished__Q43scn4step7gimmick4StopFRCQ25ostop5Actor .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -869,9 +869,9 @@ __vt__Q43scn4step7gimmick4Stop: __vt__Q43scn4step3sfx4Stop: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step3sfx4StopFv - .byte4 onStopNormalStarted__Q43scn4step3sfx4StopFRCQ25ostop5Actor - .byte4 onStopNormalFinished__Q43scn4step3sfx4StopFRCQ25ostop5Actor - .byte4 onStopPowerfulStarted__Q43scn4step3sfx4StopFRCQ25ostop5Actor - .byte4 onStopPowerfulFinished__Q43scn4step3sfx4StopFRCQ25ostop5Actor + .4byte __dt__Q43scn4step3sfx4StopFv + .4byte onStopNormalStarted__Q43scn4step3sfx4StopFRCQ25ostop5Actor + .4byte onStopNormalFinished__Q43scn4step3sfx4StopFRCQ25ostop5Actor + .4byte onStopPowerfulStarted__Q43scn4step3sfx4StopFRCQ25ostop5Actor + .4byte onStopPowerfulFinished__Q43scn4step3sfx4StopFRCQ25ostop5Actor .4byte 0 diff --git a/asm/src/SuperBackPicture.s b/asm/src/SuperBackPicture.s index 573f7c0f..6d919187 100644 --- a/asm/src/SuperBackPicture.s +++ b/asm/src/SuperBackPicture.s @@ -805,11 +805,11 @@ $$253741: __vt__Q43scn4step3sfx16SuperBackPicture: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step3sfx16SuperBackPictureFv - .byte4 onStopNormalStarted__Q43scn4step3sfx16SuperBackPictureFRCQ25ostop5Actor - .byte4 onStopNormalFinished__Q43scn4step3sfx16SuperBackPictureFRCQ25ostop5Actor - .byte4 onStopPowerfulStarted__Q43scn4step3sfx16SuperBackPictureFRCQ25ostop5Actor - .byte4 onStopPowerfulFinished__Q43scn4step3sfx16SuperBackPictureFRCQ25ostop5Actor + .4byte __dt__Q43scn4step3sfx16SuperBackPictureFv + .4byte onStopNormalStarted__Q43scn4step3sfx16SuperBackPictureFRCQ25ostop5Actor + .4byte onStopNormalFinished__Q43scn4step3sfx16SuperBackPictureFRCQ25ostop5Actor + .4byte onStopPowerfulStarted__Q43scn4step3sfx16SuperBackPictureFRCQ25ostop5Actor + .4byte onStopPowerfulFinished__Q43scn4step3sfx16SuperBackPictureFRCQ25ostop5Actor .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/SuperStop.s b/asm/src/SuperStop.s index bafb7aa7..fe2221ae 100644 --- a/asm/src/SuperStop.s +++ b/asm/src/SuperStop.s @@ -673,9 +673,9 @@ lbl_803D8FF0: __vt__Q43scn4step4boss9SuperStop: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4boss9SuperStopFv - .byte4 onSuperStopStarted__Q43scn4step4boss9SuperStopFRCQ43scn4step6spstop7Manager - .byte4 onSuperStopFinished__Q43scn4step4boss9SuperStopFRCQ43scn4step6spstop7Manager + .4byte __dt__Q43scn4step4boss9SuperStopFv + .4byte onSuperStopStarted__Q43scn4step4boss9SuperStopFRCQ43scn4step6spstop7Manager + .4byte onSuperStopFinished__Q43scn4step4boss9SuperStopFRCQ43scn4step6spstop7Manager .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -683,9 +683,9 @@ __vt__Q43scn4step4boss9SuperStop: __vt__Q43scn4step5enemy9SuperStop: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step5enemy9SuperStopFv - .byte4 onSuperStopStarted__Q43scn4step5enemy9SuperStopFRCQ43scn4step6spstop7Manager - .byte4 onSuperStopFinished__Q43scn4step5enemy9SuperStopFRCQ43scn4step6spstop7Manager + .4byte __dt__Q43scn4step5enemy9SuperStopFv + .4byte onSuperStopStarted__Q43scn4step5enemy9SuperStopFRCQ43scn4step6spstop7Manager + .4byte onSuperStopFinished__Q43scn4step5enemy9SuperStopFRCQ43scn4step6spstop7Manager .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -693,9 +693,9 @@ __vt__Q43scn4step5enemy9SuperStop: __vt__Q43scn4step7gimmick9SuperStop: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step7gimmick9SuperStopFv - .byte4 onSuperStopStarted__Q43scn4step7gimmick9SuperStopFRCQ43scn4step6spstop7Manager - .byte4 onSuperStopFinished__Q43scn4step7gimmick9SuperStopFRCQ43scn4step6spstop7Manager + .4byte __dt__Q43scn4step7gimmick9SuperStopFv + .4byte onSuperStopStarted__Q43scn4step7gimmick9SuperStopFRCQ43scn4step6spstop7Manager + .4byte onSuperStopFinished__Q43scn4step7gimmick9SuperStopFRCQ43scn4step6spstop7Manager .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -703,9 +703,9 @@ __vt__Q43scn4step7gimmick9SuperStop: __vt__Q43scn4step4item9SuperStop: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4item9SuperStopFv - .byte4 onSuperStopStarted__Q43scn4step4item9SuperStopFRCQ43scn4step6spstop7Manager - .byte4 onSuperStopFinished__Q43scn4step4item9SuperStopFRCQ43scn4step6spstop7Manager + .4byte __dt__Q43scn4step4item9SuperStopFv + .4byte onSuperStopStarted__Q43scn4step4item9SuperStopFRCQ43scn4step6spstop7Manager + .4byte onSuperStopFinished__Q43scn4step4item9SuperStopFRCQ43scn4step6spstop7Manager .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -713,7 +713,7 @@ __vt__Q43scn4step4item9SuperStop: __vt__Q43scn4step6weapon9SuperStop: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step6weapon9SuperStopFv - .byte4 onSuperStopStarted__Q43scn4step6weapon9SuperStopFRCQ43scn4step6spstop7Manager - .byte4 onSuperStopFinished__Q43scn4step6weapon9SuperStopFRCQ43scn4step6spstop7Manager + .4byte __dt__Q43scn4step6weapon9SuperStopFv + .4byte onSuperStopStarted__Q43scn4step6weapon9SuperStopFRCQ43scn4step6spstop7Manager + .4byte onSuperStopFinished__Q43scn4step6weapon9SuperStopFRCQ43scn4step6spstop7Manager .4byte 0 diff --git a/asm/src/Switch.s b/asm/src/Switch.s index 9cd35272..3decd847 100644 --- a/asm/src/Switch.s +++ b/asm/src/Switch.s @@ -952,13 +952,13 @@ $$255943: __vt__Q53scn4step7gimmick8switch_n6Switch: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick8switch_n6SwitchFv - .byte4 isChangeToOn__Q53scn4step7gimmick8switch_n6SwitchFv - .byte4 isChangeToOff__Q53scn4step7gimmick8switch_n6SwitchFv - .byte4 onChangeOffToOn__Q53scn4step7gimmick8switch_n6SwitchFv - .byte4 onChangeToOn__Q53scn4step7gimmick8switch_n6SwitchFv - .byte4 onChangeOnToOff__Q53scn4step7gimmick8switch_n6SwitchFv - .byte4 onChangeToOff__Q53scn4step7gimmick8switch_n6SwitchFv + .4byte __dt__Q53scn4step7gimmick8switch_n6SwitchFv + .4byte isChangeToOn__Q53scn4step7gimmick8switch_n6SwitchFv + .4byte isChangeToOff__Q53scn4step7gimmick8switch_n6SwitchFv + .4byte onChangeOffToOn__Q53scn4step7gimmick8switch_n6SwitchFv + .4byte onChangeToOn__Q53scn4step7gimmick8switch_n6SwitchFv + .4byte onChangeOnToOff__Q53scn4step7gimmick8switch_n6SwitchFv + .4byte onChangeToOff__Q53scn4step7gimmick8switch_n6SwitchFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255903 diff --git a/asm/src/SwitchOnce.s b/asm/src/SwitchOnce.s index ccc27aa3..baf9f933 100644 --- a/asm/src/SwitchOnce.s +++ b/asm/src/SwitchOnce.s @@ -68,13 +68,13 @@ onChangeToOn__Q53scn4step7gimmick8switch_n10SwitchOnceFv: __vt__Q53scn4step7gimmick8switch_n10SwitchOnce: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick8switch_n10SwitchOnceFv - .byte4 isChangeToOn__Q53scn4step7gimmick8switch_n10SwitchOnceFv - .byte4 isChangeToOff__Q53scn4step7gimmick8switch_n10SwitchOnceFv - .byte4 onChangeOffToOn__Q53scn4step7gimmick8switch_n10SwitchOnceFv - .byte4 onChangeToOn__Q53scn4step7gimmick8switch_n10SwitchOnceFv - .byte4 onChangeOnToOff__Q53scn4step7gimmick8switch_n6SwitchFv - .byte4 onChangeToOff__Q53scn4step7gimmick8switch_n6SwitchFv + .4byte __dt__Q53scn4step7gimmick8switch_n10SwitchOnceFv + .4byte isChangeToOn__Q53scn4step7gimmick8switch_n10SwitchOnceFv + .4byte isChangeToOff__Q53scn4step7gimmick8switch_n10SwitchOnceFv + .4byte onChangeOffToOn__Q53scn4step7gimmick8switch_n10SwitchOnceFv + .4byte onChangeToOn__Q53scn4step7gimmick8switch_n10SwitchOnceFv + .4byte onChangeOnToOff__Q53scn4step7gimmick8switch_n6SwitchFv + .4byte onChangeToOff__Q53scn4step7gimmick8switch_n6SwitchFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/SwitchReceiver.s b/asm/src/SwitchReceiver.s index 30296c6f..ca706c49 100644 --- a/asm/src/SwitchReceiver.s +++ b/asm/src/SwitchReceiver.s @@ -115,9 +115,9 @@ onSwitchOn__Q43scn4step7gimmick14SwitchReceiverFv: __vt__Q43scn4step7gimmick14SwitchReceiver: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step7gimmick14SwitchReceiverFv - .byte4 onSwitchOn__Q43scn4step7gimmick14SwitchReceiverFv - .byte4 onSwitchOff__Q43scn4step7gimmick14SwitchReceiverFv - .byte4 onSwitchToggle__Q43scn4step7gimmick14SwitchReceiverFv - .byte4 onSwitchOnFromSuperBeamSwitch__Q43scn4step7gimmick14SwitchReceiverFv - .byte4 checkDemoPos__Q43scn4step7gimmick14SwitchReceiverCFRQ33hel4math7Vector2 + .4byte __dt__Q43scn4step7gimmick14SwitchReceiverFv + .4byte onSwitchOn__Q43scn4step7gimmick14SwitchReceiverFv + .4byte onSwitchOff__Q43scn4step7gimmick14SwitchReceiverFv + .4byte onSwitchToggle__Q43scn4step7gimmick14SwitchReceiverFv + .4byte onSwitchOnFromSuperBeamSwitch__Q43scn4step7gimmick14SwitchReceiverFv + .4byte checkDemoPos__Q43scn4step7gimmick14SwitchReceiverCFRQ33hel4math7Vector2 diff --git a/asm/src/SwitchReturn.s b/asm/src/SwitchReturn.s index 0bd0d2c7..74f986dd 100644 --- a/asm/src/SwitchReturn.s +++ b/asm/src/SwitchReturn.s @@ -166,13 +166,13 @@ onChangeToOff__Q53scn4step7gimmick8switch_n12SwitchReturnFv: __vt__Q53scn4step7gimmick8switch_n12SwitchReturn: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick8switch_n12SwitchReturnFv - .byte4 isChangeToOn__Q53scn4step7gimmick8switch_n12SwitchReturnFv - .byte4 isChangeToOff__Q53scn4step7gimmick8switch_n12SwitchReturnFv - .byte4 onChangeOffToOn__Q53scn4step7gimmick8switch_n12SwitchReturnFv - .byte4 onChangeToOn__Q53scn4step7gimmick8switch_n12SwitchReturnFv - .byte4 onChangeOnToOff__Q53scn4step7gimmick8switch_n12SwitchReturnFv - .byte4 onChangeToOff__Q53scn4step7gimmick8switch_n12SwitchReturnFv + .4byte __dt__Q53scn4step7gimmick8switch_n12SwitchReturnFv + .4byte isChangeToOn__Q53scn4step7gimmick8switch_n12SwitchReturnFv + .4byte isChangeToOff__Q53scn4step7gimmick8switch_n12SwitchReturnFv + .4byte onChangeOffToOn__Q53scn4step7gimmick8switch_n12SwitchReturnFv + .4byte onChangeToOn__Q53scn4step7gimmick8switch_n12SwitchReturnFv + .4byte onChangeOnToOff__Q53scn4step7gimmick8switch_n12SwitchReturnFv + .4byte onChangeToOff__Q53scn4step7gimmick8switch_n12SwitchReturnFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/SwitchToggle.s b/asm/src/SwitchToggle.s index 886df322..d49ba495 100644 --- a/asm/src/SwitchToggle.s +++ b/asm/src/SwitchToggle.s @@ -117,13 +117,13 @@ onChangeToOff__Q53scn4step7gimmick8switch_n12SwitchToggleFv: __vt__Q53scn4step7gimmick8switch_n12SwitchToggle: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step7gimmick8switch_n12SwitchToggleFv - .byte4 isChangeToOn__Q53scn4step7gimmick8switch_n12SwitchToggleFv - .byte4 isChangeToOff__Q53scn4step7gimmick8switch_n12SwitchToggleFv - .byte4 onChangeOffToOn__Q53scn4step7gimmick8switch_n12SwitchToggleFv - .byte4 onChangeToOn__Q53scn4step7gimmick8switch_n12SwitchToggleFv - .byte4 onChangeOnToOff__Q53scn4step7gimmick8switch_n6SwitchFv - .byte4 onChangeToOff__Q53scn4step7gimmick8switch_n12SwitchToggleFv + .4byte __dt__Q53scn4step7gimmick8switch_n12SwitchToggleFv + .4byte isChangeToOn__Q53scn4step7gimmick8switch_n12SwitchToggleFv + .4byte isChangeToOff__Q53scn4step7gimmick8switch_n12SwitchToggleFv + .4byte onChangeOffToOn__Q53scn4step7gimmick8switch_n12SwitchToggleFv + .4byte onChangeToOn__Q53scn4step7gimmick8switch_n12SwitchToggleFv + .4byte onChangeOnToOff__Q53scn4step7gimmick8switch_n6SwitchFv + .4byte onChangeToOff__Q53scn4step7gimmick8switch_n12SwitchToggleFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/Sword.s b/asm/src/Sword.s index ca07804d..f535370b 100644 --- a/asm/src/Sword.s +++ b/asm/src/Sword.s @@ -525,49 +525,49 @@ lbl_8038A028: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2SwordAnim__Q53scn4step4hero9modeldesc5SwordFv$$2entries$$21 $$2LOCAL$$2SwordAnim__Q53scn4step4hero9modeldesc5SwordFv$$2entries$$21: - .byte4 $$249586 + .4byte $$249586 .4byte 0 - .byte4 $$249587 + .4byte $$249587 .4byte 0 - .byte4 $$249588 + .4byte $$249588 .4byte 0 - .byte4 $$249589 + .4byte $$249589 .4byte 0 - .byte4 $$249590 + .4byte $$249590 .4byte 0 - .byte4 $$249591 + .4byte $$249591 .4byte 0 - .byte4 $$249592 + .4byte $$249592 .4byte 0 - .byte4 $$249593 + .4byte $$249593 .4byte 0 - .byte4 $$249594 + .4byte $$249594 .4byte 0 - .byte4 $$249595 + .4byte $$249595 .4byte 0 - .byte4 $$249596 + .4byte $$249596 .4byte 0 - .byte4 $$249597 + .4byte $$249597 .4byte 0 - .byte4 $$249598 + .4byte $$249598 .4byte 0 - .byte4 $$249599 + .4byte $$249599 .4byte 0 - .byte4 $$249600 + .4byte $$249600 .4byte 0 - .byte4 $$249601 + .4byte $$249601 .4byte 0 - .byte4 $$249602 + .4byte $$249602 .4byte 0 - .byte4 $$249603 + .4byte $$249603 .4byte 0 - .byte4 $$249604 + .4byte $$249604 .4byte 0 - .byte4 $$249605 + .4byte $$249605 .4byte 0 - .byte4 $$249606 + .4byte $$249606 .4byte 0 - .byte4 $$249607 + .4byte $$249607 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -669,27 +669,27 @@ $$256366: __vt__Q53scn4step4hero5sword5Sword: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero5sword5SwordFv - .byte4 setup__Q53scn4step4hero5sword5SwordFv - .byte4 tryToChangeStateOnCarry__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeStateOnInterval__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeStateOnDamage__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeState__Q53scn4step4hero5sword5SwordFv - .byte4 onStateEndCleanUp__Q53scn4step4hero5sword5SwordFv - .byte4 onGetEventItem__Q43scn4step4hero11AbilityBaseFv - .byte4 onGimmickReactChangeState__Q43scn4step4hero11AbilityBaseFv - .byte4 onStartClearDanceExternal__Q43scn4step4hero11AbilityBaseFv - .byte4 onEnterWarpLowper__Q43scn4step4hero11AbilityBaseFv - .byte4 onShowHero__Q43scn4step4hero11AbilityBaseFv - .byte4 onHideHero__Q43scn4step4hero11AbilityBaseFv - .byte4 onDead__Q43scn4step4hero11AbilityBaseFv - .byte4 onCaptured__Q43scn4step4hero11AbilityBaseFv - .byte4 onVacuumed__Q43scn4step4hero11AbilityBaseFv - .byte4 onStartDemo__Q43scn4step4hero11AbilityBaseFv - .byte4 procAnim__Q43scn4step4hero11AbilityBaseFv - .byte4 procMove__Q43scn4step4hero11AbilityBaseFv - .byte4 procObjCollReact__Q43scn4step4hero11AbilityBaseFv - .byte4 isDepleted__Q43scn4step4hero11AbilityBaseCFv + .4byte __dt__Q53scn4step4hero5sword5SwordFv + .4byte setup__Q53scn4step4hero5sword5SwordFv + .4byte tryToChangeStateOnCarry__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeStateOnInterval__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeStateOnDamage__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeState__Q53scn4step4hero5sword5SwordFv + .4byte onStateEndCleanUp__Q53scn4step4hero5sword5SwordFv + .4byte onGetEventItem__Q43scn4step4hero11AbilityBaseFv + .4byte onGimmickReactChangeState__Q43scn4step4hero11AbilityBaseFv + .4byte onStartClearDanceExternal__Q43scn4step4hero11AbilityBaseFv + .4byte onEnterWarpLowper__Q43scn4step4hero11AbilityBaseFv + .4byte onShowHero__Q43scn4step4hero11AbilityBaseFv + .4byte onHideHero__Q43scn4step4hero11AbilityBaseFv + .4byte onDead__Q43scn4step4hero11AbilityBaseFv + .4byte onCaptured__Q43scn4step4hero11AbilityBaseFv + .4byte onVacuumed__Q43scn4step4hero11AbilityBaseFv + .4byte onStartDemo__Q43scn4step4hero11AbilityBaseFv + .4byte procAnim__Q43scn4step4hero11AbilityBaseFv + .4byte procMove__Q43scn4step4hero11AbilityBaseFv + .4byte procObjCollReact__Q43scn4step4hero11AbilityBaseFv + .4byte isDepleted__Q43scn4step4hero11AbilityBaseCFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249578 @@ -702,8 +702,8 @@ $$249579: .balign 4 .global $$2LOCAL$$2SwordModel__Q53scn4step4hero9modeldesc5SwordFv$$2names$$21 $$2LOCAL$$2SwordModel__Q53scn4step4hero9modeldesc5SwordFv$$2names$$21: - .byte4 $$249578 - .byte4 $$249579 + .4byte $$249578 + .4byte $$249579 .global $$249586 $$249586: .asciz "Carry" diff --git a/asm/src/SystemTagProcessor.s b/asm/src/SystemTagProcessor.s index 6df9465d..a221c7e5 100644 --- a/asm/src/SystemTagProcessor.s +++ b/asm/src/SystemTagProcessor.s @@ -1649,9 +1649,9 @@ applyScale__Q23lyt18SystemTagProcessorCFPQ34nw4r2ut15PrintContext$$0w$$1Us: __vt__Q23lyt18SystemTagProcessor: .4byte 0 .4byte 0 - .byte4 __dt__Q23lyt18SystemTagProcessorFv - .byte4 Process__Q23lyt18SystemTagProcessorFUsPQ34nw4r2ut15PrintContext$$0w$$1 - .byte4 CalcRect__Q23lyt18SystemTagProcessorFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext$$0w$$1 + .4byte __dt__Q23lyt18SystemTagProcessorFv + .4byte Process__Q23lyt18SystemTagProcessorFUsPQ34nw4r2ut15PrintContext$$0w$$1 + .4byte CalcRect__Q23lyt18SystemTagProcessorFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext$$0w$$1 .global $$2STRING$$2SetWidthLimit__Q34nw4r2ut17TextWriterBase$$0w$$1Ff$$20 $$2STRING$$2SetWidthLimit__Q34nw4r2ut17TextWriterBase$$0w$$1Ff$$20: .asciz "NW4R:Pointer Error\nthis(=%p) is not valid pointer." diff --git a/asm/src/TPLTexture.s b/asm/src/TPLTexture.s index 1ca30421..2058377c 100644 --- a/asm/src/TPLTexture.s +++ b/asm/src/TPLTexture.s @@ -79,9 +79,9 @@ lbl_80196FFC: __vt__Q23gfx10TPLTexture: .4byte 0 .4byte 0 - .byte4 __dt__Q23gfx10TPLTextureFv + .4byte __dt__Q23gfx10TPLTextureFv .global __vt__Q23gfx10TextureObj __vt__Q23gfx10TextureObj: .4byte 0 .4byte 0 - .byte4 __dt__Q23gfx10TextureObjFv + .4byte __dt__Q23gfx10TextureObjFv diff --git a/asm/src/Table.s b/asm/src/Table.s index 0feb7440..b6489a91 100644 --- a/asm/src/Table.s +++ b/asm/src/Table.s @@ -3675,150 +3675,150 @@ PtclResPath__Q43scn9grandmenu6effect5TableFQ43scn9grandmenu6effect11PtclResSlot: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PTCL_INFOS__Q43scn14challengetitle6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn14challengetitle6effect19$$2unnamed$$2Table_cpp$$2: - .byte4 $$248738 - .byte4 $$248739 - .byte4 $$248740 - .byte4 $$248741 - .byte4 $$248742 - .byte4 $$248743 + .4byte $$248738 + .4byte $$248739 + .4byte $$248740 + .4byte $$248741 + .4byte $$248742 + .4byte $$248743 .global T_PTCL_INFOS__Q43scn15challengeresult6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn15challengeresult6effect19$$2unnamed$$2Table_cpp$$2: - .byte4 $$248738 - .byte4 $$248739 - .byte4 $$248738 - .byte4 $$248740 + .4byte $$248738 + .4byte $$248739 + .4byte $$248738 + .4byte $$248740 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PTCL_INFOS__Q43scn7history6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn7history6effect19$$2unnamed$$2Table_cpp$$2: - .byte4 $$248738 - .byte4 $$248739 - .byte4 $$248740 - .byte4 $$248741 - .byte4 $$248742 - .byte4 $$248743 + .4byte $$248738 + .4byte $$248739 + .4byte $$248740 + .4byte $$248741 + .4byte $$248742 + .4byte $$248743 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PTCL_INFOS__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2: - .byte4 $$248738 - .byte4 $$248739 - .byte4 $$248740 - .byte4 $$248741 - .byte4 $$248742 - .byte4 $$248743 - .byte4 $$248744 - .byte4 $$248745 - .byte4 $$248746 - .byte4 $$248747 - .byte4 $$248748 - .byte4 $$248749 - .byte4 $$248750 - .byte4 $$248751 - .byte4 $$248752 - .byte4 $$248753 - .byte4 $$248754 - .byte4 $$248755 - .byte4 $$248756 - .byte4 $$248757 - .byte4 $$248758 - .byte4 $$248759 - .byte4 $$248760 - .byte4 $$248761 - .byte4 $$248762 - .byte4 $$248763 - .byte4 $$248764 - .byte4 $$248765 - .byte4 $$248766 - .byte4 $$248767 - .byte4 $$248768 - .byte4 $$248769 - .byte4 $$248770 - .byte4 $$248771 - .byte4 $$248772 - .byte4 $$248773 - .byte4 $$248774 - .byte4 $$248775 - .byte4 $$248776 - .byte4 $$248777 - .byte4 $$248778 - .byte4 $$248779 - .byte4 $$248780 - .byte4 $$248781 - .byte4 $$248782 - .byte4 $$248783 - .byte4 $$248784 - .byte4 $$248785 - .byte4 $$248786 - .byte4 $$248787 - .byte4 $$248788 - .byte4 $$248789 - .byte4 $$248790 - .byte4 $$248791 - .byte4 $$248792 - .byte4 $$248793 - .byte4 $$248794 - .byte4 $$248795 - .byte4 $$248796 - .byte4 $$248797 - .byte4 $$248798 - .byte4 $$248799 - .byte4 $$248800 - .byte4 $$248801 - .byte4 $$248802 - .byte4 $$248803 - .byte4 $$248804 - .byte4 $$248805 - .byte4 $$248806 - .byte4 $$248807 - .byte4 $$248808 - .byte4 $$248809 - .byte4 $$248810 - .byte4 $$248811 - .byte4 $$248812 - .byte4 $$248813 - .byte4 $$248814 - .byte4 $$248815 - .byte4 $$248816 - .byte4 $$248817 - .byte4 $$248818 - .byte4 $$248819 - .byte4 $$248820 - .byte4 $$248821 - .byte4 $$248822 - .byte4 $$248823 - .byte4 $$248824 - .byte4 $$248825 - .byte4 $$248826 - .byte4 $$248827 - .byte4 $$248828 - .byte4 $$248829 - .byte4 $$248830 - .byte4 $$248831 - .byte4 $$248832 - .byte4 $$248833 - .byte4 $$248834 - .byte4 $$248835 - .byte4 $$248836 - .byte4 $$248837 - .byte4 $$248838 - .byte4 $$248839 - .byte4 $$248840 - .byte4 $$248841 - .byte4 $$248842 - .byte4 $$248843 - .byte4 $$248844 - .byte4 $$248845 - .byte4 $$248846 - .byte4 $$248847 - .byte4 $$248848 - .byte4 $$248849 - .byte4 $$248850 - .byte4 $$248851 - .byte4 $$248852 - .byte4 $$248853 - .byte4 $$248854 - .byte4 $$248855 + .4byte $$248738 + .4byte $$248739 + .4byte $$248740 + .4byte $$248741 + .4byte $$248742 + .4byte $$248743 + .4byte $$248744 + .4byte $$248745 + .4byte $$248746 + .4byte $$248747 + .4byte $$248748 + .4byte $$248749 + .4byte $$248750 + .4byte $$248751 + .4byte $$248752 + .4byte $$248753 + .4byte $$248754 + .4byte $$248755 + .4byte $$248756 + .4byte $$248757 + .4byte $$248758 + .4byte $$248759 + .4byte $$248760 + .4byte $$248761 + .4byte $$248762 + .4byte $$248763 + .4byte $$248764 + .4byte $$248765 + .4byte $$248766 + .4byte $$248767 + .4byte $$248768 + .4byte $$248769 + .4byte $$248770 + .4byte $$248771 + .4byte $$248772 + .4byte $$248773 + .4byte $$248774 + .4byte $$248775 + .4byte $$248776 + .4byte $$248777 + .4byte $$248778 + .4byte $$248779 + .4byte $$248780 + .4byte $$248781 + .4byte $$248782 + .4byte $$248783 + .4byte $$248784 + .4byte $$248785 + .4byte $$248786 + .4byte $$248787 + .4byte $$248788 + .4byte $$248789 + .4byte $$248790 + .4byte $$248791 + .4byte $$248792 + .4byte $$248793 + .4byte $$248794 + .4byte $$248795 + .4byte $$248796 + .4byte $$248797 + .4byte $$248798 + .4byte $$248799 + .4byte $$248800 + .4byte $$248801 + .4byte $$248802 + .4byte $$248803 + .4byte $$248804 + .4byte $$248805 + .4byte $$248806 + .4byte $$248807 + .4byte $$248808 + .4byte $$248809 + .4byte $$248810 + .4byte $$248811 + .4byte $$248812 + .4byte $$248813 + .4byte $$248814 + .4byte $$248815 + .4byte $$248816 + .4byte $$248817 + .4byte $$248818 + .4byte $$248819 + .4byte $$248820 + .4byte $$248821 + .4byte $$248822 + .4byte $$248823 + .4byte $$248824 + .4byte $$248825 + .4byte $$248826 + .4byte $$248827 + .4byte $$248828 + .4byte $$248829 + .4byte $$248830 + .4byte $$248831 + .4byte $$248832 + .4byte $$248833 + .4byte $$248834 + .4byte $$248835 + .4byte $$248836 + .4byte $$248837 + .4byte $$248838 + .4byte $$248839 + .4byte $$248840 + .4byte $$248841 + .4byte $$248842 + .4byte $$248843 + .4byte $$248844 + .4byte $$248845 + .4byte $$248846 + .4byte $$248847 + .4byte $$248848 + .4byte $$248849 + .4byte $$248850 + .4byte $$248851 + .4byte $$248852 + .4byte $$248853 + .4byte $$248854 + .4byte $$248855 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248738 @@ -6511,57 +6511,57 @@ $$248907: .asciz "step/effect/wing/Flight" .global T_POLY_RESPATHS__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2 T_POLY_RESPATHS__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2: - .byte4 $$248857 - .byte4 $$248858 - .byte4 $$248859 - .byte4 $$248860 - .byte4 $$248861 - .byte4 $$248862 - .byte4 $$248863 - .byte4 $$248864 - .byte4 $$248865 - .byte4 $$248866 - .byte4 $$248867 - .byte4 $$248868 - .byte4 $$248869 - .byte4 $$248870 - .byte4 $$248871 - .byte4 $$248872 - .byte4 $$248873 - .byte4 $$248874 - .byte4 $$248875 - .byte4 $$248876 - .byte4 $$248877 - .byte4 $$248878 - .byte4 $$248879 - .byte4 $$248880 - .byte4 $$248881 - .byte4 $$248882 - .byte4 $$248883 - .byte4 $$248884 - .byte4 $$248885 - .byte4 $$248886 - .byte4 $$248887 - .byte4 $$248888 - .byte4 $$248889 - .byte4 $$248890 - .byte4 $$248891 - .byte4 $$248892 - .byte4 $$248893 - .byte4 $$248894 - .byte4 $$248895 - .byte4 $$248896 - .byte4 $$248897 - .byte4 $$248898 - .byte4 $$248899 - .byte4 $$248900 - .byte4 $$248901 - .byte4 $$248902 - .byte4 $$248903 - .byte4 $$248904 - .byte4 $$248905 - .byte4 $$248906 - .byte4 $$248907 + .4byte $$248857 + .4byte $$248858 + .4byte $$248859 + .4byte $$248860 + .4byte $$248861 + .4byte $$248862 + .4byte $$248863 + .4byte $$248864 + .4byte $$248865 + .4byte $$248866 + .4byte $$248867 + .4byte $$248868 + .4byte $$248869 + .4byte $$248870 + .4byte $$248871 + .4byte $$248872 + .4byte $$248873 + .4byte $$248874 + .4byte $$248875 + .4byte $$248876 + .4byte $$248877 + .4byte $$248878 + .4byte $$248879 + .4byte $$248880 + .4byte $$248881 + .4byte $$248882 + .4byte $$248883 + .4byte $$248884 + .4byte $$248885 + .4byte $$248886 + .4byte $$248887 + .4byte $$248888 + .4byte $$248889 + .4byte $$248890 + .4byte $$248891 + .4byte $$248892 + .4byte $$248893 + .4byte $$248894 + .4byte $$248895 + .4byte $$248896 + .4byte $$248897 + .4byte $$248898 + .4byte $$248899 + .4byte $$248900 + .4byte $$248901 + .4byte $$248902 + .4byte $$248903 + .4byte $$248904 + .4byte $$248905 + .4byte $$248906 + .4byte $$248907 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -6600,8 +6600,8 @@ $$248738: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_POLY_RESPATHS__Q43scn10grandtitle6effect19$$2unnamed$$2Table_cpp$$2 T_POLY_RESPATHS__Q43scn10grandtitle6effect19$$2unnamed$$2Table_cpp$$2: - .byte4 $$248741 - .byte4 $$248742 + .4byte $$248741 + .4byte $$248742 .global $$248890 $$248890: .4byte 0 @@ -6617,8 +6617,8 @@ $$248740: .balign 4 .global T_POLY_RESPATHS__Q43scn7history6effect19$$2unnamed$$2Table_cpp$$2 T_POLY_RESPATHS__Q43scn7history6effect19$$2unnamed$$2Table_cpp$$2: - .byte4 $$248745 - .byte4 $$248746 + .4byte $$248745 + .4byte $$248746 .global $$248876 $$248876: .4byte 0 @@ -6822,14 +6822,14 @@ $$248854: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_PTCL_INFOS__Q43scn19challengefileselect6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn19challengefileselect6effect19$$2unnamed$$2Table_cpp$$2: - .byte4 $$248738 - .byte4 $$248739 + .4byte $$248738 + .4byte $$248739 .global $$248833 $$248833: .4byte 0x00000001 .global lbl_8055FD9C lbl_8055FD9C: - .byte4 $$2LOCAL$$2t_genContextHeader__Q43scn19challengefileselect6effect19$$2unnamed$$2Table_cpp$$2Fv$$2CONTEXTS + .4byte $$2LOCAL$$2t_genContextHeader__Q43scn19challengefileselect6effect19$$2unnamed$$2Table_cpp$$2Fv$$2CONTEXTS .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248847 @@ -6837,7 +6837,7 @@ $$248847: .4byte 0x00000004 .global lbl_8055FE24 lbl_8055FE24: - .byte4 $$2LOCAL$$2t_genContextHeader__Q43scn14challengetitle6effect19$$2unnamed$$2Table_cpp$$2Fv$$2CONTEXTS + .4byte $$2LOCAL$$2t_genContextHeader__Q43scn14challengetitle6effect19$$2unnamed$$2Table_cpp$$2Fv$$2CONTEXTS .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248842 @@ -6845,19 +6845,19 @@ $$248842: .4byte 0x00000005 .global lbl_8055FE64 lbl_8055FE64: - .byte4 $$2LOCAL$$2t_genContextHeader__Q43scn15challengeresult6effect19$$2unnamed$$2Table_cpp$$2Fv$$2CONTEXTS + .4byte $$2LOCAL$$2t_genContextHeader__Q43scn15challengeresult6effect19$$2unnamed$$2Table_cpp$$2Fv$$2CONTEXTS .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_PTCL_INFOS__Q43scn10grandtitle6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn10grandtitle6effect19$$2unnamed$$2Table_cpp$$2: - .byte4 $$248738 - .byte4 $$248739 + .4byte $$248738 + .4byte $$248739 .global $$248870 $$248870: .4byte 0x00000010 .global lbl_80560004 lbl_80560004: - .byte4 $$2LOCAL$$2t_genContextHeader__Q43scn10grandtitle6effect19$$2unnamed$$2Table_cpp$$2Fv$$2CONTEXTS + .4byte $$2LOCAL$$2t_genContextHeader__Q43scn10grandtitle6effect19$$2unnamed$$2Table_cpp$$2Fv$$2CONTEXTS .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248862 @@ -6865,7 +6865,7 @@ $$248862: .4byte 0x0000000A .global lbl_805601F4 lbl_805601F4: - .byte4 $$2LOCAL$$2t_genContextHeader__Q43scn7history6effect19$$2unnamed$$2Table_cpp$$2Fv$$2CONTEXTS + .4byte $$2LOCAL$$2t_genContextHeader__Q43scn7history6effect19$$2unnamed$$2Table_cpp$$2Fv$$2CONTEXTS .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250163 @@ -6873,19 +6873,19 @@ $$250163: .4byte 0x00000244 .global lbl_80560DEC lbl_80560DEC: - .byte4 $$2LOCAL$$2t_genContextHeader__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2Fv$$2CONTEXTS + .4byte $$2LOCAL$$2t_genContextHeader__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2Fv$$2CONTEXTS .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_PTCL_INFOS__Q43scn9grandmenu6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn9grandmenu6effect19$$2unnamed$$2Table_cpp$$2: - .byte4 $$248738 - .byte4 $$248739 + .4byte $$248738 + .4byte $$248739 .global $$248839 $$248839: .4byte 0x00000002 .global lbl_8056423C lbl_8056423C: - .byte4 $$2LOCAL$$2t_genContextHeader__Q43scn9grandmenu6effect19$$2unnamed$$2Table_cpp$$2Fv$$2CONTEXTS + .4byte $$2LOCAL$$2t_genContextHeader__Q43scn9grandmenu6effect19$$2unnamed$$2Table_cpp$$2Fv$$2CONTEXTS .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$2LOCAL$$2t_genContextHeader__Q43scn19challengefileselect6effect19$$2unnamed$$2Table_cpp$$2Fv$$2CONTEXTS diff --git a/asm/src/TagProcessor.s b/asm/src/TagProcessor.s index 7773bc45..cff95684 100644 --- a/asm/src/TagProcessor.s +++ b/asm/src/TagProcessor.s @@ -125,7 +125,7 @@ setUseButtonPushedChar__Q23lyt12TagProcessorFb: __vt__Q23lyt12TagProcessor: .4byte 0 .4byte 0 - .byte4 __dt__Q23lyt12TagProcessorFv - .byte4 Process__Q23lyt12TagProcessorFUsPQ34nw4r2ut15PrintContext$$0w$$1 - .byte4 CalcRect__Q23lyt12TagProcessorFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext$$0w$$1 + .4byte __dt__Q23lyt12TagProcessorFv + .4byte Process__Q23lyt12TagProcessorFUsPQ34nw4r2ut15PrintContext$$0w$$1 + .4byte CalcRect__Q23lyt12TagProcessorFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext$$0w$$1 .4byte 0 diff --git a/asm/src/TagUtil.s b/asm/src/TagUtil.s index c994715c..da95f074 100644 --- a/asm/src/TagUtil.s +++ b/asm/src/TagUtil.s @@ -272,13 +272,13 @@ onStartTag__Q33lyt7TagUtil25Iterator$48809TagUtil_cppFPCwUlUsUsUsPUc: __vt__Q33lyt7TagUtil25Iterator$48859TagUtil_cpp: .4byte 0 .4byte 0 - .byte4 onStartTag__Q33lyt7TagUtil25Iterator$48859TagUtil_cppFPCwUlUsUsUsPUc - .byte4 onEndTag__Q33lyt7TagUtil25Iterator$48859TagUtil_cppFPCwUlUsUs - .byte4 onNormalChar__Q33lyt7TagUtil25Iterator$48859TagUtil_cppFw + .4byte onStartTag__Q33lyt7TagUtil25Iterator$48859TagUtil_cppFPCwUlUsUsUsPUc + .4byte onEndTag__Q33lyt7TagUtil25Iterator$48859TagUtil_cppFPCwUlUsUs + .4byte onNormalChar__Q33lyt7TagUtil25Iterator$48859TagUtil_cppFw .global __vt__Q33lyt7TagUtil25Iterator$48809TagUtil_cpp __vt__Q33lyt7TagUtil25Iterator$48809TagUtil_cpp: .4byte 0 .4byte 0 - .byte4 onStartTag__Q33lyt7TagUtil25Iterator$48809TagUtil_cppFPCwUlUsUsUsPUc - .byte4 onEndTag__Q33lyt7TagUtil25Iterator$48809TagUtil_cppFPCwUlUsUs - .byte4 onNormalChar__Q33lyt7TagUtil25Iterator$48809TagUtil_cppFw + .4byte onStartTag__Q33lyt7TagUtil25Iterator$48809TagUtil_cppFPCwUlUsUsUsPUc + .4byte onEndTag__Q33lyt7TagUtil25Iterator$48809TagUtil_cppFPCwUlUsUs + .4byte onNormalChar__Q33lyt7TagUtil25Iterator$48809TagUtil_cppFw diff --git a/asm/src/TalkManager.s b/asm/src/TalkManager.s index bf3d3343..a1dfdb5e 100644 --- a/asm/src/TalkManager.s +++ b/asm/src/TalkManager.s @@ -201,7 +201,7 @@ $$252114: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252115 $$252115: - .byte4 $$252113 + .4byte $$252113 .global lbl_805625DC lbl_805625DC: - .byte4 $$252114 + .4byte $$252114 diff --git a/asm/src/TargetScorePanel.s b/asm/src/TargetScorePanel.s index d2f46662..482dc2d7 100644 --- a/asm/src/TargetScorePanel.s +++ b/asm/src/TargetScorePanel.s @@ -478,18 +478,18 @@ lbl_803C03F0: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251706 $$251706: - .byte4 $$251701 - .byte4 $$251702 - .byte4 $$251703 - .byte4 $$251704 - .byte4 $$251705 + .4byte $$251701 + .4byte $$251702 + .4byte $$251703 + .4byte $$251704 + .4byte $$251705 .4byte 0 .global $$252072 $$252072: - .byte4 $$252068 - .byte4 $$252069 - .byte4 $$252070 - .byte4 $$252071 + .4byte $$252068 + .4byte $$252069 + .4byte $$252070 + .4byte $$252071 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251701 diff --git a/asm/src/Text.s b/asm/src/Text.s index 76154fa5..903bbf50 100644 --- a/asm/src/Text.s +++ b/asm/src/Text.s @@ -783,63 +783,63 @@ hideAllText__Q43scn7history6detail4TextFv: .global COPYRIGHT_TABLE__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2 COPYRIGHT_TABLE__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2: .4byte 0 - .byte4 $$251849 + .4byte $$251849 .4byte 0x00000001 - .byte4 $$251850 + .4byte $$251850 .4byte 0x00000001 - .byte4 $$251851 + .4byte $$251851 .4byte 0x00000001 - .byte4 $$251852 + .4byte $$251852 .4byte 0 - .byte4 $$251849 + .4byte $$251849 .4byte 0x00000001 - .byte4 $$251853 + .4byte $$251853 .4byte 0x00000001 - .byte4 $$251854 + .4byte $$251854 .4byte 0x00000001 - .byte4 $$251855 + .4byte $$251855 .4byte 0x00000001 - .byte4 $$251856 + .4byte $$251856 .4byte 0x00000001 - .byte4 $$251857 + .4byte $$251857 .4byte 0x00000001 - .byte4 $$251858 + .4byte $$251858 .4byte 0x00000001 - .byte4 $$251859 + .4byte $$251859 .4byte 0 - .byte4 $$251849 + .4byte $$251849 .4byte 0 - .byte4 $$251849 + .4byte $$251849 .4byte 0x00000001 - .byte4 $$251860 + .4byte $$251860 .4byte 0x00000001 - .byte4 $$251861 + .4byte $$251861 .4byte 0x00000001 - .byte4 $$251862 + .4byte $$251862 .4byte 0x00000001 - .byte4 $$251863 + .4byte $$251863 .4byte 0x00000001 - .byte4 $$251864 + .4byte $$251864 .4byte 0x00000001 - .byte4 $$251865 + .4byte $$251865 .4byte 0x00000001 - .byte4 $$251866 + .4byte $$251866 .4byte 0x00000001 - .byte4 $$251867 + .4byte $$251867 .4byte 0 - .byte4 $$251849 + .4byte $$251849 .4byte 0x00000001 - .byte4 $$251868 + .4byte $$251868 .4byte 0 - .byte4 $$251849 + .4byte $$251849 .4byte 0x00000001 - .byte4 $$251869 + .4byte $$251869 .4byte 0x00000001 - .byte4 $$251870 + .4byte $$251870 .4byte 0x00000001 - .byte4 $$251871 + .4byte $$251871 .4byte 0x00000001 - .byte4 $$251872 + .4byte $$251872 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251808 @@ -867,60 +867,60 @@ $$251820: .balign 4 .global PANES__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2 PANES__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2: - .byte4 $$251800 - .byte4 $$251801 - .byte4 $$251802 - .byte4 $$251803 - .byte4 $$251804 - .byte4 $$251805 - .byte4 $$251806 - .byte4 $$251807 - .byte4 $$251808 - .byte4 $$251809 - .byte4 $$251810 - .byte4 $$251811 - .byte4 $$251812 - .byte4 $$251813 - .byte4 $$251814 - .byte4 $$251815 - .byte4 $$251816 - .byte4 $$251817 - .byte4 $$251818 - .byte4 $$251819 - .byte4 $$251820 - .byte4 $$251821 - .byte4 $$251822 + .4byte $$251800 + .4byte $$251801 + .4byte $$251802 + .4byte $$251803 + .4byte $$251804 + .4byte $$251805 + .4byte $$251806 + .4byte $$251807 + .4byte $$251808 + .4byte $$251809 + .4byte $$251810 + .4byte $$251811 + .4byte $$251812 + .4byte $$251813 + .4byte $$251814 + .4byte $$251815 + .4byte $$251816 + .4byte $$251817 + .4byte $$251818 + .4byte $$251819 + .4byte $$251820 + .4byte $$251821 + .4byte $$251822 .global TABLE__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2 TABLE__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2: - .byte4 $$251823 - .byte4 $$251802 - .byte4 $$251806 - .byte4 $$251809 - .byte4 $$251823 - .byte4 $$251807 - .byte4 $$251808 - .byte4 $$251803 - .byte4 $$251801 - .byte4 $$251800 - .byte4 $$251810 - .byte4 $$251804 - .byte4 $$251823 - .byte4 $$251823 - .byte4 $$251805 - .byte4 $$251811 - .byte4 $$251816 - .byte4 $$251821 - .byte4 $$251812 - .byte4 $$251817 - .byte4 $$251815 - .byte4 $$251818 - .byte4 $$251823 - .byte4 $$251814 - .byte4 $$251823 - .byte4 $$251819 - .byte4 $$251820 - .byte4 $$251813 - .byte4 $$251822 + .4byte $$251823 + .4byte $$251802 + .4byte $$251806 + .4byte $$251809 + .4byte $$251823 + .4byte $$251807 + .4byte $$251808 + .4byte $$251803 + .4byte $$251801 + .4byte $$251800 + .4byte $$251810 + .4byte $$251804 + .4byte $$251823 + .4byte $$251823 + .4byte $$251805 + .4byte $$251811 + .4byte $$251816 + .4byte $$251821 + .4byte $$251812 + .4byte $$251817 + .4byte $$251815 + .4byte $$251818 + .4byte $$251823 + .4byte $$251814 + .4byte $$251823 + .4byte $$251819 + .4byte $$251820 + .4byte $$251813 + .4byte $$251822 .global $$251827 $$251827: .asciz "KPinball" @@ -943,35 +943,35 @@ $$251845: .balign 4 .global PICTUREPANE_TABLE__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2 PICTUREPANE_TABLE__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2: - .byte4 $$251823 - .byte4 $$251825 - .byte4 $$251826 - .byte4 $$251827 - .byte4 $$251823 - .byte4 $$251828 - .byte4 $$251829 - .byte4 $$251830 - .byte4 $$251831 - .byte4 $$251832 - .byte4 $$251833 - .byte4 $$251834 - .byte4 $$251823 - .byte4 $$251823 - .byte4 $$251835 - .byte4 $$251836 - .byte4 $$251837 - .byte4 $$251838 - .byte4 $$251839 - .byte4 $$251840 - .byte4 $$251841 - .byte4 $$251842 - .byte4 $$251823 - .byte4 $$251843 - .byte4 $$251823 - .byte4 $$251844 - .byte4 $$251845 - .byte4 $$251846 - .byte4 $$251847 + .4byte $$251823 + .4byte $$251825 + .4byte $$251826 + .4byte $$251827 + .4byte $$251823 + .4byte $$251828 + .4byte $$251829 + .4byte $$251830 + .4byte $$251831 + .4byte $$251832 + .4byte $$251833 + .4byte $$251834 + .4byte $$251823 + .4byte $$251823 + .4byte $$251835 + .4byte $$251836 + .4byte $$251837 + .4byte $$251838 + .4byte $$251839 + .4byte $$251840 + .4byte $$251841 + .4byte $$251842 + .4byte $$251823 + .4byte $$251843 + .4byte $$251823 + .4byte $$251844 + .4byte $$251845 + .4byte $$251846 + .4byte $$251847 .global $$251850 $$251850: .asciz "CopyrightKirby1" diff --git a/asm/src/TimeString.s b/asm/src/TimeString.s index d819fb15..72e5654e 100644 --- a/asm/src/TimeString.s +++ b/asm/src/TimeString.s @@ -229,9 +229,9 @@ $$249499: __vt__Q43scn15challengeresult4info10TimeString: .4byte 0 .4byte 0 - .byte4 onStartTag__Q43scn15challengeresult4info10TimeStringFPCwUlUsUsUsPUc - .byte4 onEndTag__Q43scn15challengeresult4info10TimeStringFPCwUlUsUs - .byte4 onNormalChar__Q43scn15challengeresult4info10TimeStringFw + .4byte onStartTag__Q43scn15challengeresult4info10TimeStringFPCwUlUsUsUsPUc + .4byte onEndTag__Q43scn15challengeresult4info10TimeStringFPCwUlUsUs + .4byte onNormalChar__Q43scn15challengeresult4info10TimeStringFw .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/TitleInfo.s b/asm/src/TitleInfo.s index 7c747636..1733e6b4 100644 --- a/asm/src/TitleInfo.s +++ b/asm/src/TitleInfo.s @@ -1082,7 +1082,7 @@ $$253846: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_LYT_RES_PATH__Q33scn14challengetitle23$$2unnamed$$2TitleInfo_cpp$$2 T_LYT_RES_PATH__Q33scn14challengetitle23$$2unnamed$$2TitleInfo_cpp$$2: - .byte4 $$252920 + .4byte $$252920 .global $$253755 $$253755: .4byte 0x3F333333 @@ -1090,7 +1090,7 @@ $$253755: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_LYT_RES_PATH__Q33scn10grandtitle23$$2unnamed$$2TitleInfo_cpp$$2 T_LYT_RES_PATH__Q33scn10grandtitle23$$2unnamed$$2TitleInfo_cpp$$2: - .byte4 $$252919 + .4byte $$252919 .global $$253798 $$253798: .4byte 0x3F333333 diff --git a/asm/src/TotalScore.s b/asm/src/TotalScore.s index 28449a23..df85f329 100644 --- a/asm/src/TotalScore.s +++ b/asm/src/TotalScore.s @@ -3293,12 +3293,12 @@ lbl_803B991C: .section .data, "wa" # 0x80421040 - 0x80496700 .global NAMES__Q34info6common24$$2unnamed$$2TotalScore_cpp$$2 NAMES__Q34info6common24$$2unnamed$$2TotalScore_cpp$$2: - .byte4 $$251545 - .byte4 $$251545 - .byte4 $$251546 - .byte4 $$251547 - .byte4 $$251548 - .byte4 $$251548 + .4byte $$251545 + .4byte $$251545 + .4byte $$251546 + .4byte $$251547 + .4byte $$251548 + .4byte $$251548 .global $$252626 $$252626: .asciz "common/Main" diff --git a/asm/src/TotalScorePanel.s b/asm/src/TotalScorePanel.s index c6971cce..7728a2e4 100644 --- a/asm/src/TotalScorePanel.s +++ b/asm/src/TotalScorePanel.s @@ -442,20 +442,20 @@ lbl_803B00E8: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$252167 $$252167: - .byte4 $$252161 - .byte4 $$252162 - .byte4 $$252163 - .byte4 $$252164 - .byte4 $$252165 - .byte4 $$252166 + .4byte $$252161 + .4byte $$252162 + .4byte $$252163 + .4byte $$252164 + .4byte $$252165 + .4byte $$252166 .global $$252187 $$252187: - .byte4 $$252161 - .byte4 $$252182 - .byte4 $$252183 - .byte4 $$252184 - .byte4 $$252185 - .byte4 $$252186 + .4byte $$252161 + .4byte $$252182 + .4byte $$252183 + .4byte $$252184 + .4byte $$252185 + .4byte $$252186 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252619 diff --git a/asm/src/Trophy.s b/asm/src/Trophy.s index e0bab527..d843b3ce 100644 --- a/asm/src/Trophy.s +++ b/asm/src/Trophy.s @@ -862,7 +862,7 @@ __sinit_$$3Trophy_cpp: /* 801EA0CC 001E5F0C 4B ED 3F F4 */ b __ct__Q34nw4r4math4VEC3Ffff .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3Trophy_cpp + .4byte __sinit_$$3Trophy_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$252758 @@ -901,12 +901,12 @@ $$252321: .balign 4 .global MODEL_NAMES__Q33scn19challengefileselect20$$2unnamed$$2Trophy_cpp$$2 MODEL_NAMES__Q33scn19challengefileselect20$$2unnamed$$2Trophy_cpp$$2: - .byte4 $$252317 - .byte4 $$252317 - .byte4 $$252318 - .byte4 $$252319 - .byte4 $$252320 - .byte4 $$252321 + .4byte $$252317 + .4byte $$252317 + .4byte $$252318 + .4byte $$252319 + .4byte $$252320 + .4byte $$252321 .global $$253902 $$253902: .asciz "challengefileselect/Trophyanime" diff --git a/asm/src/UnitHeapMapUser.s b/asm/src/UnitHeapMapUser.s index 052f4ca1..df2a9f3e 100644 --- a/asm/src/UnitHeapMapUser.s +++ b/asm/src/UnitHeapMapUser.s @@ -197,16 +197,16 @@ drawFragmentBlocks__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ4 __vt__Q23mem15UnitHeapMapUser: .4byte 0 .4byte 0 - .byte4 __dt__Q23mem15UnitHeapMapUserFv - .byte4 heapName__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 fragmentBlockCount__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 usedBlockCount__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 totalHeapSize__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 usedHeapSize__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 startAddress__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 endAddress__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .byte4 drawUsedBlocks__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer - .byte4 drawFragmentBlocks__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer + .4byte __dt__Q23mem15UnitHeapMapUserFv + .4byte heapName__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte fragmentBlockCount__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte usedBlockCount__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte totalHeapSize__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte usedHeapSize__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte startAddress__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte endAddress__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte drawUsedBlocks__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer + .4byte drawFragmentBlocks__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249027 diff --git a/asm/src/UserTagProcessor.s b/asm/src/UserTagProcessor.s index 0ffb0922..fc1e181c 100644 --- a/asm/src/UserTagProcessor.s +++ b/asm/src/UserTagProcessor.s @@ -1187,46 +1187,46 @@ RANDOM_BUTTON_TABLE__30$$2unnamed$$2UserTagProcessor_cpp$$2: .4byte 0x00000003 .global privateCharMap__30$$2unnamed$$2UserTagProcessor_cpp$$2 privateCharMap__30$$2unnamed$$2UserTagProcessor_cpp$$2: - .byte4 $$249204 - .byte4 $$249205 - .byte4 $$249206 - .byte4 $$249207 - .byte4 $$249208 - .byte4 $$249209 - .byte4 $$249210 - .byte4 $$249211 - .byte4 $$249212 - .byte4 $$249213 - .byte4 $$249214 - .byte4 $$249215 - .byte4 $$249216 - .byte4 $$249217 - .byte4 $$249218 - .byte4 $$249219 - .byte4 $$249220 - .byte4 $$249221 - .byte4 $$249222 - .byte4 $$249223 - .byte4 $$249224 - .byte4 $$249225 - .byte4 $$249226 - .byte4 $$249227 - .byte4 $$249228 - .byte4 $$249229 - .byte4 $$249230 - .byte4 $$249231 - .byte4 $$249232 - .byte4 $$249233 - .byte4 $$249234 - .byte4 $$249235 - .byte4 $$249236 - .byte4 $$249237 - .byte4 $$249238 - .byte4 $$249239 - .byte4 $$249240 - .byte4 $$249241 - .byte4 $$249242 - .byte4 $$249209 + .4byte $$249204 + .4byte $$249205 + .4byte $$249206 + .4byte $$249207 + .4byte $$249208 + .4byte $$249209 + .4byte $$249210 + .4byte $$249211 + .4byte $$249212 + .4byte $$249213 + .4byte $$249214 + .4byte $$249215 + .4byte $$249216 + .4byte $$249217 + .4byte $$249218 + .4byte $$249219 + .4byte $$249220 + .4byte $$249221 + .4byte $$249222 + .4byte $$249223 + .4byte $$249224 + .4byte $$249225 + .4byte $$249226 + .4byte $$249227 + .4byte $$249228 + .4byte $$249229 + .4byte $$249230 + .4byte $$249231 + .4byte $$249232 + .4byte $$249233 + .4byte $$249234 + .4byte $$249235 + .4byte $$249236 + .4byte $$249237 + .4byte $$249238 + .4byte $$249239 + .4byte $$249240 + .4byte $$249241 + .4byte $$249242 + .4byte $$249209 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249204 @@ -1307,9 +1307,9 @@ $$250943: __vt__Q23lyt16UserTagProcessor: .4byte 0 .4byte 0 - .byte4 __dt__Q23lyt16UserTagProcessorFv - .byte4 Process__Q23lyt16UserTagProcessorFUsPQ34nw4r2ut15PrintContext$$0w$$1 - .byte4 CalcRect__Q23lyt16UserTagProcessorFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext$$0w$$1 + .4byte __dt__Q23lyt16UserTagProcessorFv + .4byte Process__Q23lyt16UserTagProcessorFUsPQ34nw4r2ut15PrintContext$$0w$$1 + .4byte CalcRect__Q23lyt16UserTagProcessorFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext$$0w$$1 .global $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0w$$1FPCw$$22 $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0w$$1FPCw$$22: .asciz "NW4R:Pointer Error\nstr(=%p) is not valid pointer." diff --git a/asm/src/Util.s b/asm/src/Util.s index 79c0130c..16b5de6a 100644 --- a/asm/src/Util.s +++ b/asm/src/Util.s @@ -1858,13 +1858,13 @@ $$2STRING$$2AsinRad__Q24nw4r4mathFf: .section .data, "wa" # 0x80421040 - 0x80496700 .global T_HERO_PANE_NAMES__18$$2unnamed$$2Util_cpp$$2 T_HERO_PANE_NAMES__18$$2unnamed$$2Util_cpp$$2: - .byte4 $$251913 - .byte4 $$251914 - .byte4 $$251915 - .byte4 $$251916 - .byte4 $$251917 - .byte4 $$251918 - .byte4 $$251919 + .4byte $$251913 + .4byte $$251914 + .4byte $$251915 + .4byte $$251916 + .4byte $$251917 + .4byte $$251918 + .4byte $$251919 .global $$254066 $$254066: .4byte 0xFF10FF11 @@ -1884,16 +1884,16 @@ $$254078: __vt__Q24info22Iterator$52761Util_cpp: .4byte 0 .4byte 0 - .byte4 onStartTag__Q24info22Iterator$52761Util_cppFPCwUlUsUsUsPUc - .byte4 onEndTag__Q24info22Iterator$52761Util_cppFPCwUlUsUs - .byte4 onNormalChar__Q24info22Iterator$52761Util_cppFw + .4byte onStartTag__Q24info22Iterator$52761Util_cppFPCwUlUsUsUsPUc + .4byte onEndTag__Q24info22Iterator$52761Util_cppFPCwUlUsUs + .4byte onNormalChar__Q24info22Iterator$52761Util_cppFw .global __vt__Q24info22Iterator$52705Util_cpp __vt__Q24info22Iterator$52705Util_cpp: .4byte 0 .4byte 0 - .byte4 onStartTag__Q24info22Iterator$52705Util_cppFPCwUlUsUsUsPUc - .byte4 onEndTag__Q24info22Iterator$52705Util_cppFPCwUlUsUs - .byte4 onNormalChar__Q24info22Iterator$52705Util_cppFw + .4byte onStartTag__Q24info22Iterator$52705Util_cppFPCwUlUsUsUsPUc + .4byte onEndTag__Q24info22Iterator$52705Util_cppFPCwUlUsUs + .4byte onNormalChar__Q24info22Iterator$52705Util_cppFw .global $$254197 $$254197: .asciz "bad_function_call" @@ -1902,16 +1902,16 @@ $$254197: __vt__Q24info22Iterator$52503Util_cpp: .4byte 0 .4byte 0 - .byte4 onStartTag__Q24info22Iterator$52503Util_cppFPCwUlUsUsUsPUc - .byte4 onEndTag__Q33lyt7TagUtil14StringIteratorFPCwUlUsUs - .byte4 onNormalChar__Q33lyt7TagUtil14StringIteratorFw + .4byte onStartTag__Q24info22Iterator$52503Util_cppFPCwUlUsUsUsPUc + .4byte onEndTag__Q33lyt7TagUtil14StringIteratorFPCwUlUsUs + .4byte onNormalChar__Q33lyt7TagUtil14StringIteratorFw .global __vt__Q218$$2unnamed$$2Util_cpp$$222Iterator$52007Util_cpp __vt__Q218$$2unnamed$$2Util_cpp$$222Iterator$52007Util_cpp: .4byte 0 .4byte 0 - .byte4 onStartTag__Q218$$2unnamed$$2Util_cpp$$222Iterator$52007Util_cppFPCwUlUsUsUsPUc - .byte4 onEndTag__Q218$$2unnamed$$2Util_cpp$$222Iterator$52007Util_cppFPCwUlUsUs - .byte4 onNormalChar__Q218$$2unnamed$$2Util_cpp$$222Iterator$52007Util_cppFw + .4byte onStartTag__Q218$$2unnamed$$2Util_cpp$$222Iterator$52007Util_cppFPCwUlUsUsUsPUc + .4byte onEndTag__Q218$$2unnamed$$2Util_cpp$$222Iterator$52007Util_cppFPCwUlUsUs + .4byte onNormalChar__Q218$$2unnamed$$2Util_cpp$$222Iterator$52007Util_cppFw .global $$2STRING$$2CalcStringWidth__Q34nw4r2ut17TextWriterBase$$0w$$1CFPCw$$22 $$2STRING$$2CalcStringWidth__Q34nw4r2ut17TextWriterBase$$0w$$1CFPCw$$22: .asciz "NW4R:Pointer Error\nstr(=%p) is not valid pointer." diff --git a/asm/src/Utility.s b/asm/src/Utility.s index 63c47189..67055099 100644 --- a/asm/src/Utility.s +++ b/asm/src/Utility.s @@ -10935,8 +10935,8 @@ $$261690: __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1Fv .section .data, "wa" # 0x80421040 - 0x80496700 .global $$264675 @@ -10955,8 +10955,8 @@ $$264675: __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateSwim$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateSwim$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateSwim$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateSwim$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateSwim$$4PQ43scn4step4hero4Hero$$1Fv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249660 diff --git a/asm/src/VISetting.s b/asm/src/VISetting.s index 8b5585db..ebe55b8e 100644 --- a/asm/src/VISetting.s +++ b/asm/src/VISetting.s @@ -549,20 +549,20 @@ Pal60Prog16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: .section .data, "wa" # 0x80421040 - 0x80496700 .global StandardRenderModeSets__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 StandardRenderModeSets__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: - .byte4 NtscInt4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 - .byte4 NtscInt4x3AA__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 - .byte4 NtscProg4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 - .byte4 NtscProg4x3AA__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 - .byte4 Pal50Int4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 - .byte4 Pal60Int4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 - .byte4 Pal60Prog4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 - .byte4 NtscInt16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 - .byte4 NtscInt16x9AA__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 - .byte4 NtscProg16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 - .byte4 NtscProg16x9AA__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 - .byte4 Pal50Int16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 - .byte4 Pal60Int16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 - .byte4 Pal60Prog16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 + .4byte NtscInt4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 + .4byte NtscInt4x3AA__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 + .4byte NtscProg4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 + .4byte NtscProg4x3AA__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 + .4byte Pal50Int4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 + .4byte Pal60Int4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 + .4byte Pal60Prog4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 + .4byte NtscInt16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 + .4byte NtscInt16x9AA__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 + .4byte NtscProg16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 + .4byte NtscProg16x9AA__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 + .4byte Pal50Int16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 + .4byte Pal60Int16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 + .4byte Pal60Prog16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249284 diff --git a/asm/src/VMCore.s b/asm/src/VMCore.s index a6633f75..69785438 100644 --- a/asm/src/VMCore.s +++ b/asm/src/VMCore.s @@ -3647,10 +3647,10 @@ $$258679: .4byte 0 .global $$2LOCAL$$2isBuiltInType__Q26mintvm6VMCoreFPCc$$2table $$2LOCAL$$2isBuiltInType__Q26mintvm6VMCoreFPCc$$2table: - .byte4 $$252608 - .byte4 $$252609 - .byte4 $$252610 - .byte4 $$252611 + .4byte $$252608 + .4byte $$252609 + .4byte $$252610 + .4byte $$252611 .global $$258793 $$258793: .asciz "Not Found VMCore::sizeOf" @@ -3729,32 +3729,32 @@ $$259008: __vt__Q26mintvm6VMCore: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm6VMCoreFv + .4byte __dt__Q26mintvm6VMCoreFv .global __vt__Q26mintvm20VMMap$$0Ul$$44294967295$$1 __vt__Q26mintvm20VMMap$$0Ul$$44294967295$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm20VMMap$$0Ul$$44294967295$$1Fv + .4byte __dt__Q26mintvm20VMMap$$0Ul$$44294967295$$1Fv .global __vt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMVariable$$1 __vt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMVariable$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMVariable$$1Fv + .4byte __dt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMVariable$$1Fv .global __vt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMFunction$$1 __vt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMFunction$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMFunction$$1Fv + .4byte __dt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMFunction$$1Fv .global __vt__Q26mintvm28VMMapPtr$$0Q26mintvm8VMModule$$1 __vt__Q26mintvm28VMMapPtr$$0Q26mintvm8VMModule$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm28VMMapPtr$$0Q26mintvm8VMModule$$1Fv + .4byte __dt__Q26mintvm28VMMapPtr$$0Q26mintvm8VMModule$$1Fv .global __vt__Q26mintvm8VMObject __vt__Q26mintvm8VMObject: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm8VMObjectFv + .4byte __dt__Q26mintvm8VMObjectFv .global $$2STRING$$2addPtr__Q26mintvm29MPtrArray$$0Q26mintvm8VMModule$$1FPQ26mintvm8VMModule$$20 $$2STRING$$2addPtr__Q26mintvm29MPtrArray$$0Q26mintvm8VMModule$$1FPQ26mintvm8VMModule$$20: .asciz "mMax = %d\n" diff --git a/asm/src/VMFunctionList.s b/asm/src/VMFunctionList.s index 5026f297..d666f2ae 100644 --- a/asm/src/VMFunctionList.s +++ b/asm/src/VMFunctionList.s @@ -170,12 +170,12 @@ lbl_801CD1B8: __vt__Q26mintvm14VMFunctionList: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm14VMFunctionListFv + .4byte __dt__Q26mintvm14VMFunctionListFv .global __vt__Q26mintvm10VMFunction __vt__Q26mintvm10VMFunction: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm10VMFunctionFv + .4byte __dt__Q26mintvm10VMFunctionFv .global $$2STRING$$2addPtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FPQ26mintvm10VMFunction$$20 $$2STRING$$2addPtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMFunction$$1FPQ26mintvm10VMFunction$$20: .asciz "mMax = %d\n" diff --git a/asm/src/VMModule.s b/asm/src/VMModule.s index 725325d4..9b3c5dbe 100644 --- a/asm/src/VMModule.s +++ b/asm/src/VMModule.s @@ -143,15 +143,15 @@ lbl_801CD3AC: __vt__Q26mintvm8VMModule: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm8VMModuleFv + .4byte __dt__Q26mintvm8VMModuleFv .global __vt__Q26mintvm13VMSymbolTable __vt__Q26mintvm13VMSymbolTable: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm13VMSymbolTableFv + .4byte __dt__Q26mintvm13VMSymbolTableFv .global __vt__Q26mintvm15VMConstantTable __vt__Q26mintvm15VMConstantTable: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm15VMConstantTableFv + .4byte __dt__Q26mintvm15VMConstantTableFv .4byte 0 diff --git a/asm/src/VMObjectType.s b/asm/src/VMObjectType.s index 3aaca716..2a482255 100644 --- a/asm/src/VMObjectType.s +++ b/asm/src/VMObjectType.s @@ -264,17 +264,17 @@ lbl_801CD758: __vt__Q26mintvm12VMObjectType: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm12VMObjectTypeFv + .4byte __dt__Q26mintvm12VMObjectTypeFv .global __vt__Q26mintvm14VMVariableList __vt__Q26mintvm14VMVariableList: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm14VMVariableListFv + .4byte __dt__Q26mintvm14VMVariableListFv .global __vt__Q26mintvm10VMVariable __vt__Q26mintvm10VMVariable: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm10VMVariableFv + .4byte __dt__Q26mintvm10VMVariableFv .global $$2STRING$$2addPtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FPQ26mintvm10VMVariable$$20 $$2STRING$$2addPtr__Q26mintvm32MPtrArray$$0Q26mintvm10VMVariable$$1FPQ26mintvm10VMVariable$$20: .asciz "mMax = %d\n" diff --git a/asm/src/VMObjectTypeList.s b/asm/src/VMObjectTypeList.s index eccd9a2e..d2a421f3 100644 --- a/asm/src/VMObjectTypeList.s +++ b/asm/src/VMObjectTypeList.s @@ -332,7 +332,7 @@ $$250881: __vt__Q26mintvm16VMObjectTypeList: .4byte 0 .4byte 0 - .byte4 __dt__Q26mintvm16VMObjectTypeListFv + .4byte __dt__Q26mintvm16VMObjectTypeListFv .global $$2STRING$$2addPtr__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FPQ26mintvm12VMObjectType$$20 $$2STRING$$2addPtr__Q26mintvm34MPtrArray$$0Q26mintvm12VMObjectType$$1FPQ26mintvm12VMObjectType$$20: .asciz "mMax = %d\n" diff --git a/asm/src/VacuumAttackerCallback.s b/asm/src/VacuumAttackerCallback.s index ff91245f..abcb0294 100644 --- a/asm/src/VacuumAttackerCallback.s +++ b/asm/src/VacuumAttackerCallback.s @@ -216,12 +216,12 @@ SOUND_TABLE__36$$2unnamed$$2VacuumAttackerCallback_cpp$$2: __vt__Q43scn4step4hero22VacuumAttackerCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4hero22VacuumAttackerCallbackFv - .byte4 onEndIndivi__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8Attacker - .byte4 onDecCount__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8Attacker - .byte4 onHoldShake__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8Attacker - .byte4 onReceivedMighty__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8AttackerUl - .byte4 onReceivedCure__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8AttackerUl + .4byte __dt__Q43scn4step4hero22VacuumAttackerCallbackFv + .4byte onEndIndivi__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8Attacker + .4byte onDecCount__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8Attacker + .4byte onHoldShake__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8Attacker + .4byte onReceivedMighty__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8AttackerUl + .4byte onReceivedCure__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8AttackerUl .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256925 diff --git a/asm/src/VacuumReceiver.s b/asm/src/VacuumReceiver.s index ee15fcd5..f9dcf5a8 100644 --- a/asm/src/VacuumReceiver.s +++ b/asm/src/VacuumReceiver.s @@ -3691,28 +3691,28 @@ __dt__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumed __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common18StateVacuumReceive$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common18StateVacuumReceive$$4PQ43scn4step4boss4Boss$$1Fv - .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common18StateVacuumReceive$$4PQ43scn4step4boss4Boss$$1Fv + .4byte __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common18StateVacuumReceive$$4PQ43scn4step4boss4Boss$$1Fv + .4byte create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common18StateVacuumReceive$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q43scn4step4boss14VacuumReceiver __vt__Q43scn4step4boss14VacuumReceiver: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4boss14VacuumReceiverFv - .byte4 chkVacuum__Q43scn4step4boss14VacuumReceiverFRQ43scn4step6vacuum8AttackerRCQ33hel3geo4Rectbb - .byte4 prechkVacuum__Q43scn4step4boss14VacuumReceiverFRCQ33hel3geo4Rect - .byte4 reqDeadEnf__Q43scn4step4boss14VacuumReceiverFv - .byte4 reqReleaseEnf__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 setConstraintWeapon__Q43scn4step6vacuum12ReceiverBaseFQ24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1UlUl - .byte4 chkDrainAbility__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 onAttackerEndVacuum__Q43scn4step6vacuum12ReceiverBaseFRQ43scn4step6vacuum8Attacker - .byte4 isMighty__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 mightyFrame__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 setMighty__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl - .byte4 setCure__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl - .byte4 deadWithAttacker__Q43scn4step6vacuum12ReceiverBaseFQ43scn4step4hero10DeadFactorRCQ33hel4math7Vector2 - .byte4 isMainPlayer__Q43scn4step6vacuum12ReceiverBaseCFv - .byte4 drawDebug__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 handle__Q43scn4step6vacuum12ReceiverBaseFv + .4byte __dt__Q43scn4step4boss14VacuumReceiverFv + .4byte chkVacuum__Q43scn4step4boss14VacuumReceiverFRQ43scn4step6vacuum8AttackerRCQ33hel3geo4Rectbb + .4byte prechkVacuum__Q43scn4step4boss14VacuumReceiverFRCQ33hel3geo4Rect + .4byte reqDeadEnf__Q43scn4step4boss14VacuumReceiverFv + .4byte reqReleaseEnf__Q43scn4step6vacuum12ReceiverBaseFv + .4byte setConstraintWeapon__Q43scn4step6vacuum12ReceiverBaseFQ24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1UlUl + .4byte chkDrainAbility__Q43scn4step6vacuum12ReceiverBaseFv + .4byte onAttackerEndVacuum__Q43scn4step6vacuum12ReceiverBaseFRQ43scn4step6vacuum8Attacker + .4byte isMighty__Q43scn4step6vacuum12ReceiverBaseFv + .4byte mightyFrame__Q43scn4step6vacuum12ReceiverBaseFv + .4byte setMighty__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl + .4byte setCure__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl + .4byte deadWithAttacker__Q43scn4step6vacuum12ReceiverBaseFQ43scn4step4hero10DeadFactorRCQ33hel4math7Vector2 + .4byte isMainPlayer__Q43scn4step6vacuum12ReceiverBaseCFv + .4byte drawDebug__Q43scn4step6vacuum12ReceiverBaseFv + .4byte handle__Q43scn4step6vacuum12ReceiverBaseFv .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut88LinkList$$0Q24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util67ObjListNode$$0Q43scn4step6vacuum9IReceiver$$4Q24util16ObjListDummyType$$1$$20: .asciz "NW4R:Pointer must not be NULL (p)" @@ -3735,124 +3735,124 @@ $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q4 __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common18StateVacuumReceive$$4PQ43scn4step5enemy5Enemy$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common18StateVacuumReceive$$4PQ43scn4step5enemy5Enemy$$4Ul$$1Fv - .byte4 create__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common18StateVacuumReceive$$4PQ43scn4step5enemy5Enemy$$4Ul$$1Fv + .4byte __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common18StateVacuumReceive$$4PQ43scn4step5enemy5Enemy$$4Ul$$1Fv + .4byte create__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common18StateVacuumReceive$$4PQ43scn4step5enemy5Enemy$$4Ul$$1Fv .global __vt__Q43scn4step5enemy14VacuumReceiver __vt__Q43scn4step5enemy14VacuumReceiver: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step5enemy14VacuumReceiverFv - .byte4 chkVacuum__Q43scn4step5enemy14VacuumReceiverFRQ43scn4step6vacuum8AttackerRCQ33hel3geo4Rectbb - .byte4 prechkVacuum__Q43scn4step5enemy14VacuumReceiverFRCQ33hel3geo4Rect - .byte4 reqDeadEnf__Q43scn4step5enemy14VacuumReceiverFv - .byte4 reqReleaseEnf__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 setConstraintWeapon__Q43scn4step6vacuum12ReceiverBaseFQ24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1UlUl - .byte4 chkDrainAbility__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 onAttackerEndVacuum__Q43scn4step6vacuum12ReceiverBaseFRQ43scn4step6vacuum8Attacker - .byte4 isMighty__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 mightyFrame__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 setMighty__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl - .byte4 setCure__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl - .byte4 deadWithAttacker__Q43scn4step6vacuum12ReceiverBaseFQ43scn4step4hero10DeadFactorRCQ33hel4math7Vector2 - .byte4 isMainPlayer__Q43scn4step6vacuum12ReceiverBaseCFv - .byte4 drawDebug__Q43scn4step5enemy14VacuumReceiverFv - .byte4 handle__Q43scn4step6vacuum12ReceiverBaseFv + .4byte __dt__Q43scn4step5enemy14VacuumReceiverFv + .4byte chkVacuum__Q43scn4step5enemy14VacuumReceiverFRQ43scn4step6vacuum8AttackerRCQ33hel3geo4Rectbb + .4byte prechkVacuum__Q43scn4step5enemy14VacuumReceiverFRCQ33hel3geo4Rect + .4byte reqDeadEnf__Q43scn4step5enemy14VacuumReceiverFv + .4byte reqReleaseEnf__Q43scn4step6vacuum12ReceiverBaseFv + .4byte setConstraintWeapon__Q43scn4step6vacuum12ReceiverBaseFQ24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1UlUl + .4byte chkDrainAbility__Q43scn4step6vacuum12ReceiverBaseFv + .4byte onAttackerEndVacuum__Q43scn4step6vacuum12ReceiverBaseFRQ43scn4step6vacuum8Attacker + .4byte isMighty__Q43scn4step6vacuum12ReceiverBaseFv + .4byte mightyFrame__Q43scn4step6vacuum12ReceiverBaseFv + .4byte setMighty__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl + .4byte setCure__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl + .4byte deadWithAttacker__Q43scn4step6vacuum12ReceiverBaseFQ43scn4step4hero10DeadFactorRCQ33hel4math7Vector2 + .4byte isMainPlayer__Q43scn4step6vacuum12ReceiverBaseCFv + .4byte drawDebug__Q43scn4step5enemy14VacuumReceiverFv + .4byte handle__Q43scn4step6vacuum12ReceiverBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference18StateVacuumReceive$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference18StateVacuumReceive$$4PQ43scn4step4hero4Hero$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference18StateVacuumReceive$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv - .byte4 create__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference18StateVacuumReceive$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte __dt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference18StateVacuumReceive$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte create__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference18StateVacuumReceive$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q24util155StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference12StateVomited$$4PQ43scn4step4hero4Hero$$4Q24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1$$4Ul$$4Ul$$1 __vt__Q24util155StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference12StateVomited$$4PQ43scn4step4hero4Hero$$4Q24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1$$4Ul$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util155StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference12StateVomited$$4PQ43scn4step4hero4Hero$$4Q24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1$$4Ul$$4Ul$$1Fv - .byte4 create__Q24util155StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference12StateVomited$$4PQ43scn4step4hero4Hero$$4Q24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1$$4Ul$$4Ul$$1Fv + .4byte __dt__Q24util155StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference12StateVomited$$4PQ43scn4step4hero4Hero$$4Q24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1$$4Ul$$4Ul$$1Fv + .4byte create__Q24util155StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference12StateVomited$$4PQ43scn4step4hero4Hero$$4Q24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1$$4Ul$$4Ul$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference10StateEaten$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference10StateEaten$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference10StateEaten$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference10StateEaten$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference10StateEaten$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference10StateEaten$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q43scn4step4hero14VacuumReceiver __vt__Q43scn4step4hero14VacuumReceiver: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4hero14VacuumReceiverFv - .byte4 chkVacuum__Q43scn4step4hero14VacuumReceiverFRQ43scn4step6vacuum8AttackerRCQ33hel3geo4Rectbb - .byte4 prechkVacuum__Q43scn4step4hero14VacuumReceiverFRCQ33hel3geo4Rect - .byte4 reqDeadEnf__Q43scn4step4hero14VacuumReceiverFv - .byte4 reqReleaseEnf__Q43scn4step4hero14VacuumReceiverFv - .byte4 setConstraintWeapon__Q43scn4step4hero14VacuumReceiverFQ24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1UlUl - .byte4 chkDrainAbility__Q43scn4step4hero14VacuumReceiverFv - .byte4 onAttackerEndVacuum__Q43scn4step6vacuum12ReceiverBaseFRQ43scn4step6vacuum8Attacker - .byte4 isMighty__Q43scn4step4hero14VacuumReceiverFv - .byte4 mightyFrame__Q43scn4step4hero14VacuumReceiverFv - .byte4 setMighty__Q43scn4step4hero14VacuumReceiverFRCQ43scn4step6vacuum8AttackerUl - .byte4 setCure__Q43scn4step4hero14VacuumReceiverFRCQ43scn4step6vacuum8AttackerUl - .byte4 deadWithAttacker__Q43scn4step4hero14VacuumReceiverFQ43scn4step4hero10DeadFactorRCQ33hel4math7Vector2 - .byte4 isMainPlayer__Q43scn4step4hero14VacuumReceiverCFv - .byte4 drawDebug__Q43scn4step4hero14VacuumReceiverFv - .byte4 handle__Q43scn4step6vacuum12ReceiverBaseFv + .4byte __dt__Q43scn4step4hero14VacuumReceiverFv + .4byte chkVacuum__Q43scn4step4hero14VacuumReceiverFRQ43scn4step6vacuum8AttackerRCQ33hel3geo4Rectbb + .4byte prechkVacuum__Q43scn4step4hero14VacuumReceiverFRCQ33hel3geo4Rect + .4byte reqDeadEnf__Q43scn4step4hero14VacuumReceiverFv + .4byte reqReleaseEnf__Q43scn4step4hero14VacuumReceiverFv + .4byte setConstraintWeapon__Q43scn4step4hero14VacuumReceiverFQ24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1UlUl + .4byte chkDrainAbility__Q43scn4step4hero14VacuumReceiverFv + .4byte onAttackerEndVacuum__Q43scn4step6vacuum12ReceiverBaseFRQ43scn4step6vacuum8Attacker + .4byte isMighty__Q43scn4step4hero14VacuumReceiverFv + .4byte mightyFrame__Q43scn4step4hero14VacuumReceiverFv + .4byte setMighty__Q43scn4step4hero14VacuumReceiverFRCQ43scn4step6vacuum8AttackerUl + .4byte setCure__Q43scn4step4hero14VacuumReceiverFRCQ43scn4step6vacuum8AttackerUl + .4byte deadWithAttacker__Q43scn4step4hero14VacuumReceiverFQ43scn4step4hero10DeadFactorRCQ33hel4math7Vector2 + .4byte isMainPlayer__Q43scn4step4hero14VacuumReceiverCFv + .4byte drawDebug__Q43scn4step4hero14VacuumReceiverFv + .4byte handle__Q43scn4step6vacuum12ReceiverBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18StateVacuumReceive$$4PQ43scn4step4item4Item$$4Ul$$1 __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18StateVacuumReceive$$4PQ43scn4step4item4Item$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18StateVacuumReceive$$4PQ43scn4step4item4Item$$4Ul$$1Fv - .byte4 create__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18StateVacuumReceive$$4PQ43scn4step4item4Item$$4Ul$$1Fv + .4byte __dt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18StateVacuumReceive$$4PQ43scn4step4item4Item$$4Ul$$1Fv + .4byte create__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18StateVacuumReceive$$4PQ43scn4step4item4Item$$4Ul$$1Fv .global __vt__Q43scn4step4item14VacuumReceiver __vt__Q43scn4step4item14VacuumReceiver: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step4item14VacuumReceiverFv - .byte4 chkVacuum__Q43scn4step4item14VacuumReceiverFRQ43scn4step6vacuum8AttackerRCQ33hel3geo4Rectbb - .byte4 prechkVacuum__Q43scn4step4item14VacuumReceiverFRCQ33hel3geo4Rect - .byte4 reqDeadEnf__Q43scn4step4item14VacuumReceiverFv - .byte4 reqReleaseEnf__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 setConstraintWeapon__Q43scn4step6vacuum12ReceiverBaseFQ24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1UlUl - .byte4 chkDrainAbility__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 onAttackerEndVacuum__Q43scn4step6vacuum12ReceiverBaseFRQ43scn4step6vacuum8Attacker - .byte4 isMighty__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 mightyFrame__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 setMighty__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl - .byte4 setCure__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl - .byte4 deadWithAttacker__Q43scn4step6vacuum12ReceiverBaseFQ43scn4step4hero10DeadFactorRCQ33hel4math7Vector2 - .byte4 isMainPlayer__Q43scn4step6vacuum12ReceiverBaseCFv - .byte4 drawDebug__Q43scn4step4item14VacuumReceiverFv - .byte4 handle__Q43scn4step6vacuum12ReceiverBaseFv + .4byte __dt__Q43scn4step4item14VacuumReceiverFv + .4byte chkVacuum__Q43scn4step4item14VacuumReceiverFRQ43scn4step6vacuum8AttackerRCQ33hel3geo4Rectbb + .4byte prechkVacuum__Q43scn4step4item14VacuumReceiverFRCQ33hel3geo4Rect + .4byte reqDeadEnf__Q43scn4step4item14VacuumReceiverFv + .4byte reqReleaseEnf__Q43scn4step6vacuum12ReceiverBaseFv + .4byte setConstraintWeapon__Q43scn4step6vacuum12ReceiverBaseFQ24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1UlUl + .4byte chkDrainAbility__Q43scn4step6vacuum12ReceiverBaseFv + .4byte onAttackerEndVacuum__Q43scn4step6vacuum12ReceiverBaseFRQ43scn4step6vacuum8Attacker + .4byte isMighty__Q43scn4step6vacuum12ReceiverBaseFv + .4byte mightyFrame__Q43scn4step6vacuum12ReceiverBaseFv + .4byte setMighty__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl + .4byte setCure__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl + .4byte deadWithAttacker__Q43scn4step6vacuum12ReceiverBaseFQ43scn4step4hero10DeadFactorRCQ33hel4math7Vector2 + .4byte isMainPlayer__Q43scn4step6vacuum12ReceiverBaseCFv + .4byte drawDebug__Q43scn4step4item14VacuumReceiverFv + .4byte handle__Q43scn4step6vacuum12ReceiverBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock18StateVacuumReceive$$4PQ43scn4step6weapon6Weapon$$4Ul$$1 __vt__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock18StateVacuumReceive$$4PQ43scn4step6weapon6Weapon$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock18StateVacuumReceive$$4PQ43scn4step6weapon6Weapon$$4Ul$$1Fv - .byte4 create__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock18StateVacuumReceive$$4PQ43scn4step6weapon6Weapon$$4Ul$$1Fv + .4byte __dt__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock18StateVacuumReceive$$4PQ43scn4step6weapon6Weapon$$4Ul$$1Fv + .4byte create__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock18StateVacuumReceive$$4PQ43scn4step6weapon6Weapon$$4Ul$$1Fv .global __vt__Q53scn4step6weapon13vacuumedblock14VacuumReceiver __vt__Q53scn4step6weapon13vacuumedblock14VacuumReceiver: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step6weapon13vacuumedblock14VacuumReceiverFv - .byte4 chkVacuum__Q53scn4step6weapon13vacuumedblock14VacuumReceiverFRQ43scn4step6vacuum8AttackerRCQ33hel3geo4Rectbb - .byte4 prechkVacuum__Q53scn4step6weapon13vacuumedblock14VacuumReceiverFRCQ33hel3geo4Rect - .byte4 reqDeadEnf__Q53scn4step6weapon13vacuumedblock14VacuumReceiverFv - .byte4 reqReleaseEnf__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 setConstraintWeapon__Q43scn4step6vacuum12ReceiverBaseFQ24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1UlUl - .byte4 chkDrainAbility__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 onAttackerEndVacuum__Q43scn4step6vacuum12ReceiverBaseFRQ43scn4step6vacuum8Attacker - .byte4 isMighty__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 mightyFrame__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 setMighty__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl - .byte4 setCure__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl - .byte4 deadWithAttacker__Q43scn4step6vacuum12ReceiverBaseFQ43scn4step4hero10DeadFactorRCQ33hel4math7Vector2 - .byte4 isMainPlayer__Q43scn4step6vacuum12ReceiverBaseCFv - .byte4 drawDebug__Q43scn4step6vacuum12ReceiverBaseFv - .byte4 handle__Q43scn4step6vacuum12ReceiverBaseFv + .4byte __dt__Q53scn4step6weapon13vacuumedblock14VacuumReceiverFv + .4byte chkVacuum__Q53scn4step6weapon13vacuumedblock14VacuumReceiverFRQ43scn4step6vacuum8AttackerRCQ33hel3geo4Rectbb + .4byte prechkVacuum__Q53scn4step6weapon13vacuumedblock14VacuumReceiverFRCQ33hel3geo4Rect + .4byte reqDeadEnf__Q53scn4step6weapon13vacuumedblock14VacuumReceiverFv + .4byte reqReleaseEnf__Q43scn4step6vacuum12ReceiverBaseFv + .4byte setConstraintWeapon__Q43scn4step6vacuum12ReceiverBaseFQ24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1UlUl + .4byte chkDrainAbility__Q43scn4step6vacuum12ReceiverBaseFv + .4byte onAttackerEndVacuum__Q43scn4step6vacuum12ReceiverBaseFRQ43scn4step6vacuum8Attacker + .4byte isMighty__Q43scn4step6vacuum12ReceiverBaseFv + .4byte mightyFrame__Q43scn4step6vacuum12ReceiverBaseFv + .4byte setMighty__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl + .4byte setCure__Q43scn4step6vacuum12ReceiverBaseFRCQ43scn4step6vacuum8AttackerUl + .4byte deadWithAttacker__Q43scn4step6vacuum12ReceiverBaseFQ43scn4step4hero10DeadFactorRCQ33hel4math7Vector2 + .4byte isMainPlayer__Q43scn4step6vacuum12ReceiverBaseCFv + .4byte drawDebug__Q43scn4step6vacuum12ReceiverBaseFv + .4byte handle__Q43scn4step6vacuum12ReceiverBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256314 diff --git a/asm/src/VariationDemo.s b/asm/src/VariationDemo.s index 590ccd4b..0a375a1b 100644 --- a/asm/src/VariationDemo.s +++ b/asm/src/VariationDemo.s @@ -754,7 +754,7 @@ __sinit_$$3VariationDemo_cpp: /* 8030422C 0030006C 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3VariationDemo_cpp + .4byte __sinit_$$3VariationDemo_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$254361 @@ -818,7 +818,7 @@ datTbl__Q53scn4step7gimmick10cameralock27$$2unnamed$$2VariationDemo_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .byte4 datDemoLock_Hakobune__Q53scn4step7gimmick10cameralock27$$2unnamed$$2VariationDemo_cpp$$2 + .4byte datDemoLock_Hakobune__Q53scn4step7gimmick10cameralock27$$2unnamed$$2VariationDemo_cpp$$2 .global datSizeTbl__Q53scn4step7gimmick10cameralock27$$2unnamed$$2VariationDemo_cpp$$2 datSizeTbl__Q53scn4step7gimmick10cameralock27$$2unnamed$$2VariationDemo_cpp$$2: .4byte 0 @@ -861,11 +861,11 @@ $$255233: __vt__Q53scn4step7gimmick10cameralock13VariationDemo: .4byte 0 .4byte 0 - .byte4 updateReady__Q53scn4step7gimmick10cameralock13VariationDemoFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLock__Q53scn4step7gimmick10cameralock13VariationDemoFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock13VariationDemoFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock13VariationDemoFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 setIsPose__Q53scn4step7gimmick10cameralock13VariationDemoFb + .4byte updateReady__Q53scn4step7gimmick10cameralock13VariationDemoFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLock__Q53scn4step7gimmick10cameralock13VariationDemoFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateReadyNonStop__Q53scn4step7gimmick10cameralock13VariationDemoFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLockNonStop__Q53scn4step7gimmick10cameralock13VariationDemoFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte setIsPose__Q53scn4step7gimmick10cameralock13VariationDemoFb .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/VariationDownside.s b/asm/src/VariationDownside.s index 5f4ab6b6..c24010c5 100644 --- a/asm/src/VariationDownside.s +++ b/asm/src/VariationDownside.s @@ -77,11 +77,11 @@ setIsPose__Q53scn4step7gimmick10cameralock17VariationDownsideFb: __vt__Q53scn4step7gimmick10cameralock17VariationDownside: .4byte 0 .4byte 0 - .byte4 updateReady__Q53scn4step7gimmick10cameralock17VariationDownsideFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLock__Q53scn4step7gimmick10cameralock17VariationDownsideFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock17VariationDownsideFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock17VariationDownsideFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 setIsPose__Q53scn4step7gimmick10cameralock17VariationDownsideFb + .4byte updateReady__Q53scn4step7gimmick10cameralock17VariationDownsideFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLock__Q53scn4step7gimmick10cameralock17VariationDownsideFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateReadyNonStop__Q53scn4step7gimmick10cameralock17VariationDownsideFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLockNonStop__Q53scn4step7gimmick10cameralock17VariationDownsideFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte setIsPose__Q53scn4step7gimmick10cameralock17VariationDownsideFb .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/VariationLoose.s b/asm/src/VariationLoose.s index 54676859..4dd124b4 100644 --- a/asm/src/VariationLoose.s +++ b/asm/src/VariationLoose.s @@ -670,11 +670,11 @@ T_SPACEJUMP_FRAME__Q53scn4step7gimmick10cameralock28$$2unnamed$$2VariationLoose_ __vt__Q53scn4step7gimmick10cameralock14VariationLoose: .4byte 0 .4byte 0 - .byte4 updateReady__Q53scn4step7gimmick10cameralock14VariationLooseFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLock__Q53scn4step7gimmick10cameralock14VariationLooseFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock14VariationLooseFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock14VariationLooseFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 setIsPose__Q53scn4step7gimmick10cameralock14VariationLooseFb + .4byte updateReady__Q53scn4step7gimmick10cameralock14VariationLooseFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLock__Q53scn4step7gimmick10cameralock14VariationLooseFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateReadyNonStop__Q53scn4step7gimmick10cameralock14VariationLooseFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLockNonStop__Q53scn4step7gimmick10cameralock14VariationLooseFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte setIsPose__Q53scn4step7gimmick10cameralock14VariationLooseFb .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/VariationMove.s b/asm/src/VariationMove.s index 6721cdb2..1db6e6e0 100644 --- a/asm/src/VariationMove.s +++ b/asm/src/VariationMove.s @@ -59,9 +59,9 @@ setIsPose__Q53scn4step7gimmick10cameralock13VariationMoveFb: __vt__Q53scn4step7gimmick10cameralock13VariationMove: .4byte 0 .4byte 0 - .byte4 updateReady__Q53scn4step7gimmick10cameralock13VariationMoveFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLock__Q53scn4step7gimmick10cameralock13VariationMoveFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock13VariationMoveFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock13VariationMoveFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 setIsPose__Q53scn4step7gimmick10cameralock13VariationMoveFb + .4byte updateReady__Q53scn4step7gimmick10cameralock13VariationMoveFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLock__Q53scn4step7gimmick10cameralock13VariationMoveFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateReadyNonStop__Q53scn4step7gimmick10cameralock13VariationMoveFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLockNonStop__Q53scn4step7gimmick10cameralock13VariationMoveFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte setIsPose__Q53scn4step7gimmick10cameralock13VariationMoveFb .4byte 0 diff --git a/asm/src/VariationNpc.s b/asm/src/VariationNpc.s index 92234688..1a94fcdf 100644 --- a/asm/src/VariationNpc.s +++ b/asm/src/VariationNpc.s @@ -1482,117 +1482,117 @@ objCollRect__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7maho $$258009: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActWait__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActWait__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258010 $$258010: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActWait2__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActWait2__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258011 $$258011: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActWait3__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActWait3__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258012 $$258012: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActWait5__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActWait5__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258013 $$258013: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActWait6__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActWait6__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258014 $$258014: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActWait7__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActWait7__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258015 $$258015: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActWait8__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActWait8__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258016 $$258016: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActWait9__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActWait9__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258017 $$258017: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActWait10__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActWait10__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258018 $$258018: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActWait11__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActWait11__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258019 $$258019: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActTurnFront__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActTurnFront__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258020 $$258020: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActTurnBack__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActTurnBack__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258021 $$258021: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActTalk__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActTalk__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258022 $$258022: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActTalkGlad__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActTalkGlad__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258023 $$258023: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActTalkRegret__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActTalkRegret__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258024 $$258024: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActTalkPointing__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActTalkPointing__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258025 $$258025: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActTalkChuckle__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActTalkChuckle__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258026 $$258026: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActTalkGo__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActTalkGo__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258027 $$258027: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActGlad__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActGlad__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258028 $$258028: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActChase__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActChase__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258029 $$258029: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActAvert__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActAvert__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258030 $$258030: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActTurnMainPlayer__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActTurnMainPlayer__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258031 $$258031: .4byte 0 .4byte 0xFFFFFFFF - .byte4 ActWaitMainPlayerMove__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte ActWaitMainPlayerMove__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258043 $$258043: .4byte 0x8031488C @@ -1622,11 +1622,11 @@ $$258043: __vt__Q53scn4step7gimmick7mahoroa12VariationNpc: .4byte 0 .4byte 0 - .byte4 registerToRoot__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa - .byte4 updateFrame__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa - .byte4 updateUseGPU__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa - .byte4 objCollRect__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa - .byte4 reqAct__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7MahoroaQ53scn4step7gimmick7mahoroa7ActKind + .4byte registerToRoot__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte updateFrame__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte updateUseGPU__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte objCollRect__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .4byte reqAct__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7MahoroaQ53scn4step7gimmick7mahoroa7ActKind .global __vt__Q53scn4step7gimmick7mahoroa10IVariation __vt__Q53scn4step7gimmick7mahoroa10IVariation: .4byte 0 diff --git a/asm/src/VariationPerm.s b/asm/src/VariationPerm.s index 80ed1ec2..7eb6909a 100644 --- a/asm/src/VariationPerm.s +++ b/asm/src/VariationPerm.s @@ -103,11 +103,11 @@ setIsPose__Q53scn4step7gimmick10cameralock13VariationPermFb: __vt__Q53scn4step7gimmick10cameralock13VariationPerm: .4byte 0 .4byte 0 - .byte4 updateReady__Q53scn4step7gimmick10cameralock13VariationPermFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLock__Q53scn4step7gimmick10cameralock13VariationPermFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock13VariationPermFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock13VariationPermFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 setIsPose__Q53scn4step7gimmick10cameralock13VariationPermFb + .4byte updateReady__Q53scn4step7gimmick10cameralock13VariationPermFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLock__Q53scn4step7gimmick10cameralock13VariationPermFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateReadyNonStop__Q53scn4step7gimmick10cameralock13VariationPermFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLockNonStop__Q53scn4step7gimmick10cameralock13VariationPermFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte setIsPose__Q53scn4step7gimmick10cameralock13VariationPermFb .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/VariationShooting.s b/asm/src/VariationShooting.s index c23f521c..a033e74b 100644 --- a/asm/src/VariationShooting.s +++ b/asm/src/VariationShooting.s @@ -170,11 +170,11 @@ setIsPose__Q53scn4step7gimmick10cameralock17VariationShootingFb: __vt__Q53scn4step7gimmick10cameralock17VariationShooting: .4byte 0 .4byte 0 - .byte4 updateReady__Q53scn4step7gimmick10cameralock17VariationShootingFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLock__Q53scn4step7gimmick10cameralock17VariationShootingFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock17VariationShootingFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock17VariationShootingFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 setIsPose__Q53scn4step7gimmick10cameralock17VariationShootingFb + .4byte updateReady__Q53scn4step7gimmick10cameralock17VariationShootingFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLock__Q53scn4step7gimmick10cameralock17VariationShootingFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateReadyNonStop__Q53scn4step7gimmick10cameralock17VariationShootingFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLockNonStop__Q53scn4step7gimmick10cameralock17VariationShootingFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte setIsPose__Q53scn4step7gimmick10cameralock17VariationShootingFb .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/VariationSphere.s b/asm/src/VariationSphere.s index f04ed83b..ea1b6f83 100644 --- a/asm/src/VariationSphere.s +++ b/asm/src/VariationSphere.s @@ -308,11 +308,11 @@ setIsPose__Q53scn4step7gimmick10cameralock15VariationSphereFb: __vt__Q53scn4step7gimmick10cameralock15VariationSphere: .4byte 0 .4byte 0 - .byte4 updateReady__Q53scn4step7gimmick10cameralock15VariationSphereFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLock__Q53scn4step7gimmick10cameralock15VariationSphereFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock15VariationSphereFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock15VariationSphereFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 setIsPose__Q53scn4step7gimmick10cameralock15VariationSphereFb + .4byte updateReady__Q53scn4step7gimmick10cameralock15VariationSphereFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLock__Q53scn4step7gimmick10cameralock15VariationSphereFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateReadyNonStop__Q53scn4step7gimmick10cameralock15VariationSphereFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLockNonStop__Q53scn4step7gimmick10cameralock15VariationSphereFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte setIsPose__Q53scn4step7gimmick10cameralock15VariationSphereFb .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/VariationStill.s b/asm/src/VariationStill.s index ba32388f..6bd28817 100644 --- a/asm/src/VariationStill.s +++ b/asm/src/VariationStill.s @@ -174,11 +174,11 @@ setIsPose__Q53scn4step7gimmick10cameralock14VariationStillFb: __vt__Q53scn4step7gimmick10cameralock14VariationStill: .4byte 0 .4byte 0 - .byte4 updateReady__Q53scn4step7gimmick10cameralock14VariationStillFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLock__Q53scn4step7gimmick10cameralock14VariationStillFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock14VariationStillFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock14VariationStillFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 setIsPose__Q53scn4step7gimmick10cameralock14VariationStillFb + .4byte updateReady__Q53scn4step7gimmick10cameralock14VariationStillFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLock__Q53scn4step7gimmick10cameralock14VariationStillFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateReadyNonStop__Q53scn4step7gimmick10cameralock14VariationStillFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLockNonStop__Q53scn4step7gimmick10cameralock14VariationStillFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte setIsPose__Q53scn4step7gimmick10cameralock14VariationStillFb .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/VariationUpside.s b/asm/src/VariationUpside.s index 258241fd..42e09ad0 100644 --- a/asm/src/VariationUpside.s +++ b/asm/src/VariationUpside.s @@ -75,11 +75,11 @@ setIsPose__Q53scn4step7gimmick10cameralock15VariationUpsideFb: __vt__Q53scn4step7gimmick10cameralock15VariationUpside: .4byte 0 .4byte 0 - .byte4 updateReady__Q53scn4step7gimmick10cameralock15VariationUpsideFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLock__Q53scn4step7gimmick10cameralock15VariationUpsideFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock15VariationUpsideFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock15VariationUpsideFRQ53scn4step7gimmick10cameralock10CameraLock - .byte4 setIsPose__Q53scn4step7gimmick10cameralock15VariationUpsideFb + .4byte updateReady__Q53scn4step7gimmick10cameralock15VariationUpsideFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLock__Q53scn4step7gimmick10cameralock15VariationUpsideFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateReadyNonStop__Q53scn4step7gimmick10cameralock15VariationUpsideFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte updateLockNonStop__Q53scn4step7gimmick10cameralock15VariationUpsideFRQ53scn4step7gimmick10cameralock10CameraLock + .4byte setIsPose__Q53scn4step7gimmick10cameralock15VariationUpsideFb .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/Vector2.s b/asm/src/Vector2.s index f01e065a..bed2ca50 100644 --- a/asm/src/Vector2.s +++ b/asm/src/Vector2.s @@ -444,7 +444,7 @@ __sinit_$$3Vector2_cpp: /* 8019F508 0019B348 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3Vector2_cpp + .4byte __sinit_$$3Vector2_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250690 diff --git a/asm/src/Vector3.s b/asm/src/Vector3.s index a1160887..90650d41 100644 --- a/asm/src/Vector3.s +++ b/asm/src/Vector3.s @@ -611,7 +611,7 @@ __sinit_$$3Vector3_cpp: /* 8019FD48 0019BB88 4E 80 00 20 */ blr .section .ctors, "wa" # 0x80406260 - 0x80406540 - .byte4 __sinit_$$3Vector3_cpp + .4byte __sinit_$$3Vector3_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251176 diff --git a/asm/src/Water.s b/asm/src/Water.s index 79144b83..7fbd04fc 100644 --- a/asm/src/Water.s +++ b/asm/src/Water.s @@ -1626,14 +1626,14 @@ CHECK_DEEP_OFFS_ARRAY__19$$2unnamed$$2Water_cpp$$2: __vt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv - .byte4 create__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte __dt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .4byte create__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateWaterFloat$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateWaterFloat$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateWaterFloat$$4PQ43scn4step4hero4Hero$$1Fv - .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateWaterFloat$$4PQ43scn4step4hero4Hero$$1Fv + .4byte __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateWaterFloat$$4PQ43scn4step4hero4Hero$$1Fv + .4byte create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateWaterFloat$$4PQ43scn4step4hero4Hero$$1Fv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253564 diff --git a/asm/src/WaterCallback.s b/asm/src/WaterCallback.s index e00d9368..6265a101 100644 --- a/asm/src/WaterCallback.s +++ b/asm/src/WaterCallback.s @@ -64,7 +64,7 @@ lbl_80290B04: __vt__Q43scn4step5enemy13WaterCallback: .4byte 0 .4byte 0 - .byte4 __dt__Q43scn4step5enemy13WaterCallbackFv - .byte4 onInWater__Q43scn4step5enemy13WaterCallbackFv - .byte4 onOutWater__Q43scn4step5enemy13WaterCallbackFv + .4byte __dt__Q43scn4step5enemy13WaterCallbackFv + .4byte onInWater__Q43scn4step5enemy13WaterCallbackFv + .4byte onOutWater__Q43scn4step5enemy13WaterCallbackFv .4byte 0 diff --git a/asm/src/WaveHandle.s b/asm/src/WaveHandle.s index a0d2bb11..0daadd34 100644 --- a/asm/src/WaveHandle.s +++ b/asm/src/WaveHandle.s @@ -408,12 +408,12 @@ setParam__Q23snd10WaveHandleFUlUlQ34nw4r3snd12SampleFormat: __vt__Q23snd10WaveHandle: .4byte 0 .4byte 0 - .byte4 __dt__Q23snd10WaveHandleFv + .4byte __dt__Q23snd10WaveHandleFv .global __vt__Q33snd10WaveHandle10WavePacket __vt__Q33snd10WaveHandle10WavePacket: .4byte 0 .4byte 0 - .byte4 __dt__Q33snd10WaveHandle10WavePacketFv + .4byte __dt__Q33snd10WaveHandle10WavePacketFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249104 diff --git a/asm/src/Weapon.s b/asm/src/Weapon.s index 23f70b42..3fa1f8db 100644 --- a/asm/src/Weapon.s +++ b/asm/src/Weapon.s @@ -2204,13 +2204,13 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q43scn4step6weapon11StateNorm __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q43scn4step6weapon11StateNormal$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q43scn4step6weapon11StateNormal$$4PQ43scn4step6weapon6Weapon$$1Fv - .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q43scn4step6weapon11StateNormal$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q43scn4step6weapon11StateNormal$$4PQ43scn4step6weapon6Weapon$$1Fv + .4byte create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q43scn4step6weapon11StateNormal$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util43StateChanger$$0Q43scn4step6weapon6IState$$4256$$1 __vt__Q24util43StateChanger$$0Q43scn4step6weapon6IState$$4256$$1: .4byte 0 .4byte 0 - .byte4 __dt__Q24util43StateChanger$$0Q43scn4step6weapon6IState$$4256$$1Fv + .4byte __dt__Q24util43StateChanger$$0Q43scn4step6weapon6IState$$4256$$1Fv .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: .asciz "NW4R:Pointer must not be NULL (p)" diff --git a/asm/src/Whip.s b/asm/src/Whip.s index 4bd0bdb1..7c198554 100644 --- a/asm/src/Whip.s +++ b/asm/src/Whip.s @@ -442,41 +442,41 @@ lbl_8038CCC0: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2WhipAnim__Q53scn4step4hero9modeldesc4WhipFv$$2entries$$21 $$2LOCAL$$2WhipAnim__Q53scn4step4hero9modeldesc4WhipFv$$2entries$$21: - .byte4 $$248751 + .4byte $$248751 .4byte 0 - .byte4 $$248752 + .4byte $$248752 .4byte 0 - .byte4 $$248753 + .4byte $$248753 .4byte 0 - .byte4 $$248754 + .4byte $$248754 .4byte 0 - .byte4 $$248755 + .4byte $$248755 .4byte 0 - .byte4 $$248756 + .4byte $$248756 .4byte 0 - .byte4 $$248757 + .4byte $$248757 .4byte 0 - .byte4 $$248758 + .4byte $$248758 .4byte 0 - .byte4 $$248759 + .4byte $$248759 .4byte 0 - .byte4 $$248760 + .4byte $$248760 .4byte 0 - .byte4 $$248761 + .4byte $$248761 .4byte 0 - .byte4 $$248762 + .4byte $$248762 .4byte 0 - .byte4 $$248763 + .4byte $$248763 .4byte 0 - .byte4 $$248764 + .4byte $$248764 .4byte 0 - .byte4 $$248765 + .4byte $$248765 .4byte 0 - .byte4 $$248766 + .4byte $$248766 .4byte 0 - .byte4 $$248767 + .4byte $$248767 .4byte 0 - .byte4 $$248768 + .4byte $$248768 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -513,16 +513,16 @@ $$248744: .4byte 0 .global $$2LOCAL$$2WhipModel__Q53scn4step4hero9modeldesc4WhipFv$$2names$$21 $$2LOCAL$$2WhipModel__Q53scn4step4hero9modeldesc4WhipFv$$2names$$21: - .byte4 $$248735 - .byte4 $$248736 - .byte4 $$248737 - .byte4 $$248738 - .byte4 $$248739 - .byte4 $$248740 - .byte4 $$248741 - .byte4 $$248742 - .byte4 $$248743 - .byte4 $$248744 + .4byte $$248735 + .4byte $$248736 + .4byte $$248737 + .4byte $$248738 + .4byte $$248739 + .4byte $$248740 + .4byte $$248741 + .4byte $$248742 + .4byte $$248743 + .4byte $$248744 .global $$248752 $$248752: .asciz "WhipCatchStart" @@ -586,27 +586,27 @@ $$256580: __vt__Q53scn4step4hero4whip4Whip: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4whip4WhipFv - .byte4 setup__Q53scn4step4hero4whip4WhipFv - .byte4 tryToChangeStateOnCarry__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeStateOnInterval__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeStateOnDamage__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeState__Q53scn4step4hero4whip4WhipFv - .byte4 onStateEndCleanUp__Q53scn4step4hero4whip4WhipFv - .byte4 onGetEventItem__Q43scn4step4hero11AbilityBaseFv - .byte4 onGimmickReactChangeState__Q43scn4step4hero11AbilityBaseFv - .byte4 onStartClearDanceExternal__Q43scn4step4hero11AbilityBaseFv - .byte4 onEnterWarpLowper__Q43scn4step4hero11AbilityBaseFv - .byte4 onShowHero__Q43scn4step4hero11AbilityBaseFv - .byte4 onHideHero__Q43scn4step4hero11AbilityBaseFv - .byte4 onDead__Q43scn4step4hero11AbilityBaseFv - .byte4 onCaptured__Q43scn4step4hero11AbilityBaseFv - .byte4 onVacuumed__Q43scn4step4hero11AbilityBaseFv - .byte4 onStartDemo__Q43scn4step4hero11AbilityBaseFv - .byte4 procAnim__Q53scn4step4hero4whip4WhipFv - .byte4 procMove__Q43scn4step4hero11AbilityBaseFv - .byte4 procObjCollReact__Q43scn4step4hero11AbilityBaseFv - .byte4 isDepleted__Q43scn4step4hero11AbilityBaseCFv + .4byte __dt__Q53scn4step4hero4whip4WhipFv + .4byte setup__Q53scn4step4hero4whip4WhipFv + .4byte tryToChangeStateOnCarry__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeStateOnInterval__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeStateOnDamage__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeState__Q53scn4step4hero4whip4WhipFv + .4byte onStateEndCleanUp__Q53scn4step4hero4whip4WhipFv + .4byte onGetEventItem__Q43scn4step4hero11AbilityBaseFv + .4byte onGimmickReactChangeState__Q43scn4step4hero11AbilityBaseFv + .4byte onStartClearDanceExternal__Q43scn4step4hero11AbilityBaseFv + .4byte onEnterWarpLowper__Q43scn4step4hero11AbilityBaseFv + .4byte onShowHero__Q43scn4step4hero11AbilityBaseFv + .4byte onHideHero__Q43scn4step4hero11AbilityBaseFv + .4byte onDead__Q43scn4step4hero11AbilityBaseFv + .4byte onCaptured__Q43scn4step4hero11AbilityBaseFv + .4byte onVacuumed__Q43scn4step4hero11AbilityBaseFv + .4byte onStartDemo__Q43scn4step4hero11AbilityBaseFv + .4byte procAnim__Q53scn4step4hero4whip4WhipFv + .4byte procMove__Q43scn4step4hero11AbilityBaseFv + .4byte procObjCollReact__Q43scn4step4hero11AbilityBaseFv + .4byte isDepleted__Q43scn4step4hero11AbilityBaseCFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248735 diff --git a/asm/src/Wing.s b/asm/src/Wing.s index 01db1b56..ec27cd13 100644 --- a/asm/src/Wing.s +++ b/asm/src/Wing.s @@ -444,55 +444,55 @@ lbl_8039B290: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2HatAnim__Q53scn4step4hero9modeldesc4WingFv$$2entries$$21 $$2LOCAL$$2HatAnim__Q53scn4step4hero9modeldesc4WingFv$$2entries$$21: - .byte4 $$249539 + .4byte $$249539 .4byte 0 - .byte4 $$249540 + .4byte $$249540 .4byte 0 - .byte4 $$249541 + .4byte $$249541 .4byte 0 - .byte4 $$249542 + .4byte $$249542 .4byte 0 - .byte4 $$249543 + .4byte $$249543 .4byte 0 - .byte4 $$249544 + .4byte $$249544 .4byte 0 - .byte4 $$249545 + .4byte $$249545 .4byte 0 - .byte4 $$249546 + .4byte $$249546 .4byte 0 - .byte4 $$249547 + .4byte $$249547 .4byte 0 - .byte4 $$249548 + .4byte $$249548 .4byte 0 - .byte4 $$249549 + .4byte $$249549 .4byte 0 - .byte4 $$249550 + .4byte $$249550 .4byte 0 - .byte4 $$249551 + .4byte $$249551 .4byte 0 - .byte4 $$249552 + .4byte $$249552 .4byte 0 - .byte4 $$249553 + .4byte $$249553 .4byte 0 - .byte4 $$249554 + .4byte $$249554 .4byte 0 - .byte4 $$249555 + .4byte $$249555 .4byte 0 - .byte4 $$249556 + .4byte $$249556 .4byte 0 - .byte4 $$249557 + .4byte $$249557 .4byte 0 - .byte4 $$249558 + .4byte $$249558 .4byte 0 - .byte4 $$249559 + .4byte $$249559 .4byte 0 - .byte4 $$249560 + .4byte $$249560 .4byte 0 - .byte4 $$249561 + .4byte $$249561 .4byte 0 - .byte4 $$249562 + .4byte $$249562 .4byte 0 - .byte4 $$249563 + .4byte $$249563 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -614,27 +614,27 @@ $$256290: __vt__Q53scn4step4hero4wing4Wing: .4byte 0 .4byte 0 - .byte4 __dt__Q53scn4step4hero4wing4WingFv - .byte4 setup__Q53scn4step4hero4wing4WingFv - .byte4 tryToChangeStateOnCarry__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeStateOnInterval__Q53scn4step4hero4wing4WingFv - .byte4 tryToChangeStateOnDamage__Q43scn4step4hero11AbilityBaseFv - .byte4 tryToChangeState__Q53scn4step4hero4wing4WingFv - .byte4 onStateEndCleanUp__Q43scn4step4hero11AbilityBaseFv - .byte4 onGetEventItem__Q43scn4step4hero11AbilityBaseFv - .byte4 onGimmickReactChangeState__Q43scn4step4hero11AbilityBaseFv - .byte4 onStartClearDanceExternal__Q43scn4step4hero11AbilityBaseFv - .byte4 onEnterWarpLowper__Q43scn4step4hero11AbilityBaseFv - .byte4 onShowHero__Q43scn4step4hero11AbilityBaseFv - .byte4 onHideHero__Q43scn4step4hero11AbilityBaseFv - .byte4 onDead__Q43scn4step4hero11AbilityBaseFv - .byte4 onCaptured__Q43scn4step4hero11AbilityBaseFv - .byte4 onVacuumed__Q43scn4step4hero11AbilityBaseFv - .byte4 onStartDemo__Q43scn4step4hero11AbilityBaseFv - .byte4 procAnim__Q43scn4step4hero11AbilityBaseFv - .byte4 procMove__Q43scn4step4hero11AbilityBaseFv - .byte4 procObjCollReact__Q43scn4step4hero11AbilityBaseFv - .byte4 isDepleted__Q43scn4step4hero11AbilityBaseCFv + .4byte __dt__Q53scn4step4hero4wing4WingFv + .4byte setup__Q53scn4step4hero4wing4WingFv + .4byte tryToChangeStateOnCarry__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeStateOnInterval__Q53scn4step4hero4wing4WingFv + .4byte tryToChangeStateOnDamage__Q43scn4step4hero11AbilityBaseFv + .4byte tryToChangeState__Q53scn4step4hero4wing4WingFv + .4byte onStateEndCleanUp__Q43scn4step4hero11AbilityBaseFv + .4byte onGetEventItem__Q43scn4step4hero11AbilityBaseFv + .4byte onGimmickReactChangeState__Q43scn4step4hero11AbilityBaseFv + .4byte onStartClearDanceExternal__Q43scn4step4hero11AbilityBaseFv + .4byte onEnterWarpLowper__Q43scn4step4hero11AbilityBaseFv + .4byte onShowHero__Q43scn4step4hero11AbilityBaseFv + .4byte onHideHero__Q43scn4step4hero11AbilityBaseFv + .4byte onDead__Q43scn4step4hero11AbilityBaseFv + .4byte onCaptured__Q43scn4step4hero11AbilityBaseFv + .4byte onVacuumed__Q43scn4step4hero11AbilityBaseFv + .4byte onStartDemo__Q43scn4step4hero11AbilityBaseFv + .4byte procAnim__Q43scn4step4hero11AbilityBaseFv + .4byte procMove__Q43scn4step4hero11AbilityBaseFv + .4byte procObjCollReact__Q43scn4step4hero11AbilityBaseFv + .4byte isDepleted__Q43scn4step4hero11AbilityBaseCFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249532 @@ -643,7 +643,7 @@ $$249532: .balign 4 .global $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc4WingFv$$2names$$21 $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc4WingFv$$2names$$21: - .byte4 $$249532 + .4byte $$249532 .global $$249870 $$249870: .asciz "LBDJ" diff --git a/asm/src/Wipe.s b/asm/src/Wipe.s index 7b04581f..b3c5fb27 100644 --- a/asm/src/Wipe.s +++ b/asm/src/Wipe.s @@ -461,9 +461,9 @@ $$251704: .balign 4 .global T_WIPE_FILE_PATH_TABLE__Q43scn4step3sfx18$$2unnamed$$2Wipe_cpp$$2 T_WIPE_FILE_PATH_TABLE__Q43scn4step3sfx18$$2unnamed$$2Wipe_cpp$$2: - .byte4 $$251702 - .byte4 $$251703 - .byte4 $$251704 + .4byte $$251702 + .4byte $$251703 + .4byte $$251704 .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/ZoomQuake.s b/asm/src/ZoomQuake.s index 2a7e785e..40427222 100644 --- a/asm/src/ZoomQuake.s +++ b/asm/src/ZoomQuake.s @@ -137,13 +137,13 @@ $$251541: .asciz "BossPowerfulAttackCharge.Exec()" .global T_QUAKE_NAME_TABLE__Q43scn4step6camera23$$2unnamed$$2ZoomQuake_cpp$$2 T_QUAKE_NAME_TABLE__Q43scn4step6camera23$$2unnamed$$2ZoomQuake_cpp$$2: - .byte4 $$251535 - .byte4 $$251536 - .byte4 $$251537 - .byte4 $$251538 - .byte4 $$251539 - .byte4 $$251540 - .byte4 $$251541 + .4byte $$251535 + .4byte $$251536 + .4byte $$251537 + .4byte $$251538 + .4byte $$251539 + .4byte $$251540 + .4byte $$251541 .global $$251699 $$251699: .asciz "Scn.Step.Camera.ZoomQuake.%s" diff --git a/asm/vi/vi.s b/asm/vi/vi.s index 1d0a906c..a21512bc 100644 --- a/asm/vi/vi.s +++ b/asm/vi/vi.s @@ -3126,7 +3126,7 @@ GXPal524ProgAa: .4byte 0 .global ShutdownFunctionInfo ShutdownFunctionInfo: - .byte4 OnShutdown + .4byte OnShutdown .4byte 0x0000007F .4byte 0 .4byte 0 @@ -3243,7 +3243,7 @@ $$24441: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __VIVersion __VIVersion: - .byte4 $$21 + .4byte $$21 .global $$2LOCAL$$2OnShutdown__FiUl$$2first $$2LOCAL$$2OnShutdown__FiUl$$2first: .4byte 0x00000001 diff --git a/asm/wpad/WPAD.s b/asm/wpad/WPAD.s index ba9a65e3..a8614a8b 100644 --- a/asm/wpad/WPAD.s +++ b/asm/wpad/WPAD.s @@ -12118,7 +12118,7 @@ $$21504: .balign 4 .global ShutdownFunctionInfo ShutdownFunctionInfo: - .byte4 OnShutdown + .4byte OnShutdown .4byte 0x0000007F .4byte 0 .4byte 0 @@ -12233,7 +12233,7 @@ $$29559: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __WPADVersion __WPADVersion: - .byte4 $$21504 + .4byte $$21504 .global _wpadOnReconnect _wpadOnReconnect: .4byte 0xFFFFFFFF diff --git a/asm/wpad/WPADHIDParser.s b/asm/wpad/WPADHIDParser.s index 6323250e..bd85d862 100644 --- a/asm/wpad/WPADHIDParser.s +++ b/asm/wpad/WPADHIDParser.s @@ -5715,38 +5715,38 @@ _cExtInvalidData2: .section .data, "wa" # 0x80421040 - 0x80496700 .global __a1_input_reports_array __a1_input_reports_array: - .byte4 __a1_20_status_report - .byte4 __a1_21_user_data - .byte4 __a1_22_ack - .byte4 __a1_unused_report - .byte4 __a1_unused_report - .byte4 __a1_unused_report - .byte4 __a1_unused_report - .byte4 __a1_unused_report - .byte4 __a1_unused_report - .byte4 __a1_unused_report - .byte4 __a1_unused_report - .byte4 __a1_unused_report - .byte4 __a1_unused_report - .byte4 __a1_unused_report - .byte4 __a1_unused_report - .byte4 __a1_unused_report - .byte4 __a1_30_data_type - .byte4 __a1_31_data_type - .byte4 __a1_32_data_type - .byte4 __a1_33_data_type - .byte4 __a1_34_data_type - .byte4 __a1_35_data_type - .byte4 __a1_36_data_type - .byte4 __a1_37_data_type - .byte4 __a1_unused_report - .byte4 __a1_unused_report - .byte4 __a1_unused_report - .byte4 __a1_unused_report - .byte4 __a1_unused_report - .byte4 __a1_3d_data_type - .byte4 __a1_3e_data_type - .byte4 __a1_3f_data_type + .4byte __a1_20_status_report + .4byte __a1_21_user_data + .4byte __a1_22_ack + .4byte __a1_unused_report + .4byte __a1_unused_report + .4byte __a1_unused_report + .4byte __a1_unused_report + .4byte __a1_unused_report + .4byte __a1_unused_report + .4byte __a1_unused_report + .4byte __a1_unused_report + .4byte __a1_unused_report + .4byte __a1_unused_report + .4byte __a1_unused_report + .4byte __a1_unused_report + .4byte __a1_unused_report + .4byte __a1_30_data_type + .4byte __a1_31_data_type + .4byte __a1_32_data_type + .4byte __a1_33_data_type + .4byte __a1_34_data_type + .4byte __a1_35_data_type + .4byte __a1_36_data_type + .4byte __a1_37_data_type + .4byte __a1_unused_report + .4byte __a1_unused_report + .4byte __a1_unused_report + .4byte __a1_unused_report + .4byte __a1_unused_report + .4byte __a1_3d_data_type + .4byte __a1_3e_data_type + .4byte __a1_3f_data_type .global $$25371 $$25371: .4byte 0x80060704 ;# ptr