From 7ba9151e570e676bc1562bd7a51634d872145cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Thu, 21 Jul 2022 17:18:17 +0100 Subject: [PATCH] remove raw pointers --- asm/Linker/Generated/Symbol/File.s | 6 +- ...ort\\MSL\\MSL_C++\\MSL_Common\\Src\\ios.s" | 26 +- ...\\MSL\\MSL_C++\\MSL_Common\\Src\\locale.s" | 68 +- ...L\\MSL_C++\\MSL_Common\\Src\\msl_thread.s" | 8 +- ...MSL\\MSL_C\\MSL_Common\\Src\\ansi_files.s" | 30 +- ...rt\\MSL\\MSL_C\\MSL_Common\\Src\\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 +- deptr.py | 52 + 973 files changed, 17990 insertions(+), 17938 deletions(-) create mode 100755 deptr.py diff --git a/asm/Linker/Generated/Symbol/File.s b/asm/Linker/Generated/Symbol/File.s index 049c8664..2e6a42b1 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: - .4byte 0x800068E0 ;# ptr - .4byte 0x800069C4 ;# ptr - .4byte 0x80006BD0 ;# ptr + .byte4 $$2191 + .byte4 _eti_init_info + .byte4 __dt__Q23std9exceptionFv .4byte 0x0000E460 .4byte 0 .4byte 0 diff --git "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\ios.s" "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\ios.s" index be872240..c470412c 100644 --- "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\ios.s" +++ "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\ios.s" @@ -76,14 +76,14 @@ $$210953: .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$210912 $$210912: - .4byte 0x8001488C ;# ptr + .byte4 get_deleter__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1CFRCQ23std9type_info .4byte 0x0000004C - .4byte 0x800067F4 ;# ptr + .byte4 $$210911 .global $$210954 $$210954: - .4byte 0x800148E0 ;# ptr + .byte4 __dt__Q210Metrowerks48move_ptr$$0c$$4RQ33std6detail20default_delete$$0A0_c$$1$$1Fv .4byte 0x00000060 - .4byte 0x800067FC ;# ptr + .byte4 $$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: - .4byte 0x80556450 + .byte4 __RTTI__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1 .4byte 0 - .4byte 0x80014940 ;# ptr - .4byte 0x8001488C ;# ptr - .4byte 0x800148D8 ;# ptr + .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 .global $$29023 $$29023: - .4byte 0x80556458 + .byte4 __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: - .4byte 0x804075B8 - .4byte 0x80421A3C + .byte4 $$29022 + .byte4 $$29023 .global __RTTI__Q43std3tr16detail25shared_ptr_deleter_common __RTTI__Q43std3tr16detail25shared_ptr_deleter_common: - .4byte 0x80407608 + .byte4 $$29050 .4byte 0 .global __RTTI__Q33std6detail20default_delete$$0A0_c$$1 __RTTI__Q33std6detail20default_delete$$0A0_c$$1: - .4byte 0x80407634 + .byte4 $$29165 .4byte 0 diff --git "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\locale.s" "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\locale.s" index 7c14cce1..84ce5dc2 100644 --- "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\locale.s" +++ "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\locale.s" @@ -463,17 +463,17 @@ $$227127: .4byte 0x00000058 .4byte 0 .4byte 0x02000028 - .4byte 0x800148E0 ;# ptr + .byte4 __dt__Q210Metrowerks48move_ptr$$0c$$4RQ33std6detail20default_delete$$0A0_c$$1$$1Fv .4byte 0x8680001D .4byte 0 - .4byte 0x80006BD0 ;# ptr + .byte4 __dt__Q23std9exceptionFv .4byte 0x02000020 - .4byte 0x800148E0 ;# ptr + .byte4 __dt__Q210Metrowerks48move_ptr$$0c$$4RQ33std6detail20default_delete$$0A0_c$$1$$1Fv .4byte 0x8680001E .4byte 0 - .4byte 0x80006BD0 ;# ptr + .byte4 __dt__Q23std9exceptionFv .4byte 0x82000030 - .4byte 0x800149D8 ;# ptr + .byte4 __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: - .4byte 0x80014948 ;# ptr + .byte4 __dt__Q23std11logic_errorFv .4byte 0x00000090 - .4byte 0x80006804 ;# ptr + .byte4 $$225556 .global $$226578 $$226578: - .4byte 0x800149D8 ;# ptr + .byte4 __dt__Q23std59basic_string$$0c$$4Q23std14char_traits$$0c$$1$$4Q23std12allocator$$0c$$1$$1Fv .4byte 0x00000064 - .4byte 0x8000682C ;# ptr + .byte4 $$226577 .global $$227128 $$227128: - .4byte 0x80014A3C ;# ptr + .byte4 do_replace__Q23std59basic_string$$0c$$4Q23std14char_traits$$0c$$1$$4Q23std12allocator$$0c$$1$$1FUlUlPCcPCcQ23std26random_access_iterator_tag .4byte 0x000003F0 - .4byte 0x80006834 ;# ptr + .byte4 $$227127 .global $$227198 $$227198: - .4byte 0x80014E2C ;# ptr + .byte4 __dt__Q23std12length_errorFv .4byte 0x00000094 - .4byte 0x80006894 ;# ptr + .byte4 $$227197 .section .ctors, "wa" # 0x80406260 - 0x80406540 - .4byte 0x80014EC4 ;# ptr + .byte4 __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: - .4byte 0x80556468 + .byte4 __RTTI__Q23std12out_of_range .4byte 0 - .4byte 0x80014EC0 ;# ptr - .4byte 0x80014944 ;# ptr + .byte4 __dt__Q23std12out_of_rangeFv + .byte4 what__Q23std11logic_errorCFv .global $$210380 $$210380: - .4byte 0x80556420 + .byte4 __RTTI__Q23std9exception .4byte 0 - .4byte 0x80556478 + .byte4 __RTTI__Q23std11logic_error .4byte 0 .4byte 0 .4byte 0 .global __vt__Q23std12length_error __vt__Q23std12length_error: - .4byte 0x80556470 + .byte4 __RTTI__Q23std12length_error .4byte 0 - .4byte 0x80014E2C ;# ptr - .4byte 0x80014944 ;# ptr + .byte4 __dt__Q23std12length_errorFv + .byte4 what__Q23std11logic_errorCFv .global $$210382 $$210382: - .4byte 0x80556420 + .byte4 __RTTI__Q23std9exception .4byte 0 - .4byte 0x80556478 + .byte4 __RTTI__Q23std11logic_error .4byte 0 .4byte 0 .4byte 0 .global __vt__Q23std11logic_error __vt__Q23std11logic_error: - .4byte 0x80556478 + .byte4 __RTTI__Q23std11logic_error .4byte 0 - .4byte 0x80014948 ;# ptr - .4byte 0x80014944 ;# ptr + .byte4 __dt__Q23std11logic_errorFv + .byte4 what__Q23std11logic_errorCFv .global $$210388 $$210388: - .4byte 0x80556420 + .byte4 __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: - .4byte 0x80407658 - .4byte 0x80421A58 + .byte4 $$210379 + .byte4 $$210380 .global __RTTI__Q23std12length_error __RTTI__Q23std12length_error: - .4byte 0x8040766C - .4byte 0x80421A80 + .byte4 $$210381 + .byte4 $$210382 .global __RTTI__Q23std11logic_error __RTTI__Q23std11logic_error: - .4byte 0x80407680 - .4byte 0x80421AA8 + .byte4 $$210387 + .byte4 $$210388 .global $$211481 $$211481: .byte 0x00 diff --git "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\msl_thread.s" "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\msl_thread.s" index 3fc9d491..af8b286b 100644 --- "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\msl_thread.s" +++ "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\msl_thread.s" @@ -103,11 +103,11 @@ $$28430: .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$28324 $$28324: - .4byte 0x80014F18 ;# ptr + .byte4 release__Q43std3tr16detail25shared_ptr_deleter_commonFv .4byte 0x00000078 - .4byte 0x800068BC ;# ptr + .byte4 $$28323 .global $$28431 $$28431: - .4byte 0x80014F90 ;# ptr + .byte4 __dt__Q33std3tr114function$$0Fv_v$$1Fv .4byte 0x000000A0 - .4byte 0x800068C4 ;# ptr + .byte4 $$28430 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ansi_files.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ansi_files.s" index 50377b0e..8846f7d9 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ansi_files.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ansi_files.s" @@ -92,17 +92,17 @@ __files: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80496AB8 + .byte4 stdin_buff .4byte 0x00000100 - .4byte 0x80496AB8 + .byte4 stdin_buff .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x800186F8 ;# ptr - .4byte 0x80010454 ;# ptr - .4byte 0x80010524 ;# ptr + .byte4 __read_console + .byte4 __write_console + .byte4 __close_console .4byte 0 .4byte 0x80421148 .4byte 0x00000001 @@ -112,17 +112,17 @@ __files: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804969B8 + .byte4 stdout_buff .4byte 0x00000100 - .4byte 0x804969B8 + .byte4 stdout_buff .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x800186F8 ;# ptr - .4byte 0x80010454 ;# ptr - .4byte 0x80010524 ;# ptr + .byte4 __read_console + .byte4 __write_console + .byte4 __close_console .4byte 0 .4byte 0x80421198 .4byte 0x00000002 @@ -132,17 +132,17 @@ __files: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804968B8 + .byte4 stderr_buff .4byte 0x00000100 - .4byte 0x804968B8 + .byte4 stderr_buff .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x800186F8 ;# ptr - .4byte 0x80010454 ;# ptr - .4byte 0x80010524 ;# ptr + .byte4 __read_console + .byte4 __write_console + .byte4 __close_console .4byte 0 .4byte 0x804211E8 .4byte 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\locale.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\locale.s" index 349fbd54..0590dee1 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\locale.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\locale.s" @@ -24,32 +24,32 @@ $$2147: .section .data, "wa" # 0x80421040 - 0x80496700 .global __lconv __lconv: - .4byte 0x8055DF88 - .4byte 0x8055DF8C - .4byte 0x8055DF8C - .4byte 0x8055DF8C - .4byte 0x8055DF8C - .4byte 0x8055DF8C - .4byte 0x8055DF8C - .4byte 0x8055DF8C - .4byte 0x8055DF8C + .byte4 $$2139 + .byte4 $$2140 + .byte4 $$2140 + .byte4 $$2140 + .byte4 $$2140 + .byte4 $$2140 + .byte4 $$2140 + .byte4 $$2140 + .byte4 $$2140 .4byte 0x7F7F7F7F .4byte 0x7F7F7F00 - .4byte 0x8055DF8C + .byte4 $$2140 .4byte 0x7F7F7F7F .4byte 0x7F7F7F00 .global _loc_ctyp_C _loc_ctyp_C: .4byte 0x43000000 .4byte 0 - .4byte 0x80406768 - .4byte 0x80406A68 - .4byte 0x80406968 - .4byte 0x80406C98 - .4byte 0x80407098 - .4byte 0x80406E98 - .4byte 0x8000AB6C ;# ptr - .4byte 0x8000ABB8 ;# ptr + .byte4 __ctype_mapC + .byte4 __upper_mapC + .byte4 __lower_mapC + .byte4 __wctype_mapC + .byte4 __wupper_mapC + .byte4 __wlower_mapC + .byte4 __mbtowc_noconv + .byte4 __wctomb_noconv .global char_coll_tableC char_coll_tableC: .4byte 0x00010002 @@ -107,43 +107,43 @@ _loc_coll_C: .4byte 0x00000020 .4byte 0x0000006E .4byte 0 - .4byte 0x804213C0 + .byte4 char_coll_tableC .4byte 0 .global _loc_mon_C _loc_mon_C: .4byte 0x43000000 .4byte 0 - .4byte 0x8055DF8C - .4byte 0x8055DF8C - .4byte 0x8055DF8C - .4byte 0x8055DF8C - .4byte 0x8055DF8C - .4byte 0x8055DF8C + .byte4 $$2140 + .byte4 $$2140 + .byte4 $$2140 + .byte4 $$2140 + .byte4 $$2140 + .byte4 $$2140 .4byte 0x7F7F7F7F .4byte 0x7F7F7F00 - .4byte 0x8055DF8C + .byte4 $$2140 .4byte 0x7F7F7F7F .4byte 0x7F7F7F00 .global _loc_num_C _loc_num_C: .4byte 0x43000000 .4byte 0 - .4byte 0x8055DF88 - .4byte 0x8055DF8C - .4byte 0x8055DF8C + .byte4 $$2139 + .byte4 $$2140 + .byte4 $$2140 .4byte 0 .global _loc_tim_C _loc_tim_C: .4byte 0x43000000 .4byte 0 - .4byte 0x8055DF90 - .4byte 0x80406B68 - .4byte 0x80406B78 - .4byte 0x80406B84 - .4byte 0x8055DF98 - .4byte 0x80406B90 - .4byte 0x80406BE8 - .4byte 0x8055DF8C + .byte4 $$2141 + .byte4 $$2142 + .byte4 $$2143 + .byte4 $$2144 + .byte4 $$2145 + .byte4 $$2146 + .byte4 $$2147 + .byte4 $$2140 .global _current_locale _current_locale: .4byte 0 @@ -159,11 +159,11 @@ _current_locale: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80421480 - .4byte 0x80421398 - .4byte 0x8042149C - .4byte 0x804214D0 - .4byte 0x804214E8 + .byte4 _loc_coll_C + .byte4 _loc_ctyp_C + .byte4 _loc_mon_C + .byte4 _loc_num_C + .byte4 _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 8328764c..f3731f07 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: - .4byte 0x80007B78 ;# ptr + .byte4 ExPPC_FindExceptionRecord__FPcP15MWExceptionInfo .4byte 0x000001B0 - .4byte 0x80006788 ;# ptr + .byte4 $$2283 .global $$2368 $$2368: - .4byte 0x80007D28 ;# ptr + .byte4 ExPPC_NextAction__FP14ActionIterator .4byte 0x000001B0 - .4byte 0x80006790 ;# ptr + .byte4 $$2367 .global $$2558 $$2558: - .4byte 0x80007ED8 ;# ptr + .byte4 ExPPC_PopStackFrame__FP12ThrowContextP15MWExceptionInfo .4byte 0x00000554 - .4byte 0x80006798 ;# ptr + .byte4 $$2557 .global $$2862 $$2862: - .4byte 0x8000842C ;# ptr + .byte4 ExPPC_UnwindStack__FP12ThrowContextP15MWExceptionInfoPv .4byte 0x0000050C - .4byte 0x800067A0 ;# ptr + .byte4 $$2861 .global $$2953 $$2953: - .4byte 0x80008938 ;# ptr + .byte4 __unexpected .4byte 0x000001B8 - .4byte 0x800067B4 ;# ptr + .byte4 $$2952 .global $$21131 $$21131: - .4byte 0x80008BF8 ;# ptr + .byte4 ExPPC_ThrowHandler__FP12ThrowContext .4byte 0x00000408 - .4byte 0x800067E0 ;# ptr + .byte4 $$21130 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$21152 @@ -1782,13 +1782,13 @@ $$2860: .4byte 0x80008890 ;# ptr .global __vt__Q23std13bad_exception __vt__Q23std13bad_exception: - .4byte 0x80556438 + .byte4 __RTTI__Q23std13bad_exception .4byte 0 - .4byte 0x80008AF0 ;# ptr - .4byte 0x80009170 ;# ptr + .byte4 __dt__Q23std13bad_exceptionFv + .byte4 what__Q23std13bad_exceptionCFv .global $$21153 $$21153: - .4byte 0x80556420 + .byte4 __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: - .4byte 0x80406598 - .4byte 0x804210D8 + .byte4 $$21152 + .byte4 $$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 9ed1ce2b..0a17d6a9 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 - .4byte 0x80006F68 ;# ptr + .byte4 __dt__26__partial_array_destructorFv .global $$2351 $$2351: .4byte 0x18080000 @@ -441,7 +441,7 @@ $$2383: .4byte 0x00000010 .4byte 0 .4byte 0x82000008 - .4byte 0x80006F68 ;# ptr + .byte4 __dt__26__partial_array_destructorFv .global $$2401 $$2401: .4byte 0x20080000 @@ -450,29 +450,29 @@ $$2401: .section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$2341 $$2341: - .4byte 0x80006E64 ;# ptr + .byte4 __construct_new_array .4byte 0x00000104 - .4byte 0x80006748 ;# ptr + .byte4 $$2340 .global $$2352 $$2352: - .4byte 0x80006F68 ;# ptr + .byte4 __dt__26__partial_array_destructorFv .4byte 0x000000BC - .4byte 0x80006760 ;# ptr + .byte4 $$2351 .global $$2384 $$2384: - .4byte 0x80007024 ;# ptr + .byte4 __construct_array .4byte 0x000000F8 - .4byte 0x80006768 ;# ptr + .byte4 $$2383 .global $$2402 $$2402: - .4byte 0x8000711C ;# ptr + .byte4 __destroy_arr .4byte 0x00000078 - .4byte 0x80006780 ;# ptr + .byte4 $$2401 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global thandler__3std thandler__3std: - .4byte 0x80006C10 ;# ptr + .byte4 dthandler__3stdFv .global uhandler__3std uhandler__3std: - .4byte 0x80006C14 ;# ptr + .byte4 duhandler__3stdFv diff --git a/asm/Runtime.PPCEABI.H/New.s b/asm/Runtime.PPCEABI.H/New.s index e2bbece3..e7de7561 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: - .4byte 0x80006BD0 ;# ptr + .byte4 __dt__Q23std9exceptionFv .4byte 0x00000040 - .4byte 0x80006740 ;# ptr + .byte4 $$2190 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2278 @@ -43,5 +43,5 @@ $$2278: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__Q23std9exception __RTTI__Q23std9exception: - .4byte 0x80406560 + .byte4 $$2278 .4byte 0 diff --git a/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s b/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s index 6a7819a9..3a77bf59 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: - .4byte 0x800079FC ;# ptr + .byte4 __init_cpp_exceptions .section .dtors, "wa" # 0x80406540 - 0x80406560 .global __destroy_global_chain_reference __destroy_global_chain_reference: - .4byte 0x80006B88 ;# ptr + .byte4 __destroy_global_chain .global __fini_cpp_exceptions_reference __fini_cpp_exceptions_reference: - .4byte 0x80007A38 ;# ptr + .byte4 __fini_cpp_exceptions .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global fragmentID diff --git a/asm/ai/ai.s b/asm/ai/ai.s index 3ba47de0..931df6d4 100644 --- a/asm/ai/ai.s +++ b/asm/ai/ai.s @@ -419,7 +419,7 @@ $$21: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __AIVersion __AIVersion: - .4byte 0x80432F40 + .byte4 $$21 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/ax/AX.s b/asm/ax/AX.s index 9c83de41..891e74d2 100644 --- a/asm/ax/AX.s +++ b/asm/ax/AX.s @@ -45,7 +45,7 @@ $$21: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __AXVersion __AXVersion: - .4byte 0x80432F88 + .byte4 $$21 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/axfx/AXFXHooks.s b/asm/axfx/AXFXHooks.s index 899b5afa..2aaa406f 100644 --- a/asm/axfx/AXFXHooks.s +++ b/asm/axfx/AXFXHooks.s @@ -36,7 +36,7 @@ AXFXGetHooks: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __AXFXAlloc __AXFXAlloc: - .4byte 0x80047040 ;# ptr + .byte4 __AXFXAllocFunction .global __AXFXFree __AXFXFree: - .4byte 0x80047050 ;# ptr + .byte4 __AXFXFreeFunction diff --git a/asm/bte/bta_dm_act.s b/asm/bte/bta_dm_act.s index cae6beba..4a0b8877 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: - .4byte 0x80079BCC ;# ptr - .4byte 0x80079D54 ;# ptr - .4byte 0x80079E8C ;# ptr - .4byte 0x80079E84 ;# ptr - .4byte 0x80079F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/bte/bta_dm_api.s b/asm/bte/bta_dm_api.s index 7c86cd39..452dbdb5 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: - .4byte 0x8007AE50 ;# ptr + .byte4 bta_dm_sm_execute .4byte 0 .global bta_dm_search_reg bta_dm_search_reg: - .4byte 0x8007AEE8 ;# ptr + .byte4 bta_dm_search_sm_execute .4byte 0 diff --git a/asm/bte/bta_dm_cfg.s b/asm/bte/bta_dm_cfg.s index d14b2caa..70261b9c 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: - .4byte 0x80407E0C + .byte4 bta_dm_rm_cfg .global p_bta_dm_compress_cfg p_bta_dm_compress_cfg: - .4byte 0x80407E18 + .byte4 bta_dm_compress_cfg .global p_bta_dm_pm_cfg p_bta_dm_pm_cfg: - .4byte 0x805643C0 + .byte4 bta_dm_pm_cfg .global p_bta_dm_pm_spec p_bta_dm_pm_spec: - .4byte 0x80407E2C + .byte4 bta_dm_pm_spec .global p_bta_dm_pm_md p_bta_dm_pm_md: - .4byte 0x80407E78 + .byte4 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 0689ea06..753f279e 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: - .4byte 0x800786C4 ;# ptr - .4byte 0x800787D4 ;# ptr - .4byte 0x80078940 ;# ptr - .4byte 0x80078948 ;# ptr - .4byte 0x80078990 ;# ptr - .4byte 0x80078A00 ;# ptr - .4byte 0x80078A9C ;# ptr - .4byte 0x80079FD4 ;# ptr - .4byte 0x8007A174 ;# ptr - .4byte 0x8007B8A0 ;# ptr - .4byte 0x8007B9C0 ;# ptr - .4byte 0x8007A90C ;# ptr - .4byte 0x8007A994 ;# ptr + .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 .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: - .4byte 0x80078B70 ;# ptr - .4byte 0x80078BD0 ;# ptr - .4byte 0x80078C54 ;# ptr - .4byte 0x80078D68 ;# ptr - .4byte 0x80078F8C ;# ptr - .4byte 0x8007915C ;# ptr - .4byte 0x800793C4 ;# ptr - .4byte 0x80079500 ;# ptr - .4byte 0x800793DC ;# ptr - .4byte 0x8007942C ;# ptr - .4byte 0x80079544 ;# ptr - .4byte 0x8007958C ;# ptr - .4byte 0x800795D4 ;# ptr - .4byte 0x80079618 ;# ptr - .4byte 0x800796B8 ;# ptr - .4byte 0x8007965C ;# ptr - .4byte 0x800790F8 ;# ptr - .4byte 0x80079BC8 ;# ptr + .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 .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: - .4byte 0x80407FF0 - .4byte 0x8040800C - .4byte 0x80408028 - .4byte 0x80408044 + .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 .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 535d8d99..01f676c3 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: - .4byte 0x8007D838 ;# ptr - .4byte 0x8007D19C ;# ptr + .byte4 bta_hh_hdl_event + .byte4 BTA_HhDisable diff --git a/asm/bte/bta_hh_cfg.s b/asm/bte/bta_hh_cfg.s index b2d808bb..6e01cbfe 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 - .4byte 0x805568C8 + .byte4 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: - .4byte 0x80407E90 + .byte4 bta_hh_cfg .4byte 0 diff --git a/asm/bte/bta_hh_main.s b/asm/bte/bta_hh_main.s index 5c64a443..0ab5036e 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: - .4byte 0x8007C118 ;# ptr - .4byte 0x8007C2A8 ;# ptr - .4byte 0x8007C818 ;# ptr - .4byte 0x8007C360 ;# ptr - .4byte 0x8007C620 ;# ptr - .4byte 0x8007C3B8 ;# ptr - .4byte 0x8007BE1C ;# ptr - .4byte 0x8007BFB0 ;# ptr - .4byte 0x8007CCB4 ;# ptr - .4byte 0x8007CA18 ;# ptr - .4byte 0x8007CA34 ;# ptr - .4byte 0x8007C180 ;# ptr + .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 .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: - .4byte 0x804080A0 - .4byte 0x804080B8 - .4byte 0x804080D0 + .byte4 bta_hh_st_idle + .byte4 bta_hh_st_w4_conn + .byte4 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 9aa0a2c1..1bc0dd63 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: - .4byte 0x8055E918 + .byte4 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 00701ec0..3900d35c 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: - .4byte 0x800769E0 ;# ptr - .4byte 0x80076A10 ;# ptr - .4byte 0x80076A80 ;# ptr - .4byte 0x80076AC0 ;# ptr - .4byte 0x80076AF0 ;# ptr + .byte4 hcisu_h2_init + .byte4 hcisu_h2_open + .byte4 hcisu_h2_close + .byte4 hcisu_h2_send + .byte4 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 1abcac11..bfc21ea6 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: - .4byte 0x8008E4CC ;# ptr - .4byte 0x8008EA84 ;# ptr + .byte4 hidh_l2cif_connect_ind + .byte4 hidh_l2cif_connect_cfm .4byte 0 - .4byte 0x8008EDCC ;# ptr - .4byte 0x8008F074 ;# ptr - .4byte 0x8008F380 ;# ptr - .4byte 0x8008F644 ;# ptr + .byte4 hidh_l2cif_config_ind + .byte4 hidh_l2cif_config_cfm + .byte4 hidh_l2cif_disconnect_ind + .byte4 hidh_l2cif_disconnect_cfm .4byte 0 - .4byte 0x8008FA84 ;# ptr - .4byte 0x8008F88C ;# ptr + .byte4 hidh_l2cif_data_ind + .byte4 hidh_l2cif_cong_ind .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21580 diff --git a/asm/dsp/dsp.s b/asm/dsp/dsp.s index ad934377..80b4d27d 100644 --- a/asm/dsp/dsp.s +++ b/asm/dsp/dsp.s @@ -203,7 +203,7 @@ $$22200: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __DSPVersion __DSPVersion: - .4byte 0x804361C0 + .byte4 $$21 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/dvd/dvd.s b/asm/dvd/dvd.s index 7c9520cb..8a9d61b7 100644 --- a/asm/dvd/dvd.s +++ b/asm/dvd/dvd.s @@ -5908,13 +5908,13 @@ $$25139: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __DVDVersion __DVDVersion: - .4byte 0x80431260 + .byte4 $$21 .global autoInvalidation autoInvalidation: .4byte 0x00000001 .global checkOptionalCommand checkOptionalCommand: - .4byte 0x8003A200 ;# ptr + .byte4 defaultOptionalCommandChecker .global $$24254 $$24254: .asciz "dvd.c" diff --git a/asm/dvd/dvdDeviceError.s b/asm/dvd/dvdDeviceError.s index 58e05586..bee0f57c 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: - .4byte 0x80431EA0 - .4byte 0x80431EDC - .4byte 0x80431F14 - .4byte 0x80431F54 - .4byte 0x80431F90 - .4byte 0x80431FCC - .4byte 0x80432008 + .byte4 $$2835 + .byte4 $$2836 + .byte4 $$2837 + .byte4 $$2838 + .byte4 $$2839 + .byte4 $$2840 + .byte4 $$2841 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/dvd/dvdFatal.s b/asm/dvd/dvdFatal.s index bd1859a1..9c31f519 100644 --- a/asm/dvd/dvdFatal.s +++ b/asm/dvd/dvdFatal.s @@ -116,22 +116,22 @@ __DVDPrintFatalMessage: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global __DVDErrorMessageDefault __DVDErrorMessageDefault: - .4byte 0x804316D8 - .4byte 0x80431768 - .4byte 0x80431818 - .4byte 0x804318D0 - .4byte 0x80431980 - .4byte 0x80431A20 - .4byte 0x80431ACC + .byte4 $$21462 + .byte4 $$21463 + .byte4 $$21464 + .byte4 $$21465 + .byte4 $$21466 + .byte4 $$21467 + .byte4 $$21468 .global __DVDErrorMessageEurope __DVDErrorMessageEurope: - .4byte 0x804316D8 - .4byte 0x80431B60 - .4byte 0x80431818 - .4byte 0x80431C04 - .4byte 0x80431CA8 - .4byte 0x80431A20 - .4byte 0x80431ACC + .byte4 $$21462 + .byte4 $$21469 + .byte4 $$21464 + .byte4 $$21470 + .byte4 $$21471 + .byte4 $$21467 + .byte4 $$21468 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$21462 @@ -428,8 +428,8 @@ $$21473: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __DVDErrorMessageChinaKorea __DVDErrorMessageChinaKorea: - .4byte 0x80431D54 - .4byte 0x80431DF8 + .byte4 $$21472 + .byte4 $$21473 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21482 diff --git a/asm/enc/encutility.s b/asm/enc/encutility.s index 94fb1168..b1347016 100644 --- a/asm/enc/encutility.s +++ b/asm/enc/encutility.s @@ -183,7 +183,7 @@ $$2669: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __ENCVersion __ENCVersion: - .4byte 0x80438450 + .byte4 $$2669 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/exi/EXIBios.s b/asm/exi/EXIBios.s index 05ec1bd6..288da28f 100644 --- a/asm/exi/EXIBios.s +++ b/asm/exi/EXIBios.s @@ -1787,7 +1787,7 @@ $$21: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __EXIVersion __EXIVersion: - .4byte 0x8042FB40 + .byte4 $$21 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/gx/GXInit.s b/asm/gx/GXInit.s index 9ffc876c..6b84c77e 100644 --- a/asm/gx/GXInit.s +++ b/asm/gx/GXInit.s @@ -1313,7 +1313,7 @@ GXTexRegionAddrTable: .4byte 0x00070000 .global GXShutdownFuncInfo GXShutdownFuncInfo: - .4byte 0x80031D40 ;# ptr + .byte4 __GXShutdown .4byte 0x0000007F .4byte 0 .4byte 0 @@ -1321,13 +1321,13 @@ GXShutdownFuncInfo: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __GXVersion __GXVersion: - .4byte 0x80430800 + .byte4 $$21 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global __GXData __GXData: - .4byte 0x8049A780 + .byte4 gxData .global $$22712 $$22712: .4byte 0x4B800000 diff --git a/asm/homebuttonLib/HBMAnmController.s b/asm/homebuttonLib/HBMAnmController.s index 61233eec..71a4321e 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: - .4byte 0x80442A20 + .byte4 __RTTI__Q210homebutton18GroupAnmController .4byte 0 - .4byte 0x801287A0 ;# ptr - .4byte 0x80128630 ;# ptr + .byte4 __dt__Q210homebutton18GroupAnmControllerFv + .byte4 calc__Q210homebutton15FrameControllerFv .global $$28022 $$28022: .asciz "homebutton::GroupAnmController" .balign 4 .global $$28023 $$28023: - .4byte 0x804429D8 + .byte4 __RTTI__Q210homebutton15FrameController .4byte 0 .4byte 0 .4byte 0 .global __RTTI__Q210homebutton18GroupAnmController __RTTI__Q210homebutton18GroupAnmController: - .4byte 0x804429F0 - .4byte 0x80442A10 + .byte4 $$28022 + .byte4 $$28023 diff --git a/asm/homebuttonLib/HBMAxSound.s b/asm/homebuttonLib/HBMAxSound.s index 8b5d46ba..59bcda47 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: - .4byte 0x80442CC8 - .4byte 0x80442CE0 - .4byte 0x80442CF8 - .4byte 0x80442D10 - .4byte 0x80442D28 - .4byte 0x80442D3C - .4byte 0x80442D50 - .4byte 0x80442D64 - .4byte 0x80442D80 - .4byte 0x80442DA0 - .4byte 0x80442DB8 - .4byte 0x80442DD4 - .4byte 0x80442DF4 - .4byte 0x80442E14 - .4byte 0x80442E30 - .4byte 0x80442E44 - .4byte 0x80442E5C - .4byte 0x80442E80 - .4byte 0x80442E98 - .4byte 0x80442EB0 - .4byte 0x80442EC8 - .4byte 0x80442EE0 - .4byte 0x80442F00 - .4byte 0x80442F18 - .4byte 0x80442F34 - .4byte 0x80442F50 - .4byte 0x80442F6C - .4byte 0x80442F88 + .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 .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 f33be904..96dc19bf 100644 --- a/asm/homebuttonLib/HBMBase.s +++ b/asm/homebuttonLib/HBMBase.s @@ -10034,30 +10034,30 @@ $$29524: .balign 4 .global scCursorLytName__Q210homebutton10HomeButton scCursorLytName__Q210homebutton10HomeButton: - .4byte 0x80443068 - .4byte 0x80443078 - .4byte 0x80443088 - .4byte 0x80443098 + .byte4 $$29521 + .byte4 $$29522 + .byte4 $$29523 + .byte4 $$29524 .global $$29525 $$29525: .asciz "N_Trans" .global scCursorPaneName__Q210homebutton10HomeButton scCursorPaneName__Q210homebutton10HomeButton: - .4byte 0x804430B8 + .byte4 $$29525 .global $$29526 $$29526: .asciz "N_Rot" .balign 4 .global scCursorRotPaneName__Q210homebutton10HomeButton scCursorRotPaneName__Q210homebutton10HomeButton: - .4byte 0x804430C4 + .byte4 $$29526 .global $$29527 $$29527: .asciz "N_SRot" .balign 4 .global scCursorSRotPaneName__Q210homebutton10HomeButton scCursorSRotPaneName__Q210homebutton10HomeButton: - .4byte 0x804430D0 + .byte4 $$29527 .global $$29528 $$29528: .asciz "B_btnL_00" @@ -10072,9 +10072,9 @@ $$29530: .balign 4 .global scBtnName__Q210homebutton10HomeButton scBtnName__Q210homebutton10HomeButton: - .4byte 0x804430DC - .4byte 0x804430E8 - .4byte 0x804430F4 + .byte4 $$29528 + .byte4 $$29529 + .byte4 $$29530 .4byte 0 .global $$29531 $$29531: @@ -10091,9 +10091,9 @@ $$29533: .4byte 0 .global scTxtName__Q210homebutton10HomeButton scTxtName__Q210homebutton10HomeButton: - .4byte 0x80443110 - .4byte 0x8044311C - .4byte 0x80443128 + .byte4 $$29531 + .byte4 $$29532 + .byte4 $$29533 .4byte 0 .global $$29534 $$29534: @@ -10125,14 +10125,14 @@ $$29541: .asciz "btnL_11_psh" .global scGrName__Q210homebutton10HomeButton scGrName__Q210homebutton10HomeButton: - .4byte 0x80443148 - .4byte 0x80443158 - .4byte 0x80443168 - .4byte 0x80443178 - .4byte 0x80443188 - .4byte 0x80443194 - .4byte 0x804431A0 - .4byte 0x804431AC + .byte4 $$29534 + .byte4 $$29535 + .byte4 $$29536 + .byte4 $$29537 + .byte4 $$29538 + .byte4 $$29539 + .byte4 $$29540 + .byte4 $$29541 .global $$29542 $$29542: .asciz "_cntBtn_in.brlan" @@ -10147,9 +10147,9 @@ $$29544: .balign 4 .global scAnimName__Q210homebutton10HomeButton scAnimName__Q210homebutton10HomeButton: - .4byte 0x804431D8 - .4byte 0x804431EC - .4byte 0x80443200 + .byte4 $$29542 + .byte4 $$29543 + .byte4 $$29544 .global $$29545 $$29545: .asciz "_ltrIcn_on.brlan" @@ -10207,21 +10207,21 @@ $$29559: .asciz "_12btn_on.brlan" .global scPairGroupAnimName__Q210homebutton10HomeButton scPairGroupAnimName__Q210homebutton10HomeButton: - .4byte 0x80443220 - .4byte 0x80443234 - .4byte 0x80443248 - .4byte 0x80443260 - .4byte 0x80443278 - .4byte 0x80443290 - .4byte 0x804432A4 - .4byte 0x804432B8 - .4byte 0x804432CC - .4byte 0x804432E0 - .4byte 0x804432F0 - .4byte 0x80443308 - .4byte 0x8044331C - .4byte 0x80443334 - .4byte 0x80443348 + .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 .global $$29560 $$29560: .asciz "ltrIcn_on" @@ -10282,21 +10282,21 @@ $$29574: .balign 4 .global scPairGroupName__Q210homebutton10HomeButton scPairGroupName__Q210homebutton10HomeButton: - .4byte 0x80443394 - .4byte 0x804433A0 - .4byte 0x804433B0 - .4byte 0x804433C0 - .4byte 0x804433D0 - .4byte 0x804433E0 - .4byte 0x804433EC - .4byte 0x804433FC - .4byte 0x80443408 - .4byte 0x80443414 - .4byte 0x80443420 - .4byte 0x80443430 - .4byte 0x8044343C - .4byte 0x8044344C - .4byte 0x8044345C + .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 .global $$29575 $$29575: .asciz "_hmMenu_strt.brlan" @@ -10382,28 +10382,28 @@ $$29596: .asciz "_btry_red.brlan" .global scGroupAnimName__Q210homebutton10HomeButton scGroupAnimName__Q210homebutton10HomeButton: - .4byte 0x804434A4 - .4byte 0x804434B8 - .4byte 0x804434CC - .4byte 0x804434E0 - .4byte 0x804434F4 - .4byte 0x80443508 - .4byte 0x8044351C - .4byte 0x80443534 - .4byte 0x80443548 - .4byte 0x80443560 - .4byte 0x80443574 - .4byte 0x80443588 - .4byte 0x804435A0 - .4byte 0x804435B8 - .4byte 0x804435D0 - .4byte 0x804435E8 - .4byte 0x80443600 - .4byte 0x80443610 - .4byte 0x80443620 - .4byte 0x80443638 - .4byte 0x8044364C - .4byte 0x80443668 + .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 .global $$29597 $$29597: .asciz "hmMenu_strt" @@ -10538,41 +10538,41 @@ $$29631: .asciz "plyr_03" .global scGroupName__Q210homebutton10HomeButton scGroupName__Q210homebutton10HomeButton: - .4byte 0x804436D0 - .4byte 0x804436DC - .4byte 0x804436E8 - .4byte 0x804436F8 - .4byte 0x80443708 - .4byte 0x80443714 - .4byte 0x80443724 - .4byte 0x80443738 - .4byte 0x8044374C - .4byte 0x80443760 - .4byte 0x80443774 - .4byte 0x80443788 - .4byte 0x80443798 - .4byte 0x804437A8 - .4byte 0x804437B8 - .4byte 0x804437C8 - .4byte 0x804437D8 - .4byte 0x804437F0 - .4byte 0x80443800 - .4byte 0x80443810 - .4byte 0x80443820 - .4byte 0x80443830 - .4byte 0x80443838 - .4byte 0x80443840 - .4byte 0x80443848 - .4byte 0x80443850 - .4byte 0x80443858 - .4byte 0x80443860 - .4byte 0x80443868 - .4byte 0x80443870 - .4byte 0x80443878 - .4byte 0x80443880 - .4byte 0x80443888 - .4byte 0x80443890 - .4byte 0x80443898 + .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 .global $$29632 $$29632: .asciz "let_icn_00" @@ -10595,11 +10595,11 @@ $$29636: .balign 4 .global scFuncPaneName__Q210homebutton10HomeButton scFuncPaneName__Q210homebutton10HomeButton: - .4byte 0x8044392C - .4byte 0x80443938 - .4byte 0x80443944 - .4byte 0x80443950 - .4byte 0x8044395C + .byte4 $$29632 + .byte4 $$29633 + .byte4 $$29634 + .byte4 $$29635 + .byte4 $$29636 .global $$29637 $$29637: .asciz "B_btn_00" @@ -10642,16 +10642,16 @@ $$29646: .balign 4 .global scFuncTouchPaneName__Q210homebutton10HomeButton scFuncTouchPaneName__Q210homebutton10HomeButton: - .4byte 0x8044397C - .4byte 0x80443988 - .4byte 0x80443994 - .4byte 0x804439A4 - .4byte 0x804439B4 - .4byte 0x804439C4 - .4byte 0x804439D4 - .4byte 0x804439E4 - .4byte 0x804439EC - .4byte 0x804439F4 + .byte4 $$29637 + .byte4 $$29638 + .byte4 $$29639 + .byte4 $$29640 + .byte4 $$29641 + .byte4 $$29642 + .byte4 $$29643 + .byte4 $$29644 + .byte4 $$29645 + .byte4 $$29646 .global $$29647 $$29647: .asciz "T_msg_00" @@ -10666,9 +10666,9 @@ $$29649: .balign 4 .global scFuncTextPaneName__Q210homebutton10HomeButton scFuncTextPaneName__Q210homebutton10HomeButton: - .4byte 0x80443A28 - .4byte 0x80443A34 - .4byte 0x80443A40 + .byte4 $$29647 + .byte4 $$29648 + .byte4 $$29649 .global $$29650 $$29650: .asciz "btryPwr_00_0" @@ -10735,22 +10735,22 @@ $$29665: .balign 4 .global scBatteryPaneName__Q210homebutton10HomeButton scBatteryPaneName__Q210homebutton10HomeButton: - .4byte 0x80443A58 - .4byte 0x80443A68 - .4byte 0x80443A78 - .4byte 0x80443A88 - .4byte 0x80443A98 - .4byte 0x80443AA8 - .4byte 0x80443AB8 - .4byte 0x80443AC8 - .4byte 0x80443AD8 - .4byte 0x80443AE8 - .4byte 0x80443AF8 - .4byte 0x80443B08 - .4byte 0x80443B18 - .4byte 0x80443B28 - .4byte 0x80443B38 - .4byte 0x80443B48 + .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 .global $$216076 $$216076: .4byte 0x61726300 @@ -10843,36 +10843,36 @@ $$218596: .4byte 0 .global __vt__Q210homebutton22HomeButtonEventHandler __vt__Q210homebutton22HomeButtonEventHandler: - .4byte 0x80443CF8 + .byte4 __RTTI__Q210homebutton22HomeButtonEventHandler .4byte 0 - .4byte 0x80134A10 ;# ptr - .4byte 0x80129FF0 ;# ptr + .byte4 onEvent__Q210homebutton22HomeButtonEventHandlerFUlUlPv + .byte4 setManager__Q310homebutton3gui12EventHandlerFPQ310homebutton3gui7Manager .global $$211453 $$211453: .asciz "homebutton::HomeButtonEventHandler" .balign 4 .global $$211454 $$211454: - .4byte 0x80443D30 + .byte4 __RTTI__Q310homebutton3gui12EventHandler .4byte 0 .4byte 0 .global __RTTI__Q210homebutton22HomeButtonEventHandler __RTTI__Q210homebutton22HomeButtonEventHandler: - .4byte 0x80443CC8 - .4byte 0x80443CEC + .byte4 $$211453 + .byte4 $$211454 .global __vt__Q310homebutton3gui12EventHandler __vt__Q310homebutton3gui12EventHandler: - .4byte 0x80443D30 + .byte4 __RTTI__Q310homebutton3gui12EventHandler .4byte 0 - .4byte 0x80128C90 ;# ptr - .4byte 0x80129FF0 ;# ptr + .byte4 onEvent__Q310homebutton3gui12EventHandlerFUlUlPv + .byte4 setManager__Q310homebutton3gui12EventHandlerFPQ310homebutton3gui7Manager .global $$211456 $$211456: .asciz "homebutton::gui::EventHandler" .balign 4 .global __RTTI__Q310homebutton3gui12EventHandler __RTTI__Q310homebutton3gui12EventHandler: - .4byte 0x80443D10 + .byte4 $$211456 .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/homebuttonLib/HBMCommon.s b/asm/homebuttonLib/HBMCommon.s index 8c0dc614..eec6414c 100644 --- a/asm/homebuttonLib/HBMCommon.s +++ b/asm/homebuttonLib/HBMCommon.s @@ -287,10 +287,10 @@ $$29367: .balign 4 .global __HBMVersion __HBMVersion: - .4byte 0x80443018 + .byte4 $$29367 .global spAllocator spAllocator: - .4byte 0x805436B0 + .byte4 sAllocator .section .bss, "wa" # 0x80496700 - 0x805643FC .global sAllocator diff --git a/asm/homebuttonLib/HBMFrameController.s b/asm/homebuttonLib/HBMFrameController.s index 4b3cc622..7dfc8866 100644 --- a/asm/homebuttonLib/HBMFrameController.s +++ b/asm/homebuttonLib/HBMFrameController.s @@ -140,5 +140,5 @@ $$22206: .4byte 0 .global __RTTI__Q210homebutton15FrameController __RTTI__Q210homebutton15FrameController: - .4byte 0x804429B8 + .byte4 $$22206 .4byte 0 diff --git a/asm/homebuttonLib/HBMGUIManager.s b/asm/homebuttonLib/HBMGUIManager.s index a1456c66..04a70625 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: - .4byte 0x80442AC8 + .byte4 __RTTI__Q310homebutton3gui13PaneComponent .4byte 0 - .4byte 0x80129F70 ;# ptr - .4byte 0x80128E10 ;# ptr - .4byte 0x80129250 ;# ptr - .4byte 0x80129F60 ;# ptr - .4byte 0x80129BD0 ;# ptr - .4byte 0x801294D0 ;# ptr - .4byte 0x80128CA0 ;# ptr - .4byte 0x80128C50 ;# ptr - .4byte 0x80128CB0 ;# ptr - .4byte 0x80128CC0 ;# ptr - .4byte 0x80128CD0 ;# ptr - .4byte 0x80129FA0 ;# ptr - .4byte 0x80128C60 ;# ptr - .4byte 0x801291B0 ;# ptr - .4byte 0x80129F90 ;# ptr - .4byte 0x80129F80 ;# ptr - .4byte 0x80128A30 ;# ptr - .4byte 0x801291A0 ;# ptr - .4byte 0x80129360 ;# ptr - .4byte 0x80128F10 ;# ptr - .4byte 0x80129E80 ;# ptr - .4byte 0x80129A90 ;# ptr - .4byte 0x801297E0 ;# ptr - .4byte 0x80129FB0 ;# ptr + .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 .global $$29429 $$29429: .asciz "homebutton::gui::PaneComponent" .balign 4 .global $$29430 $$29430: - .4byte 0x80442C90 + .byte4 __RTTI__Q310homebutton3gui9Interface .4byte 0 - .4byte 0x80442C68 + .byte4 __RTTI__Q310homebutton3gui9Component .4byte 0 .4byte 0 .4byte 0 .global __RTTI__Q310homebutton3gui13PaneComponent __RTTI__Q310homebutton3gui13PaneComponent: - .4byte 0x80442A90 - .4byte 0x80442AB0 + .byte4 $$29429 + .byte4 $$29430 .global __vt__Q310homebutton3gui11PaneManager __vt__Q310homebutton3gui11PaneManager: - .4byte 0x80442B68 + .byte4 __RTTI__Q310homebutton3gui11PaneManager .4byte 0 - .4byte 0x80129F70 ;# ptr - .4byte 0x80128DA0 ;# ptr - .4byte 0x801291E0 ;# ptr - .4byte 0x80129F60 ;# ptr - .4byte 0x80129260 ;# ptr - .4byte 0x80129370 ;# ptr - .4byte 0x80128E40 ;# ptr - .4byte 0x80128F20 ;# ptr - .4byte 0x80128FC0 ;# ptr - .4byte 0x8012A000 ;# ptr - .4byte 0x80128FF0 ;# ptr - .4byte 0x80128C70 ;# ptr - .4byte 0x801292E0 ;# ptr - .4byte 0x80129FC0 ;# ptr - .4byte 0x801294F0 ;# ptr - .4byte 0x80129520 ;# ptr - .4byte 0x80129800 ;# ptr - .4byte 0x80129940 ;# ptr - .4byte 0x80129BC0 ;# ptr - .4byte 0x8012A010 ;# ptr - .4byte 0x801299C0 ;# ptr - .4byte 0x80129540 ;# ptr - .4byte 0x80129820 ;# ptr + .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 .global $$29431 $$29431: .asciz "homebutton::gui::PaneManager" .balign 4 .global $$29432 $$29432: - .4byte 0x80442C90 + .byte4 __RTTI__Q310homebutton3gui9Interface .4byte 0 - .4byte 0x80442BD8 + .byte4 __RTTI__Q310homebutton3gui7Manager .4byte 0 .4byte 0 .global __RTTI__Q310homebutton3gui11PaneManager __RTTI__Q310homebutton3gui11PaneManager: - .4byte 0x80442B34 - .4byte 0x80442B54 + .byte4 $$29431 + .byte4 $$29432 .global __vt__Q310homebutton3gui7Manager __vt__Q310homebutton3gui7Manager: - .4byte 0x80442BD8 + .byte4 __RTTI__Q310homebutton3gui7Manager .4byte 0 - .4byte 0x80129F70 ;# ptr - .4byte 0x80128DA0 ;# ptr - .4byte 0x801291E0 ;# ptr - .4byte 0x80129F60 ;# ptr - .4byte 0x80129260 ;# ptr - .4byte 0x80128CE0 ;# ptr - .4byte 0x80128E40 ;# ptr - .4byte 0x80128F20 ;# ptr - .4byte 0x80128FC0 ;# ptr - .4byte 0x8012A000 ;# ptr - .4byte 0x80128FF0 ;# ptr - .4byte 0x80128C70 ;# ptr - .4byte 0x801292E0 ;# ptr - .4byte 0x80129FC0 ;# ptr + .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 .global $$29433 $$29433: .asciz "homebutton::gui::Manager" .balign 4 .global $$29434 $$29434: - .4byte 0x80442C90 + .byte4 __RTTI__Q310homebutton3gui9Interface .4byte 0 .4byte 0 .global __RTTI__Q310homebutton3gui7Manager __RTTI__Q310homebutton3gui7Manager: - .4byte 0x80442BB0 - .4byte 0x80442BCC + .byte4 $$29433 + .byte4 $$29434 .global __vt__Q310homebutton3gui9Component __vt__Q310homebutton3gui9Component: - .4byte 0x80442C68 + .byte4 __RTTI__Q310homebutton3gui9Component .4byte 0 - .4byte 0x80129F70 ;# ptr - .4byte 0x80128E10 ;# ptr - .4byte 0x80129250 ;# ptr - .4byte 0x80129F60 ;# ptr - .4byte 0x801292D0 ;# ptr - .4byte 0x801294E0 ;# ptr - .4byte 0x80128CA0 ;# ptr - .4byte 0x80128C50 ;# ptr - .4byte 0x80128CB0 ;# ptr - .4byte 0x80128CC0 ;# ptr - .4byte 0x80128CD0 ;# ptr - .4byte 0x80129FA0 ;# ptr - .4byte 0x80128C60 ;# ptr - .4byte 0x801291B0 ;# ptr - .4byte 0x80129F90 ;# ptr - .4byte 0x80129F80 ;# ptr - .4byte 0x80128A30 ;# ptr - .4byte 0x801291A0 ;# ptr - .4byte 0x80129360 ;# ptr - .4byte 0x80128F10 ;# ptr - .4byte 0x80128C40 ;# ptr + .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 0 .global $$29435 $$29435: @@ -1965,13 +1965,13 @@ $$29435: .balign 4 .global $$29436 $$29436: - .4byte 0x80442C90 + .byte4 __RTTI__Q310homebutton3gui9Interface .4byte 0 .4byte 0 .global __RTTI__Q310homebutton3gui9Component __RTTI__Q310homebutton3gui9Component: - .4byte 0x80442C40 - .4byte 0x80442C5C + .byte4 $$29435 + .byte4 $$29436 .global $$29437 $$29437: .asciz "homebutton::gui::Interface" @@ -1979,7 +1979,7 @@ $$29437: .4byte 0 .global __RTTI__Q310homebutton3gui9Interface __RTTI__Q310homebutton3gui9Interface: - .4byte 0x80442C70 + .byte4 $$29437 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/homebuttonLib/HBMRemoteSpk.s b/asm/homebuttonLib/HBMRemoteSpk.s index 4dc06900..ad355aad 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: - .4byte 0x80442CC0 + .byte4 __RTTI__Q210homebutton9RemoteSpk .4byte 0 - .4byte 0x8012AFA0 ;# ptr + .byte4 __dt__Q210homebutton9RemoteSpkFv .global $$26598 $$26598: .asciz "homebutton::RemoteSpk" @@ -677,7 +677,7 @@ $$26598: .4byte 0 .global __RTTI__Q210homebutton9RemoteSpk __RTTI__Q210homebutton9RemoteSpk: - .4byte 0x80442CA4 + .byte4 $$26598 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/homebuttonLib/lyt_animation.s b/asm/homebuttonLib/lyt_animation.s index 33cebf50..067398a3 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: - .4byte 0x80443DD0 + .byte4 __RTTI__Q36nw4hbm3lyt18AnimTransformBasic .4byte 0 - .4byte 0x80135010 ;# ptr - .4byte 0x801350A0 ;# ptr - .4byte 0x801351F0 ;# ptr - .4byte 0x801352F0 ;# ptr - .4byte 0x801353B0 ;# ptr - .4byte 0x80135590 ;# ptr + .byte4 __dt__Q36nw4hbm3lyt18AnimTransformBasicFv + .byte4 SetResource__Q36nw4hbm3lyt18AnimTransformBasicFPCQ46nw4hbm3lyt3res14AnimationBlockPQ36nw4hbm3lyt16ResourceAccessor + .byte4 Bind__Q36nw4hbm3lyt18AnimTransformBasicFPQ36nw4hbm3lyt4Paneb + .byte4 Bind__Q36nw4hbm3lyt18AnimTransformBasicFPQ36nw4hbm3lyt8Material + .byte4 Animate__Q36nw4hbm3lyt18AnimTransformBasicFUlPQ36nw4hbm3lyt4Pane + .byte4 Animate__Q36nw4hbm3lyt18AnimTransformBasicFUlPQ36nw4hbm3lyt8Material .global $$28016 $$28016: .asciz "nw4hbm::lyt::AnimTransformBasic" .global $$28017 $$28017: - .4byte 0x80443DF8 + .byte4 __RTTI__Q36nw4hbm3lyt13AnimTransform .4byte 0 .4byte 0 .4byte 0 .global __RTTI__Q36nw4hbm3lyt18AnimTransformBasic __RTTI__Q36nw4hbm3lyt18AnimTransformBasic: - .4byte 0x80443DA0 - .4byte 0x80443DC0 + .byte4 $$28016 + .byte4 $$28017 .global $$28018 $$28018: .asciz "nw4hbm::lyt::AnimTransform" @@ -882,5 +882,5 @@ $$28018: .4byte 0 .global __RTTI__Q36nw4hbm3lyt13AnimTransform __RTTI__Q36nw4hbm3lyt13AnimTransform: - .4byte 0x80443DD8 + .byte4 $$28018 .4byte 0 diff --git a/asm/homebuttonLib/lyt_arcResourceAccessor.s b/asm/homebuttonLib/lyt_arcResourceAccessor.s index 3d3a4d2f..4b042370 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: - .4byte 0x80443E50 + .byte4 __RTTI__Q36nw4hbm3lyt19ArcResourceAccessor .4byte 0 - .4byte 0x8012C9A0 ;# ptr - .4byte 0x80135B00 ;# ptr - .4byte 0x80135B20 ;# ptr + .byte4 __dt__Q36nw4hbm3lyt19ArcResourceAccessorFv + .byte4 GetResource__Q36nw4hbm3lyt19ArcResourceAccessorFUlPCcPUl + .byte4 GetFont__Q36nw4hbm3lyt19ArcResourceAccessorFPCc .global $$23154 $$23154: .asciz "nw4hbm::lyt::ArcResourceAccessor" .balign 4 .global $$23155 $$23155: - .4byte 0x80443E78 + .byte4 __RTTI__Q36nw4hbm3lyt16ResourceAccessor .4byte 0 .4byte 0 .4byte 0 .global __RTTI__Q36nw4hbm3lyt19ArcResourceAccessor __RTTI__Q36nw4hbm3lyt19ArcResourceAccessor: - .4byte 0x80443E1C - .4byte 0x80443E40 + .byte4 $$23154 + .byte4 $$23155 .global $$23156 $$23156: .asciz "nw4hbm::lyt::ResourceAccessor" .balign 4 .global __RTTI__Q36nw4hbm3lyt16ResourceAccessor __RTTI__Q36nw4hbm3lyt16ResourceAccessor: - .4byte 0x80443E58 + .byte4 $$23156 .4byte 0 diff --git a/asm/homebuttonLib/lyt_bounding.s b/asm/homebuttonLib/lyt_bounding.s index d64d1f73..ffa25ef8 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 - .4byte 0x80135C60 ;# ptr + .byte4 __sinit_$$3lyt_bounding_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt8Bounding __vt__Q36nw4hbm3lyt8Bounding: - .4byte 0x80443F10 + .byte4 __RTTI__Q36nw4hbm3lyt8Bounding .4byte 0 - .4byte 0x80135B70 ;# ptr - .4byte 0x80135C50 ;# ptr - .4byte 0x8013B0A0 ;# ptr - .4byte 0x8013B3A0 ;# ptr - .4byte 0x80135BD0 ;# ptr - .4byte 0x8013B580 ;# ptr - .4byte 0x8013B610 ;# ptr - .4byte 0x8013AE90 ;# ptr - .4byte 0x8013AEA0 ;# ptr - .4byte 0x8013AEB0 ;# ptr - .4byte 0x8013AEE0 ;# ptr - .4byte 0x8013AF10 ;# ptr - .4byte 0x8013AF20 ;# ptr - .4byte 0x8013AF30 ;# ptr - .4byte 0x8013AFE0 ;# ptr - .4byte 0x8013B6D0 ;# ptr - .4byte 0x8013B6F0 ;# ptr - .4byte 0x8013B700 ;# ptr - .4byte 0x8013B710 ;# ptr - .4byte 0x8013B7F0 ;# ptr - .4byte 0x8013B870 ;# ptr - .4byte 0x8013BB20 ;# ptr - .4byte 0x8013B930 ;# ptr + .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 .global $$27465 $$27465: .asciz "nw4hbm::lyt::Bounding" .balign 4 .global $$27466 $$27466: - .4byte 0x80443F60 + .byte4 __RTTI__Q46nw4hbm3lyt6detail8PaneBase .4byte 0 - .4byte 0x80443F38 + .byte4 __RTTI__Q36nw4hbm3lyt4Pane .4byte 0 .4byte 0 .global __RTTI__Q36nw4hbm3lyt8Bounding __RTTI__Q36nw4hbm3lyt8Bounding: - .4byte 0x80443EE4 - .4byte 0x80443EFC + .byte4 $$27465 + .byte4 $$27466 .global $$27467 $$27467: .asciz "nw4hbm::lyt::Pane" .balign 4 .global $$27468 $$27468: - .4byte 0x80443F60 + .byte4 __RTTI__Q46nw4hbm3lyt6detail8PaneBase .4byte 0 .4byte 0 .global __RTTI__Q36nw4hbm3lyt4Pane __RTTI__Q36nw4hbm3lyt4Pane: - .4byte 0x80443F18 - .4byte 0x80443F2C + .byte4 $$27467 + .byte4 $$27468 .global $$27469 $$27469: .asciz "nw4hbm::lyt::detail::PaneBase" .balign 4 .global __RTTI__Q46nw4hbm3lyt6detail8PaneBase __RTTI__Q46nw4hbm3lyt6detail8PaneBase: - .4byte 0x80443F40 + .byte4 $$27469 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/homebuttonLib/lyt_drawInfo.s b/asm/homebuttonLib/lyt_drawInfo.s index 38202c86..767fa4d3 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: - .4byte 0x80443F90 + .byte4 __RTTI__Q36nw4hbm3lyt8DrawInfo .4byte 0 - .4byte 0x801368C0 ;# ptr + .byte4 __dt__Q36nw4hbm3lyt8DrawInfoFv .global $$24994 $$24994: .asciz "nw4hbm::lyt::DrawInfo" @@ -64,5 +64,5 @@ $$24994: .4byte 0 .global __RTTI__Q36nw4hbm3lyt8DrawInfo __RTTI__Q36nw4hbm3lyt8DrawInfo: - .4byte 0x80443F74 + .byte4 $$24994 .4byte 0 diff --git a/asm/homebuttonLib/lyt_group.s b/asm/homebuttonLib/lyt_group.s index b4aa6d5e..78d7722e 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: - .4byte 0x80443FB8 + .byte4 __RTTI__Q36nw4hbm3lyt5Group .4byte 0 - .4byte 0x801369E0 ;# ptr + .byte4 __dt__Q36nw4hbm3lyt5GroupFv .global $$27939 $$27939: .asciz "nw4hbm::lyt::Group" .balign 4 .global __RTTI__Q36nw4hbm3lyt5Group __RTTI__Q36nw4hbm3lyt5Group: - .4byte 0x80443FA4 + .byte4 $$27939 .4byte 0 diff --git a/asm/homebuttonLib/lyt_layout.s b/asm/homebuttonLib/lyt_layout.s index 4d9e6026..b6162ece 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: - .4byte 0x80444008 + .byte4 __RTTI__Q36nw4hbm3lyt6Layout .4byte 0 - .4byte 0x80136E00 ;# ptr - .4byte 0x80136F30 ;# ptr - .4byte 0x80137240 ;# ptr - .4byte 0x80137390 ;# ptr - .4byte 0x801373C0 ;# ptr - .4byte 0x801373D0 ;# ptr - .4byte 0x801373F0 ;# ptr - .4byte 0x80137420 ;# ptr - .4byte 0x80137430 ;# ptr - .4byte 0x80137440 ;# ptr - .4byte 0x801374C0 ;# ptr + .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 .global $$28461 $$28461: .asciz "nw4hbm::lyt::Layout" .global __RTTI__Q36nw4hbm3lyt6Layout __RTTI__Q36nw4hbm3lyt6Layout: - .4byte 0x80443FF4 + .byte4 $$28461 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/homebuttonLib/lyt_material.s b/asm/homebuttonLib/lyt_material.s index f544e40d..7a7cb792 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: - .4byte 0x80444090 + .byte4 __RTTI__Q36nw4hbm3lyt8Material .4byte 0 - .4byte 0x80138D40 ;# ptr - .4byte 0x801399D0 ;# ptr - .4byte 0x8013A7F0 ;# ptr - .4byte 0x8013A800 ;# ptr - .4byte 0x8013A880 ;# ptr - .4byte 0x8013A890 ;# ptr - .4byte 0x8013A950 ;# ptr - .4byte 0x8013A960 ;# ptr + .byte4 __dt__Q36nw4hbm3lyt8MaterialFv + .byte4 SetupGX__Q36nw4hbm3lyt8MaterialFbUc + .byte4 BindAnimation__Q36nw4hbm3lyt8MaterialFPQ36nw4hbm3lyt13AnimTransform + .byte4 UnbindAnimation__Q36nw4hbm3lyt8MaterialFPQ36nw4hbm3lyt13AnimTransform + .byte4 UnbindAllAnimation__Q36nw4hbm3lyt8MaterialFv + .byte4 Animate__Q36nw4hbm3lyt8MaterialFv + .byte4 FindAnimationLink__Q36nw4hbm3lyt8MaterialFPQ36nw4hbm3lyt13AnimTransform + .byte4 SetAnimationEnable__Q36nw4hbm3lyt8MaterialFPQ36nw4hbm3lyt13AnimTransformb .global $$28504 $$28504: .asciz "nw4hbm::lyt::Material" .balign 4 .global __RTTI__Q36nw4hbm3lyt8Material __RTTI__Q36nw4hbm3lyt8Material: - .4byte 0x80444078 + .byte4 $$28504 .4byte 0 diff --git a/asm/homebuttonLib/lyt_pane.s b/asm/homebuttonLib/lyt_pane.s index c6c68157..cd0ec5b6 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 - .4byte 0x8013BB30 ;# ptr + .byte4 __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: - .4byte 0x80443F38 + .byte4 __RTTI__Q36nw4hbm3lyt4Pane .4byte 0 - .4byte 0x8013ABA0 ;# ptr - .4byte 0x801297F0 ;# ptr - .4byte 0x8013B0A0 ;# ptr - .4byte 0x8013B3A0 ;# ptr - .4byte 0x8013B430 ;# ptr - .4byte 0x8013B580 ;# ptr - .4byte 0x8013B610 ;# ptr - .4byte 0x8013AE90 ;# ptr - .4byte 0x8013AEA0 ;# ptr - .4byte 0x8013AEB0 ;# ptr - .4byte 0x8013AEE0 ;# ptr - .4byte 0x8013AF10 ;# ptr - .4byte 0x8013AF20 ;# ptr - .4byte 0x8013AF30 ;# ptr - .4byte 0x8013AFE0 ;# ptr - .4byte 0x8013B6D0 ;# ptr - .4byte 0x8013B6F0 ;# ptr - .4byte 0x8013B700 ;# ptr - .4byte 0x8013B710 ;# ptr - .4byte 0x8013B7F0 ;# ptr - .4byte 0x8013B870 ;# ptr - .4byte 0x8013BB20 ;# ptr - .4byte 0x8013B930 ;# ptr + .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 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/homebuttonLib/lyt_picture.s b/asm/homebuttonLib/lyt_picture.s index 8e9dfad8..83d36204 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 - .4byte 0x8013C080 ;# ptr + .byte4 __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: - .4byte 0x80444198 + .byte4 __RTTI__Q36nw4hbm3lyt7Picture .4byte 0 - .4byte 0x8013BC70 ;# ptr - .4byte 0x8013C070 ;# ptr - .4byte 0x8013B0A0 ;# ptr - .4byte 0x8013B3A0 ;# ptr - .4byte 0x8013BF90 ;# ptr - .4byte 0x8013B580 ;# ptr - .4byte 0x8013B610 ;# ptr - .4byte 0x8013BF00 ;# ptr - .4byte 0x8013BF20 ;# ptr - .4byte 0x8013AEB0 ;# ptr - .4byte 0x8013AEE0 ;# ptr - .4byte 0x8013BF50 ;# ptr - .4byte 0x8013BF70 ;# ptr - .4byte 0x8013AF30 ;# ptr - .4byte 0x8013AFE0 ;# ptr - .4byte 0x8013B6D0 ;# ptr - .4byte 0x8013B6F0 ;# ptr - .4byte 0x8013B700 ;# ptr - .4byte 0x8013B710 ;# ptr - .4byte 0x8013B7F0 ;# ptr - .4byte 0x8013B870 ;# ptr - .4byte 0x8013BB20 ;# ptr - .4byte 0x8013B930 ;# ptr - .4byte 0x8013BD40 ;# ptr - .4byte 0x8013BD90 ;# ptr + .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 .global $$27912 $$27912: .asciz "nw4hbm::lyt::Picture" .balign 4 .global $$27913 $$27913: - .4byte 0x80443F60 + .byte4 __RTTI__Q46nw4hbm3lyt6detail8PaneBase .4byte 0 - .4byte 0x80443F38 + .byte4 __RTTI__Q36nw4hbm3lyt4Pane .4byte 0 .4byte 0 .global __RTTI__Q36nw4hbm3lyt7Picture __RTTI__Q36nw4hbm3lyt7Picture: - .4byte 0x8044416C - .4byte 0x80444184 + .byte4 $$27912 + .byte4 $$27913 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q36nw4hbm3lyt7Picture diff --git a/asm/homebuttonLib/lyt_resourceAccessor.s b/asm/homebuttonLib/lyt_resourceAccessor.s index 652aacdd..b5580a9d 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: - .4byte 0x80443E78 + .byte4 __RTTI__Q36nw4hbm3lyt16ResourceAccessor .4byte 0 - .4byte 0x8013C0A0 ;# ptr + .byte4 __dt__Q36nw4hbm3lyt16ResourceAccessorFv .4byte 0 - .4byte 0x8013C0C0 ;# ptr + .byte4 GetFont__Q36nw4hbm3lyt16ResourceAccessorFPCc .4byte 0 diff --git a/asm/homebuttonLib/lyt_textBox.s b/asm/homebuttonLib/lyt_textBox.s index ff0ab9ae..6c2f1678 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 - .4byte 0x8013D4D0 ;# ptr + .byte4 __sinit_$$3lyt_textBox_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29376 @@ -1452,51 +1452,51 @@ $$29987: .4byte 0x000A0000 .global __vt__Q36nw4hbm3lyt7TextBox __vt__Q36nw4hbm3lyt7TextBox: - .4byte 0x80444260 + .byte4 __RTTI__Q36nw4hbm3lyt7TextBox .4byte 0 - .4byte 0x8013C390 ;# ptr - .4byte 0x8013D4C0 ;# ptr - .4byte 0x8013B0A0 ;# ptr - .4byte 0x8013B3A0 ;# ptr - .4byte 0x8013C5C0 ;# ptr - .4byte 0x8013B580 ;# ptr - .4byte 0x8013B610 ;# ptr - .4byte 0x8013C520 ;# ptr - .4byte 0x8013C540 ;# ptr - .4byte 0x8013AEB0 ;# ptr - .4byte 0x8013AEE0 ;# ptr - .4byte 0x8013C580 ;# ptr - .4byte 0x8013C5A0 ;# ptr - .4byte 0x8013AF30 ;# ptr - .4byte 0x8013AFE0 ;# ptr - .4byte 0x8013B6D0 ;# ptr - .4byte 0x8013B6F0 ;# ptr - .4byte 0x8013B700 ;# ptr - .4byte 0x8013B710 ;# ptr - .4byte 0x8013B7F0 ;# ptr - .4byte 0x8013B870 ;# ptr - .4byte 0x8013BB20 ;# ptr - .4byte 0x8013B930 ;# ptr - .4byte 0x8013D130 ;# ptr - .4byte 0x8013D1B0 ;# ptr - .4byte 0x8013D200 ;# ptr - .4byte 0x8013D270 ;# ptr + .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 .global $$28641 $$28641: .asciz "nw4hbm::lyt::TextBox" .balign 4 .global $$28642 $$28642: - .4byte 0x80443F60 + .byte4 __RTTI__Q46nw4hbm3lyt6detail8PaneBase .4byte 0 - .4byte 0x80443F38 + .byte4 __RTTI__Q36nw4hbm3lyt4Pane .4byte 0 .4byte 0 .4byte 0 .global __RTTI__Q36nw4hbm3lyt7TextBox __RTTI__Q36nw4hbm3lyt7TextBox: - .4byte 0x80444230 - .4byte 0x80444248 + .byte4 $$28641 + .byte4 $$28642 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q36nw4hbm3lyt7TextBox diff --git a/asm/homebuttonLib/lyt_window.s b/asm/homebuttonLib/lyt_window.s index 676e22e5..9b6f65b3 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 - .4byte 0x8013FB00 ;# ptr + .byte4 __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: - .4byte 0x80444348 + .byte4 __RTTI__Q36nw4hbm3lyt6Window .4byte 0 - .4byte 0x8013D700 ;# ptr - .4byte 0x8013FAF0 ;# ptr - .4byte 0x8013B0A0 ;# ptr - .4byte 0x8013B3A0 ;# ptr - .4byte 0x8013DB30 ;# ptr - .4byte 0x8013B580 ;# ptr - .4byte 0x8013DD10 ;# ptr - .4byte 0x8013DAA0 ;# ptr - .4byte 0x8013DAC0 ;# ptr - .4byte 0x8013AEB0 ;# ptr - .4byte 0x8013AEE0 ;# ptr - .4byte 0x8013DAF0 ;# ptr - .4byte 0x8013DB10 ;# ptr - .4byte 0x8013AF30 ;# ptr - .4byte 0x8013D850 ;# ptr - .4byte 0x8013B6D0 ;# ptr - .4byte 0x8013B6F0 ;# ptr - .4byte 0x8013B700 ;# ptr - .4byte 0x8013DDA0 ;# ptr - .4byte 0x8013D950 ;# ptr - .4byte 0x8013DA00 ;# ptr - .4byte 0x8013BB20 ;# ptr - .4byte 0x8013B930 ;# ptr - .4byte 0x8013FAE0 ;# ptr - .4byte 0x8013FAB0 ;# ptr - .4byte 0x8013DE30 ;# ptr - .4byte 0x8013DF40 ;# ptr - .4byte 0x8013E570 ;# ptr - .4byte 0x8013ECA0 ;# ptr + .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 .global $$28272 $$28272: .asciz "nw4hbm::lyt::Window" .global $$28273 $$28273: - .4byte 0x80443F60 + .byte4 __RTTI__Q46nw4hbm3lyt6detail8PaneBase .4byte 0 - .4byte 0x80443F38 + .byte4 __RTTI__Q36nw4hbm3lyt4Pane .4byte 0 .4byte 0 .global __RTTI__Q36nw4hbm3lyt6Window __RTTI__Q36nw4hbm3lyt6Window: - .4byte 0x80444320 - .4byte 0x80444334 + .byte4 $$28272 + .byte4 $$28273 .section .bss, "wa" # 0x80496700 - 0x805643FC .global typeInfo__Q36nw4hbm3lyt6Window diff --git a/asm/homebuttonLib/ut_Font.s b/asm/homebuttonLib/ut_Font.s index 21673fe0..d6c0d8d2 100644 --- a/asm/homebuttonLib/ut_Font.s +++ b/asm/homebuttonLib/ut_Font.s @@ -57,19 +57,19 @@ lbl_80141854: $$298: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8013FDD0 ;# ptr + .byte4 ReadNextCharUTF8__Q36nw4hbm2ut14CharStrmReaderFv .global $$299 $$299: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8013FDE0 ;# ptr + .byte4 ReadNextCharUTF16__Q36nw4hbm2ut14CharStrmReaderFv .global $$2100 $$2100: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8013FE00 ;# ptr + .byte4 ReadNextCharSJIS__Q36nw4hbm2ut14CharStrmReaderFv .global $$2101 $$2101: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8013FDF0 ;# ptr + .byte4 ReadNextCharCP1252__Q36nw4hbm2ut14CharStrmReaderFv diff --git a/asm/homebuttonLib/ut_ResFont.s b/asm/homebuttonLib/ut_ResFont.s index 52daa0af..d4a8bd65 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: - .4byte 0x80445518 + .byte4 __RTTI__Q36nw4hbm2ut7ResFont .4byte 0 - .4byte 0x80141910 ;# ptr - .4byte 0x80141B20 ;# ptr - .4byte 0x80141B30 ;# ptr - .4byte 0x80141B40 ;# ptr - .4byte 0x80141B50 ;# ptr - .4byte 0x80141B60 ;# ptr - .4byte 0x80141B70 ;# ptr - .4byte 0x80141B80 ;# ptr - .4byte 0x80141B90 ;# ptr - .4byte 0x80141BA0 ;# ptr - .4byte 0x80141BB0 ;# ptr - .4byte 0x80141BC0 ;# ptr - .4byte 0x80141BD0 ;# ptr - .4byte 0x80141BE0 ;# ptr - .4byte 0x80141BF0 ;# ptr - .4byte 0x80141C90 ;# ptr - .4byte 0x80141CA0 ;# ptr - .4byte 0x80141CB0 ;# ptr - .4byte 0x80141DB0 ;# ptr - .4byte 0x80141E60 ;# ptr + .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 .global $$2355 $$2355: .asciz "nw4hbm::ut::ResFont" .global $$2356 $$2356: - .4byte 0x80445570 + .byte4 __RTTI__Q36nw4hbm2ut4Font .4byte 0 - .4byte 0x80445550 + .byte4 __RTTI__Q46nw4hbm2ut6detail11ResFontBase .4byte 0 .4byte 0 .global __RTTI__Q36nw4hbm2ut7ResFont __RTTI__Q36nw4hbm2ut7ResFont: - .4byte 0x804454F0 - .4byte 0x80445504 + .byte4 $$2355 + .byte4 $$2356 .global $$2357 $$2357: .asciz "nw4hbm::ut::detail::ResFontBase" .global $$2358 $$2358: - .4byte 0x80445570 + .byte4 __RTTI__Q36nw4hbm2ut4Font .4byte 0 .4byte 0 .4byte 0 .global __RTTI__Q46nw4hbm2ut6detail11ResFontBase __RTTI__Q46nw4hbm2ut6detail11ResFontBase: - .4byte 0x80445520 - .4byte 0x80445540 + .byte4 $$2357 + .byte4 $$2358 .global $$2359 $$2359: .asciz "nw4hbm::ut::Font" @@ -203,5 +203,5 @@ $$2359: .4byte 0 .global __RTTI__Q36nw4hbm2ut4Font __RTTI__Q36nw4hbm2ut4Font: - .4byte 0x80445558 + .byte4 $$2359 .4byte 0 diff --git a/asm/homebuttonLib/ut_ResFontBase.s b/asm/homebuttonLib/ut_ResFontBase.s index 3f9e571b..bc51985d 100644 --- a/asm/homebuttonLib/ut_ResFontBase.s +++ b/asm/homebuttonLib/ut_ResFontBase.s @@ -402,37 +402,37 @@ lbl_80141F20: $$2549: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8013FDF0 ;# ptr + .byte4 ReadNextCharCP1252__Q36nw4hbm2ut14CharStrmReaderFv .4byte 0 .global __vt__Q46nw4hbm2ut6detail11ResFontBase __vt__Q46nw4hbm2ut6detail11ResFontBase: - .4byte 0x80445550 + .byte4 __RTTI__Q46nw4hbm2ut6detail11ResFontBase .4byte 0 - .4byte 0x80141B10 ;# ptr - .4byte 0x80141B20 ;# ptr - .4byte 0x80141B30 ;# ptr - .4byte 0x80141B40 ;# ptr - .4byte 0x80141B50 ;# ptr - .4byte 0x80141B60 ;# ptr - .4byte 0x80141B70 ;# ptr - .4byte 0x80141B80 ;# ptr - .4byte 0x80141B90 ;# ptr - .4byte 0x80141BA0 ;# ptr - .4byte 0x80141BB0 ;# ptr - .4byte 0x80141BC0 ;# ptr - .4byte 0x80141BD0 ;# ptr - .4byte 0x80141BE0 ;# ptr - .4byte 0x80141BF0 ;# ptr - .4byte 0x80141C90 ;# ptr - .4byte 0x80141CA0 ;# ptr - .4byte 0x80141CB0 ;# ptr - .4byte 0x80141DB0 ;# ptr - .4byte 0x80141E60 ;# ptr + .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 .global __vt__Q36nw4hbm2ut4Font __vt__Q36nw4hbm2ut4Font: - .4byte 0x80445570 + .byte4 __RTTI__Q36nw4hbm2ut4Font .4byte 0 - .4byte 0x8013D340 ;# ptr + .byte4 __dt__Q36nw4hbm2ut4FontFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/homebuttonLib/ut_TagProcessorBase.s b/asm/homebuttonLib/ut_TagProcessorBase.s index b206db70..7bee04e4 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: - .4byte 0x80445678 + .byte4 __RTTI__Q36nw4hbm2ut19TagProcessorBase$$0w$$1 .4byte 0 - .4byte 0x801424F0 ;# ptr - .4byte 0x80142530 ;# ptr - .4byte 0x80142690 ;# ptr + .byte4 __dt__Q36nw4hbm2ut19TagProcessorBase$$0w$$1Fv + .byte4 Process__Q36nw4hbm2ut19TagProcessorBase$$0w$$1FUsPQ36nw4hbm2ut15PrintContext$$0w$$1 + .byte4 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: - .4byte 0x8044564C + .byte4 $$24426 .4byte 0 .global __vt__Q36nw4hbm2ut19TagProcessorBase$$0c$$1 __vt__Q36nw4hbm2ut19TagProcessorBase$$0c$$1: - .4byte 0x804456B8 + .byte4 __RTTI__Q36nw4hbm2ut19TagProcessorBase$$0c$$1 .4byte 0 - .4byte 0x80141F90 ;# ptr - .4byte 0x80141FD0 ;# ptr - .4byte 0x80142130 ;# ptr + .byte4 __dt__Q36nw4hbm2ut19TagProcessorBase$$0c$$1Fv + .byte4 Process__Q36nw4hbm2ut19TagProcessorBase$$0c$$1FUsPQ36nw4hbm2ut15PrintContext$$0c$$1 + .byte4 CalcRect__Q36nw4hbm2ut19TagProcessorBase$$0c$$1FPQ36nw4hbm2ut4RectUsPQ36nw4hbm2ut15PrintContext$$0c$$1 .global $$24427 $$24427: .asciz "nw4hbm::ut::TagProcessorBase" .balign 4 .global __RTTI__Q36nw4hbm2ut19TagProcessorBase$$0c$$1 __RTTI__Q36nw4hbm2ut19TagProcessorBase$$0c$$1: - .4byte 0x80445694 + .byte4 $$24427 .4byte 0 diff --git a/asm/homebuttonLib/ut_TextWriterBase.s b/asm/homebuttonLib/ut_TextWriterBase.s index d5c13f96..0931f563 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 - .4byte 0x80147E00 ;# ptr + .byte4 __sinit_$$3ut_TextWriterBase_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$27999 diff --git a/asm/kpad/KPAD.s b/asm/kpad/KPAD.s index f6bd8149..6d15fdb4 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: - .4byte 0x80439F00 + .byte4 $$21614 .global idist_org idist_org: .4byte 0x3F800000 diff --git a/asm/libMobiclip/MoApi.s b/asm/libMobiclip/MoApi.s index 752703c5..bc1f2204 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: - .4byte 0x80447B88 + .byte4 $$22662 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/libMobiclip/MoSdkAdpcmDecoder.s b/asm/libMobiclip/MoSdkAdpcmDecoder.s index 7cb2c4bf..5d2640a8 100644 --- a/asm/libMobiclip/MoSdkAdpcmDecoder.s +++ b/asm/libMobiclip/MoSdkAdpcmDecoder.s @@ -241,20 +241,20 @@ $$22535: .balign 4 .global __vt__17MoSdkAdpcmDecoder __vt__17MoSdkAdpcmDecoder: - .4byte 0x80556AC8 + .byte4 __RTTI__17MoSdkAdpcmDecoder .4byte 0 - .4byte 0x80151C40 ;# ptr - .4byte 0x80151BE0 ;# ptr - .4byte 0x80151B70 ;# ptr - .4byte 0x801520C0 ;# ptr - .4byte 0x8014F970 ;# ptr + .byte4 decodeIntoBuffer__17MoSdkAdpcmDecoderFPCUcUlPUsPUl + .byte4 getPcmSizeFromPacket__17MoSdkAdpcmDecoderFUl + .byte4 __dt__17MoSdkAdpcmDecoderFv + .byte4 decode__17MoSdkAudioDecoderFPCUcUl + .byte4 seekPerformed__17MoSdkAudioDecoderFv .global $$22510 $$22510: .asciz "MoSdkAdpcmDecoder" .balign 4 .global $$22511 $$22511: - .4byte 0x80556AD0 + .byte4 __RTTI__17MoSdkAudioDecoder .4byte 0 .4byte 0 .global $$22512 @@ -266,9 +266,9 @@ $$22512: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__17MoSdkAdpcmDecoder __RTTI__17MoSdkAdpcmDecoder: - .4byte 0x804481C0 - .4byte 0x804481D4 + .byte4 $$22510 + .byte4 $$22511 .global __RTTI__17MoSdkAudioDecoder __RTTI__17MoSdkAudioDecoder: - .4byte 0x804481E0 + .byte4 $$22512 .4byte 0 diff --git a/asm/libMobiclip/MoSdkAudioDecoder.s b/asm/libMobiclip/MoSdkAudioDecoder.s index 4b138be8..3718d15c 100644 --- a/asm/libMobiclip/MoSdkAudioDecoder.s +++ b/asm/libMobiclip/MoSdkAudioDecoder.s @@ -280,10 +280,10 @@ $$22550: .balign 4 .global __vt__17MoSdkAudioDecoder __vt__17MoSdkAudioDecoder: - .4byte 0x80556AD0 + .byte4 __RTTI__17MoSdkAudioDecoder .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80152050 ;# ptr - .4byte 0x801520C0 ;# ptr - .4byte 0x8014F970 ;# ptr + .byte4 __dt__17MoSdkAudioDecoderFv + .byte4 decode__17MoSdkAudioDecoderFPCUcUl + .byte4 seekPerformed__17MoSdkAudioDecoderFv diff --git a/asm/libMobiclip/MoSdkFastAudioDecoder.s b/asm/libMobiclip/MoSdkFastAudioDecoder.s index 22f6bda3..d3309b87 100644 --- a/asm/libMobiclip/MoSdkFastAudioDecoder.s +++ b/asm/libMobiclip/MoSdkFastAudioDecoder.s @@ -265,20 +265,20 @@ $$22578: .balign 4 .global __vt__21MoSdkFastAudioDecoder __vt__21MoSdkFastAudioDecoder: - .4byte 0x80556AD8 + .byte4 __RTTI__21MoSdkFastAudioDecoder .4byte 0 - .4byte 0x801525A0 ;# ptr - .4byte 0x80152540 ;# ptr - .4byte 0x801524E0 ;# ptr - .4byte 0x801520C0 ;# ptr - .4byte 0x8014F970 ;# ptr + .byte4 decodeIntoBuffer__21MoSdkFastAudioDecoderFPCUcUlPUsPUl + .byte4 getPcmSizeFromPacket__21MoSdkFastAudioDecoderFUl + .byte4 __dt__21MoSdkFastAudioDecoderFv + .byte4 decode__17MoSdkAudioDecoderFPCUcUl + .byte4 seekPerformed__17MoSdkAudioDecoderFv .global $$22542 $$22542: .asciz "MoSdkFastAudioDecoder" .balign 4 .global $$22543 $$22543: - .4byte 0x80556AD0 + .byte4 __RTTI__17MoSdkAudioDecoder .4byte 0 .4byte 0 .4byte 0 @@ -286,5 +286,5 @@ $$22543: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__21MoSdkFastAudioDecoder __RTTI__21MoSdkFastAudioDecoder: - .4byte 0x804482B0 - .4byte 0x804482C8 + .byte4 $$22542 + .byte4 $$22543 diff --git a/asm/libMobiclip/MoSdkPcmPassthroughDecoder.s b/asm/libMobiclip/MoSdkPcmPassthroughDecoder.s index f92bb7bd..fa54755f 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: - .4byte 0x80556AE8 + .byte4 __RTTI__26MoSdkPcmPassthroughDecoder .4byte 0 - .4byte 0x80153890 ;# ptr - .4byte 0x80153880 ;# ptr - .4byte 0x80153870 ;# ptr - .4byte 0x801520C0 ;# ptr - .4byte 0x8014F970 ;# ptr + .byte4 decodeIntoBuffer__26MoSdkPcmPassthroughDecoderFPCUcUlPUsPUl + .byte4 getPcmSizeFromPacket__26MoSdkPcmPassthroughDecoderFUl + .byte4 __dt__26MoSdkPcmPassthroughDecoderFv + .byte4 decode__17MoSdkAudioDecoderFPCUcUl + .byte4 seekPerformed__17MoSdkAudioDecoderFv .global $$22523 $$22523: .asciz "MoSdkPcmPassthroughDecoder" .balign 4 .global $$22524 $$22524: - .4byte 0x80556AD0 + .byte4 __RTTI__17MoSdkAudioDecoder .4byte 0 .4byte 0 .4byte 0 @@ -129,5 +129,5 @@ $$22524: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__26MoSdkPcmPassthroughDecoder __RTTI__26MoSdkPcmPassthroughDecoder: - .4byte 0x804484CC - .4byte 0x804484E8 + .byte4 $$22523 + .byte4 $$22524 diff --git a/asm/libMobiclip/VX2_DecodeBlock16x16.s b/asm/libMobiclip/VX2_DecodeBlock16x16.s index bd6b5b29..8bed36cc 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: - .4byte 0x80154460 ;# ptr - .4byte 0x801545A0 ;# ptr - .4byte 0x801547C0 ;# ptr - .4byte 0x801549E0 ;# ptr - .4byte 0x80154C00 ;# ptr - .4byte 0x80154E20 ;# ptr - .4byte 0x80162610 ;# ptr - .4byte 0x80161CD0 ;# ptr - .4byte 0x80155040 ;# ptr - .4byte 0x801550D0 ;# ptr + .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 .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 95eab22a..a5380e13 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: - .4byte 0x801551C0 ;# ptr - .4byte 0x801552F0 ;# ptr - .4byte 0x80155510 ;# ptr - .4byte 0x80155730 ;# ptr - .4byte 0x80155950 ;# ptr - .4byte 0x80155B70 ;# ptr + .byte4 VX2CommandSkip116x2__FR14VX2DecoderData + .byte4 VX2CommandBack116x2__FR14VX2DecoderData + .byte4 VX2CommandBack216x2__FR14VX2DecoderData + .byte4 VX2CommandBack316x2__FR14VX2DecoderData + .byte4 VX2CommandBack416x2__FR14VX2DecoderData + .byte4 VX2CommandBack516x2__FR14VX2DecoderData .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80155D90 ;# ptr + .byte4 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 3a29fd3f..e4597bbb 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: - .4byte 0x80155E80 ;# ptr - .4byte 0x80155FB0 ;# ptr - .4byte 0x801561D0 ;# ptr - .4byte 0x801563F0 ;# ptr - .4byte 0x80156610 ;# ptr - .4byte 0x80156830 ;# ptr + .byte4 VX2CommandSkip116x4__FR14VX2DecoderData + .byte4 VX2CommandBack116x4__FR14VX2DecoderData + .byte4 VX2CommandBack216x4__FR14VX2DecoderData + .byte4 VX2CommandBack316x4__FR14VX2DecoderData + .byte4 VX2CommandBack416x4__FR14VX2DecoderData + .byte4 VX2CommandBack516x4__FR14VX2DecoderData .4byte 0 .4byte 0 - .4byte 0x80156A50 ;# ptr - .4byte 0x80156AD0 ;# ptr + .byte4 VX2CommandCutH16x4__FR14VX2DecoderData + .byte4 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 4de154c5..ad51ec80 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: - .4byte 0x80156BC0 ;# ptr - .4byte 0x80156CF0 ;# ptr - .4byte 0x80156F10 ;# ptr - .4byte 0x80157130 ;# ptr - .4byte 0x80157350 ;# ptr - .4byte 0x80157570 ;# ptr + .byte4 VX2CommandSkip116x8__FR14VX2DecoderData + .byte4 VX2CommandBack116x8__FR14VX2DecoderData + .byte4 VX2CommandBack216x8__FR14VX2DecoderData + .byte4 VX2CommandBack316x8__FR14VX2DecoderData + .byte4 VX2CommandBack416x8__FR14VX2DecoderData + .byte4 VX2CommandBack516x8__FR14VX2DecoderData .4byte 0 .4byte 0 - .4byte 0x80157790 ;# ptr - .4byte 0x80157810 ;# ptr + .byte4 VX2CommandCutH16x8__FR14VX2DecoderData + .byte4 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 d126dbb8..7fbd99a9 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: - .4byte 0x80157900 ;# ptr - .4byte 0x80157A30 ;# ptr - .4byte 0x80157C50 ;# ptr - .4byte 0x80157E70 ;# ptr - .4byte 0x80158090 ;# ptr - .4byte 0x801582B0 ;# ptr + .byte4 VX2CommandSkip12x16__FR14VX2DecoderData + .byte4 VX2CommandBack12x16__FR14VX2DecoderData + .byte4 VX2CommandBack22x16__FR14VX2DecoderData + .byte4 VX2CommandBack32x16__FR14VX2DecoderData + .byte4 VX2CommandBack42x16__FR14VX2DecoderData + .byte4 VX2CommandBack52x16__FR14VX2DecoderData .4byte 0 .4byte 0 - .4byte 0x801584D0 ;# ptr + .byte4 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 7bdfd256..aae50ffd 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: - .4byte 0x801585D0 ;# ptr - .4byte 0x80158700 ;# ptr - .4byte 0x80158920 ;# ptr - .4byte 0x80158B40 ;# ptr - .4byte 0x80158D60 ;# ptr - .4byte 0x80158F80 ;# ptr + .byte4 VX2CommandSkip12x2__FR14VX2DecoderData + .byte4 VX2CommandBack12x2__FR14VX2DecoderData + .byte4 VX2CommandBack22x2__FR14VX2DecoderData + .byte4 VX2CommandBack32x2__FR14VX2DecoderData + .byte4 VX2CommandBack42x2__FR14VX2DecoderData + .byte4 VX2CommandBack52x2__FR14VX2DecoderData .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/libMobiclip/VX2_DecodeBlock2x4.s b/asm/libMobiclip/VX2_DecodeBlock2x4.s index 4972d5e3..4c296927 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: - .4byte 0x80159220 ;# ptr - .4byte 0x80159350 ;# ptr - .4byte 0x80159570 ;# ptr - .4byte 0x80159790 ;# ptr - .4byte 0x801599B0 ;# ptr - .4byte 0x80159BD0 ;# ptr + .byte4 VX2CommandSkip12x4__FR14VX2DecoderData + .byte4 VX2CommandBack12x4__FR14VX2DecoderData + .byte4 VX2CommandBack22x4__FR14VX2DecoderData + .byte4 VX2CommandBack32x4__FR14VX2DecoderData + .byte4 VX2CommandBack42x4__FR14VX2DecoderData + .byte4 VX2CommandBack52x4__FR14VX2DecoderData .4byte 0 .4byte 0 - .4byte 0x80159DF0 ;# ptr + .byte4 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 631a0ae0..b7d0bc5f 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: - .4byte 0x80159EF0 ;# ptr - .4byte 0x8015A020 ;# ptr - .4byte 0x8015A240 ;# ptr - .4byte 0x8015A460 ;# ptr - .4byte 0x8015A680 ;# ptr - .4byte 0x8015A8A0 ;# ptr + .byte4 VX2CommandSkip12x8__FR14VX2DecoderData + .byte4 VX2CommandBack12x8__FR14VX2DecoderData + .byte4 VX2CommandBack22x8__FR14VX2DecoderData + .byte4 VX2CommandBack32x8__FR14VX2DecoderData + .byte4 VX2CommandBack42x8__FR14VX2DecoderData + .byte4 VX2CommandBack52x8__FR14VX2DecoderData .4byte 0 .4byte 0 - .4byte 0x8015AAC0 ;# ptr + .byte4 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 e5271c6c..19cc85d1 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: - .4byte 0x8015ABC0 ;# ptr - .4byte 0x8015ACF0 ;# ptr - .4byte 0x8015AF10 ;# ptr - .4byte 0x8015B130 ;# ptr - .4byte 0x8015B350 ;# ptr - .4byte 0x8015B570 ;# ptr + .byte4 VX2CommandSkip14x16__FR14VX2DecoderData + .byte4 VX2CommandBack14x16__FR14VX2DecoderData + .byte4 VX2CommandBack24x16__FR14VX2DecoderData + .byte4 VX2CommandBack34x16__FR14VX2DecoderData + .byte4 VX2CommandBack44x16__FR14VX2DecoderData + .byte4 VX2CommandBack54x16__FR14VX2DecoderData .4byte 0 .4byte 0 - .4byte 0x8015B790 ;# ptr - .4byte 0x8015B810 ;# ptr + .byte4 VX2CommandCutH4x16__FR14VX2DecoderData + .byte4 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 cfd9e585..d84dd76c 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: - .4byte 0x8015B900 ;# ptr - .4byte 0x8015BA30 ;# ptr - .4byte 0x8015BC50 ;# ptr - .4byte 0x8015BE70 ;# ptr - .4byte 0x8015C090 ;# ptr - .4byte 0x8015C2B0 ;# ptr + .byte4 VX2CommandSkip14x2__FR14VX2DecoderData + .byte4 VX2CommandBack14x2__FR14VX2DecoderData + .byte4 VX2CommandBack24x2__FR14VX2DecoderData + .byte4 VX2CommandBack34x2__FR14VX2DecoderData + .byte4 VX2CommandBack44x2__FR14VX2DecoderData + .byte4 VX2CommandBack54x2__FR14VX2DecoderData .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8015C4D0 ;# ptr + .byte4 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 125f44df..a524022c 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: - .4byte 0x8015C5C0 ;# ptr - .4byte 0x8015C6F0 ;# ptr - .4byte 0x8015C910 ;# ptr - .4byte 0x8015CB30 ;# ptr - .4byte 0x8015CD50 ;# ptr - .4byte 0x8015CF70 ;# ptr + .byte4 VX2CommandSkip14x4__FR14VX2DecoderData + .byte4 VX2CommandBack14x4__FR14VX2DecoderData + .byte4 VX2CommandBack24x4__FR14VX2DecoderData + .byte4 VX2CommandBack34x4__FR14VX2DecoderData + .byte4 VX2CommandBack44x4__FR14VX2DecoderData + .byte4 VX2CommandBack54x4__FR14VX2DecoderData .4byte 0 .4byte 0 - .4byte 0x8015D190 ;# ptr - .4byte 0x8015D210 ;# ptr + .byte4 VX2CommandCutH4x4__FR14VX2DecoderData + .byte4 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 63776342..003773b8 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: - .4byte 0x8015D300 ;# ptr - .4byte 0x8015D430 ;# ptr - .4byte 0x8015D650 ;# ptr - .4byte 0x8015D870 ;# ptr - .4byte 0x8015DA90 ;# ptr - .4byte 0x8015DCB0 ;# ptr + .byte4 VX2CommandSkip14x8__FR14VX2DecoderData + .byte4 VX2CommandBack14x8__FR14VX2DecoderData + .byte4 VX2CommandBack24x8__FR14VX2DecoderData + .byte4 VX2CommandBack34x8__FR14VX2DecoderData + .byte4 VX2CommandBack44x8__FR14VX2DecoderData + .byte4 VX2CommandBack54x8__FR14VX2DecoderData .4byte 0 .4byte 0 - .4byte 0x8015DED0 ;# ptr - .4byte 0x8015DF50 ;# ptr + .byte4 VX2CommandCutH4x8__FR14VX2DecoderData + .byte4 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 7d3b3b20..be468cac 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: - .4byte 0x8015E040 ;# ptr - .4byte 0x8015E170 ;# ptr - .4byte 0x8015E390 ;# ptr - .4byte 0x8015E5B0 ;# ptr - .4byte 0x8015E7D0 ;# ptr - .4byte 0x8015E9F0 ;# ptr + .byte4 VX2CommandSkip18x16__FR14VX2DecoderData + .byte4 VX2CommandBack18x16__FR14VX2DecoderData + .byte4 VX2CommandBack28x16__FR14VX2DecoderData + .byte4 VX2CommandBack38x16__FR14VX2DecoderData + .byte4 VX2CommandBack48x16__FR14VX2DecoderData + .byte4 VX2CommandBack58x16__FR14VX2DecoderData .4byte 0 .4byte 0 - .4byte 0x8015EC10 ;# ptr - .4byte 0x8015EC90 ;# ptr + .byte4 VX2CommandCutH8x16__FR14VX2DecoderData + .byte4 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 10c39368..e8b48b32 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: - .4byte 0x8015ED80 ;# ptr - .4byte 0x8015EEB0 ;# ptr - .4byte 0x8015F0D0 ;# ptr - .4byte 0x8015F2F0 ;# ptr - .4byte 0x8015F510 ;# ptr - .4byte 0x8015F730 ;# ptr + .byte4 VX2CommandSkip18x2__FR14VX2DecoderData + .byte4 VX2CommandBack18x2__FR14VX2DecoderData + .byte4 VX2CommandBack28x2__FR14VX2DecoderData + .byte4 VX2CommandBack38x2__FR14VX2DecoderData + .byte4 VX2CommandBack48x2__FR14VX2DecoderData + .byte4 VX2CommandBack58x2__FR14VX2DecoderData .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8015F950 ;# ptr + .byte4 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 38ffcf1a..87653fac 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: - .4byte 0x8015FA40 ;# ptr - .4byte 0x8015FB70 ;# ptr - .4byte 0x8015FD90 ;# ptr - .4byte 0x8015FFB0 ;# ptr - .4byte 0x801601D0 ;# ptr - .4byte 0x801603F0 ;# ptr + .byte4 VX2CommandSkip18x4__FR14VX2DecoderData + .byte4 VX2CommandBack18x4__FR14VX2DecoderData + .byte4 VX2CommandBack28x4__FR14VX2DecoderData + .byte4 VX2CommandBack38x4__FR14VX2DecoderData + .byte4 VX2CommandBack48x4__FR14VX2DecoderData + .byte4 VX2CommandBack58x4__FR14VX2DecoderData .4byte 0 .4byte 0 - .4byte 0x80160610 ;# ptr - .4byte 0x80160690 ;# ptr + .byte4 VX2CommandCutH8x4__FR14VX2DecoderData + .byte4 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 1183a3bb..9e438a39 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: - .4byte 0x80160780 ;# ptr - .4byte 0x801608B0 ;# ptr - .4byte 0x80160AD0 ;# ptr - .4byte 0x80160CF0 ;# ptr - .4byte 0x80160F10 ;# ptr - .4byte 0x80161130 ;# ptr + .byte4 VX2CommandSkip18x8__FR14VX2DecoderData + .byte4 VX2CommandBack18x8__FR14VX2DecoderData + .byte4 VX2CommandBack28x8__FR14VX2DecoderData + .byte4 VX2CommandBack38x8__FR14VX2DecoderData + .byte4 VX2CommandBack48x8__FR14VX2DecoderData + .byte4 VX2CommandBack58x8__FR14VX2DecoderData .4byte 0 .4byte 0 - .4byte 0x80161350 ;# ptr - .4byte 0x801613D0 ;# ptr + .byte4 VX2CommandCutH8x8__FR14VX2DecoderData + .byte4 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 4cd7e8fc..41b0bd46 100644 --- a/asm/libMobiclip/VX2_MotionCompensation.s +++ b/asm/libMobiclip/VX2_MotionCompensation.s @@ -901,10 +901,10 @@ InvSbpTable: .4byte 0xFFFFFFFF .global DecodeEscapeTable DecodeEscapeTable: - .4byte 0x80170EA0 ;# ptr - .4byte 0x80170EA0 ;# ptr - .4byte 0x80170FB0 ;# ptr - .4byte 0x801710C0 ;# ptr + .byte4 DecodeEscape__FR14VX2DecoderDataRiRiRi + .byte4 DecodeEscape__FR14VX2DecoderDataRiRiRi + .byte4 DecodeEscape2__FR14VX2DecoderDataRiRiRi + .byte4 DecodeEscape3__FR14VX2DecoderDataRiRiRi .global ZigZag8x8 ZigZag8x8: .4byte 0 diff --git a/asm/libnw4r_ef/ef_cube.s b/asm/libnw4r_ef/ef_cube.s index c3731841..7d176458 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 - .4byte 0x800B7100 ;# ptr + .byte4 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 922de577..c466c053 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 - .4byte 0x800B6440 ;# ptr + .byte4 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 de654c80..f98bdd8e 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 - .4byte 0x800B5240 ;# ptr + .byte4 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 03f7b1f1..0390663f 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 - .4byte 0x800BCCB0 ;# ptr - .4byte 0x800BAB90 ;# ptr - .4byte 0x800BA740 ;# ptr - .4byte 0x800BA760 ;# ptr - .4byte 0x800BC6D0 ;# ptr + .byte4 __dt__Q34nw4r2ef21DrawBillboardStrategyFv + .byte4 Draw__Q34nw4r2ef21DrawBillboardStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .byte4 GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .byte4 GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .byte4 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 4a00382c..3341f24f 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 - .4byte 0x800BF090 ;# ptr - .4byte 0x800BD020 ;# ptr - .4byte 0x800BA740 ;# ptr - .4byte 0x800BA760 ;# ptr - .4byte 0x800BEFC0 ;# ptr + .byte4 __dt__Q34nw4r2ef23DrawDirectionalStrategyFv + .byte4 Draw__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .byte4 GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .byte4 GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .byte4 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 155de770..f4eee105 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 - .4byte 0x800BF950 ;# ptr - .4byte 0x800BF0E0 ;# ptr - .4byte 0x800BA740 ;# ptr - .4byte 0x800BA760 ;# ptr + .byte4 __dt__Q34nw4r2ef16DrawFreeStrategyFv + .byte4 Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .byte4 GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .byte4 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 04226a66..3c277bfe 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 - .4byte 0x800BFF50 ;# ptr - .4byte 0x800BF9A0 ;# ptr - .4byte 0x800BA740 ;# ptr - .4byte 0x800BA760 ;# ptr + .byte4 __dt__Q34nw4r2ef16DrawLineStrategyFv + .byte4 Draw__Q34nw4r2ef16DrawLineStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .byte4 GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .byte4 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 ae6bed3d..e4b25d24 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 - .4byte 0x800A39E0 ;# ptr - .4byte 0x800A3A60 ;# ptr - .4byte 0x800A3950 ;# ptr + .byte4 Add__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectPQ34nw4r2ef15ParticleManager + .byte4 Remove__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectPQ34nw4r2ef15ParticleManager + .byte4 Draw__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectRCQ34nw4r2ef8DrawInfo .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawpointstrategy.s b/asm/libnw4r_ef/ef_drawpointstrategy.s index 1e9d1266..8603d09a 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 - .4byte 0x800C03C0 ;# ptr - .4byte 0x800BFFA0 ;# ptr - .4byte 0x800BA740 ;# ptr - .4byte 0x800BA760 ;# ptr + .byte4 __dt__Q34nw4r2ef17DrawPointStrategyFv + .byte4 Draw__Q34nw4r2ef17DrawPointStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .byte4 GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .byte4 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 09956753..b82503da 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 - .4byte 0x800C8AD0 ;# ptr - .4byte 0x800C7480 ;# ptr - .4byte 0x800BA740 ;# ptr - .4byte 0x800BA760 ;# ptr - .4byte 0x800C8150 ;# ptr + .byte4 __dt__Q34nw4r2ef24DrawSmoothStripeStrategyFv + .byte4 Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .byte4 GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .byte4 GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .byte4 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 ded7a06f..c02a257f 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 - .4byte 0x800B89B0 ;# ptr + .byte4 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 a4874569..13b19f78 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 - .4byte 0x800BAAC0 ;# ptr + .byte4 __sinit_$$3ef_drawstrategyimpl_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef16DrawStrategyImpl __vt__Q34nw4r2ef16DrawStrategyImpl: .4byte 0 .4byte 0 - .4byte 0x800BAAB0 ;# ptr + .byte4 __dt__Q34nw4r2ef16DrawStrategyImplFv .4byte 0 - .4byte 0x800BA740 ;# ptr - .4byte 0x800BA760 ;# ptr + .byte4 GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .byte4 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 d3e15986..e1bcd78f 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 - .4byte 0x800C3A80 ;# ptr - .4byte 0x800C25A0 ;# ptr - .4byte 0x800BA740 ;# ptr - .4byte 0x800BA760 ;# ptr - .4byte 0x800C3100 ;# ptr + .byte4 __dt__Q34nw4r2ef18DrawStripeStrategyFv + .byte4 Draw__Q34nw4r2ef18DrawStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .byte4 GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .byte4 GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .byte4 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 8ec0a96b..e2646208 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 - .4byte 0x800A3C80 ;# ptr - .4byte 0x800A3C90 ;# ptr - .4byte 0x800A3B40 ;# ptr - .4byte 0x800A4570 ;# ptr - .4byte 0x800A40A0 ;# ptr - .4byte 0x800A44D0 ;# ptr + .byte4 SendClosing__Q34nw4r2ef6EffectFv + .byte4 DestroyFunc__Q34nw4r2ef6EffectFv + .byte4 Initialize__Q34nw4r2ef6EffectFPQ34nw4r2ef12EffectSystemPQ34nw4r2ef15EmitterResourceUs + .byte4 CreateEmitter__Q34nw4r2ef6EffectFQ34nw4r2ef10ResEmitterUcUs + .byte4 Calc__Q34nw4r2ef6EffectFQ34nw4r2ef10CalcOption + .byte4 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 dec802a2..1f2f378c 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 - .4byte 0x800A4C20 ;# ptr + .byte4 __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: - .4byte 0x80440098 + .byte4 $$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 b2ce0efa..4b005914 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 - .4byte 0x800B4B50 ;# ptr + .byte4 __sinit_$$3ef_emform_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef15EmitFormBuilder __vt__Q34nw4r2ef15EmitFormBuilder: .4byte 0 .4byte 0 - .4byte 0x800B4AD0 ;# ptr + .byte4 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 ca3098eb..e4e271a6 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 - .4byte 0x800A4E80 ;# ptr - .4byte 0x800A4E90 ;# ptr - .4byte 0x800A53E0 ;# ptr - .4byte 0x800A5550 ;# ptr - .4byte 0x800A6500 ;# ptr - .4byte 0x800A66C0 ;# ptr - .4byte 0x800A6750 ;# ptr - .4byte 0x800A6870 ;# ptr + .byte4 SendClosing__Q34nw4r2ef7EmitterFv + .byte4 DestroyFunc__Q34nw4r2ef7EmitterFv + .byte4 Initialize__Q34nw4r2ef7EmitterFPQ34nw4r2ef6EffectPQ34nw4r2ef15EmitterResourceUc + .byte4 CreateEmitter__Q34nw4r2ef7EmitterFPQ34nw4r2ef15EmitterResourcePQ34nw4r2ef21EmitterInheritSettingPQ34nw4r2ef8ParticleUsPQ34nw4r4math4VEC3 + .byte4 CalcEmitter__Q34nw4r2ef7EmitterFv + .byte4 CalcParticle__Q34nw4r2ef7EmitterFv + .byte4 CalcEmission__Q34nw4r2ef7EmitterFv + .byte4 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 43725b35..e74acb70 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 - .4byte 0x800B4F00 ;# ptr + .byte4 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 dd7ff127..d665f3ce 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 - .4byte 0x800AF4B0 ;# ptr - .4byte 0x800AF4C0 ;# ptr - .4byte 0x800AF7F0 ;# ptr + .byte4 SendClosing__Q34nw4r2ef8ParticleFv + .byte4 DestroyFunc__Q34nw4r2ef8ParticleFv + .byte4 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 d6fc7893..73a3e8ce 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 - .4byte 0x800B2530 ;# ptr + .byte4 __sinit_$$3ef_particlemanager_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$211043 @@ -2399,12 +2399,12 @@ $$211043: __vt__Q34nw4r2ef15ParticleManager: .4byte 0 .4byte 0 - .4byte 0x800B02C0 ;# ptr - .4byte 0x800B02D0 ;# ptr - .4byte 0x800B0440 ;# ptr - .4byte 0x800B05A0 ;# ptr - .4byte 0x800B06D0 ;# ptr - .4byte 0x800B1C20 ;# ptr + .byte4 SendClosing__Q34nw4r2ef15ParticleManagerFv + .byte4 DestroyFunc__Q34nw4r2ef15ParticleManagerFv + .byte4 Initialize__Q34nw4r2ef15ParticleManagerFPQ34nw4r2ef7EmitterPQ34nw4r2ef15EmitterResource + .byte4 CreateParticle__Q34nw4r2ef15ParticleManagerFUsQ34nw4r4math4VEC3Q34nw4r4math4VEC3PCQ34nw4r4math5MTX34fPCQ34nw4r2ef21EmitterInheritSettingPQ34nw4r2ef8ParticleUs + .byte4 Calc__Q34nw4r2ef15ParticleManagerFv + .byte4 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 bd450f08..58b2547e 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 - .4byte 0x800B4BB0 ;# ptr + .byte4 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 0030dd1f..2de07eb2 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 - .4byte 0x800B3060 ;# ptr + .byte4 __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 605accd7..af40bb42 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 - .4byte 0x800B5780 ;# ptr + .byte4 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 5ef5bf24..73f5e410 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 - .4byte 0x800B6790 ;# ptr + .byte4 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 581b25f4..a0f230de 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: - .4byte 0x800E8940 ;# ptr - .4byte 0x800E8810 ;# ptr - .4byte 0x800E88E0 ;# ptr - .4byte 0x800E8710 ;# ptr - .4byte 0x800E8750 ;# ptr - .4byte 0x800E8660 ;# ptr - .4byte 0x800E8610 ;# ptr + .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 .global $$2LOCAL$$2CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20 $$2LOCAL$$2CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20: - .4byte 0x800E8F00 ;# ptr - .4byte 0x800E8D20 ;# ptr - .4byte 0x800E8E60 ;# ptr - .4byte 0x800E8BC0 ;# ptr - .4byte 0x800E8BD0 ;# ptr - .4byte 0x800E8A90 ;# ptr - .4byte 0x800E8A10 ;# ptr + .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 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$26188 diff --git a/asm/libnw4r_g3d/g3d_anmchr.s b/asm/libnw4r_g3d/g3d_anmchr.s index cb01ae46..fe2e98f5 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 - .4byte 0x800D9490 ;# ptr - .4byte 0x800D9480 ;# ptr - .4byte 0x800D9570 ;# ptr - .4byte 0x800D9560 ;# ptr - .4byte 0x800D9550 ;# ptr - .4byte 0x800D8D60 ;# ptr - .4byte 0x800D8E20 ;# ptr - .4byte 0x800D8F00 ;# ptr - .4byte 0x800D8E30 ;# ptr - .4byte 0x800D8EF0 ;# ptr - .4byte 0x800D8FE0 ;# ptr - .4byte 0x800D7E40 ;# ptr - .4byte 0x800D9400 ;# ptr - .4byte 0x800D7E50 ;# ptr - .4byte 0x800D7E60 ;# ptr - .4byte 0x800D7E90 ;# ptr - .4byte 0x800D7E70 ;# ptr - .4byte 0x800D7E80 ;# ptr - .4byte 0x800D8FF0 ;# ptr - .4byte 0x800D91F0 ;# ptr + .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 .global __vt__Q34nw4r3g3d14AnmObjChrBlend __vt__Q34nw4r3g3d14AnmObjChrBlend: .4byte 0 .4byte 0 - .4byte 0x800D9580 ;# ptr - .4byte 0x800D8380 ;# ptr - .4byte 0x800D9690 ;# ptr - .4byte 0x800D9680 ;# ptr - .4byte 0x800D9670 ;# ptr - .4byte 0x800D8020 ;# ptr - .4byte 0x800D8030 ;# ptr - .4byte 0x800D8010 ;# ptr - .4byte 0x800D8090 ;# ptr - .4byte 0x800D80A0 ;# ptr - .4byte 0x800D8100 ;# ptr - .4byte 0x800D8220 ;# ptr - .4byte 0x800D8510 ;# ptr - .4byte 0x800D7FE0 ;# ptr - .4byte 0x800D7FF0 ;# ptr - .4byte 0x800D8000 ;# ptr - .4byte 0x800D8B50 ;# ptr - .4byte 0x800D8B60 ;# ptr - .4byte 0x800D8110 ;# ptr - .4byte 0x800D8230 ;# ptr + .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 .global __vt__Q34nw4r3g3d13AnmObjChrNode __vt__Q34nw4r3g3d13AnmObjChrNode: .4byte 0 .4byte 0 - .4byte 0x800D9600 ;# ptr - .4byte 0x800D8380 ;# ptr - .4byte 0x800D7F70 ;# ptr - .4byte 0x800D9710 ;# ptr - .4byte 0x800D9700 ;# ptr - .4byte 0x800D8020 ;# ptr - .4byte 0x800D8030 ;# ptr - .4byte 0x800D8010 ;# ptr - .4byte 0x800D8090 ;# ptr - .4byte 0x800D80A0 ;# ptr - .4byte 0x800D8100 ;# ptr - .4byte 0x800D8220 ;# ptr + .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 0 - .4byte 0x800D7FE0 ;# ptr - .4byte 0x800D7FF0 ;# ptr - .4byte 0x800D8000 ;# ptr - .4byte 0x800D7E70 ;# ptr - .4byte 0x800D7E80 ;# ptr - .4byte 0x800D8110 ;# ptr - .4byte 0x800D8230 ;# ptr + .byte4 Attach__Q34nw4r3g3d13AnmObjChrNodeFiPQ34nw4r3g3d12AnmObjChrRes + .byte4 Detach__Q34nw4r3g3d13AnmObjChrNodeFi + .byte4 DetachAll__Q34nw4r3g3d13AnmObjChrNodeFv + .byte4 SetWeight__Q34nw4r3g3d9AnmObjChrFif + .byte4 GetWeight__Q34nw4r3g3d9AnmObjChrCFi + .byte4 Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption + .byte4 Release__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption .global __vt__Q34nw4r3g3d9AnmObjChr __vt__Q34nw4r3g3d9AnmObjChr: .4byte 0 .4byte 0 - .4byte 0x800D9500 ;# ptr + .byte4 IsDerivedFrom__Q34nw4r3g3d9AnmObjChrCFQ44nw4r3g3d6G3dObj7TypeObj .4byte 0 - .4byte 0x800D7F60 ;# ptr - .4byte 0x800D9730 ;# ptr - .4byte 0x800D9720 ;# ptr + .byte4 __dt__Q34nw4r3g3d9AnmObjChrFv + .byte4 GetTypeObj__Q34nw4r3g3d9AnmObjChrCFv + .byte4 GetTypeName__Q34nw4r3g3d9AnmObjChrCFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x800D7E40 ;# ptr + .byte4 Release__Q34nw4r3g3d9AnmObjChrFv .4byte 0 - .4byte 0x800D7E50 ;# ptr - .4byte 0x800D7E60 ;# ptr - .4byte 0x800D7E90 ;# ptr - .4byte 0x800D7E70 ;# ptr - .4byte 0x800D7E80 ;# ptr + .byte4 Attach__Q34nw4r3g3d9AnmObjChrFiPQ34nw4r3g3d12AnmObjChrRes + .byte4 Detach__Q34nw4r3g3d9AnmObjChrFi + .byte4 DetachAll__Q34nw4r3g3d9AnmObjChrFv + .byte4 SetWeight__Q34nw4r3g3d9AnmObjChrFif + .byte4 GetWeight__Q34nw4r3g3d9AnmObjChrCFi .4byte 0 .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmclr.s b/asm/libnw4r_g3d/g3d_anmclr.s index 24d17f53..476b98b6 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 - .4byte 0x800D5E90 ;# ptr - .4byte 0x800D5A60 ;# ptr - .4byte 0x800D5F70 ;# ptr - .4byte 0x800D5F60 ;# ptr - .4byte 0x800D5F50 ;# ptr - .4byte 0x800D5660 ;# ptr - .4byte 0x800D5720 ;# ptr - .4byte 0x800D5800 ;# ptr - .4byte 0x800D5730 ;# ptr - .4byte 0x800D57F0 ;# ptr - .4byte 0x800D58E0 ;# ptr - .4byte 0x800D4AB0 ;# ptr - .4byte 0x800D59E0 ;# ptr - .4byte 0x800D4AC0 ;# ptr - .4byte 0x800D4AD0 ;# ptr - .4byte 0x800D4AE0 ;# ptr + .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 .global __vt__Q34nw4r3g3d20AnmObjMatClrOverride __vt__Q34nw4r3g3d20AnmObjMatClrOverride: .4byte 0 .4byte 0 - .4byte 0x800D5F80 ;# ptr - .4byte 0x800D5200 ;# ptr - .4byte 0x800D6090 ;# ptr - .4byte 0x800D6080 ;# ptr - .4byte 0x800D6070 ;# ptr - .4byte 0x800D4E60 ;# ptr - .4byte 0x800D4EF0 ;# ptr - .4byte 0x800D4DE0 ;# ptr - .4byte 0x800D4F50 ;# ptr - .4byte 0x800D4FE0 ;# ptr - .4byte 0x800D5040 ;# ptr - .4byte 0x800D5140 ;# ptr - .4byte 0x800D53C0 ;# ptr - .4byte 0x800D4B70 ;# ptr - .4byte 0x800D4C60 ;# ptr - .4byte 0x800D4D80 ;# ptr + .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 .global __vt__Q34nw4r3g3d16AnmObjMatClrNode __vt__Q34nw4r3g3d16AnmObjMatClrNode: .4byte 0 .4byte 0 - .4byte 0x800D6000 ;# ptr - .4byte 0x800D5200 ;# ptr - .4byte 0x800D4B00 ;# ptr - .4byte 0x800D6110 ;# ptr - .4byte 0x800D6100 ;# ptr - .4byte 0x800D4E60 ;# ptr - .4byte 0x800D4EF0 ;# ptr - .4byte 0x800D4DE0 ;# ptr - .4byte 0x800D4F50 ;# ptr - .4byte 0x800D4FE0 ;# ptr - .4byte 0x800D5040 ;# ptr - .4byte 0x800D5140 ;# ptr + .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 0 - .4byte 0x800D4B70 ;# ptr - .4byte 0x800D4C60 ;# ptr - .4byte 0x800D4D80 ;# ptr + .byte4 Attach__Q34nw4r3g3d16AnmObjMatClrNodeFiPQ34nw4r3g3d15AnmObjMatClrRes + .byte4 Detach__Q34nw4r3g3d16AnmObjMatClrNodeFi + .byte4 DetachAll__Q34nw4r3g3d16AnmObjMatClrNodeFv .global __vt__Q34nw4r3g3d12AnmObjMatClr __vt__Q34nw4r3g3d12AnmObjMatClr: .4byte 0 .4byte 0 - .4byte 0x800D5F00 ;# ptr + .byte4 IsDerivedFrom__Q34nw4r3g3d12AnmObjMatClrCFQ44nw4r3g3d6G3dObj7TypeObj .4byte 0 - .4byte 0x800D4AF0 ;# ptr - .4byte 0x800D6130 ;# ptr - .4byte 0x800D6120 ;# ptr + .byte4 __dt__Q34nw4r3g3d12AnmObjMatClrFv + .byte4 GetTypeObj__Q34nw4r3g3d12AnmObjMatClrCFv + .byte4 GetTypeName__Q34nw4r3g3d12AnmObjMatClrCFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x800D4AB0 ;# ptr + .byte4 Release__Q34nw4r3g3d12AnmObjMatClrFv .4byte 0 - .4byte 0x800D4AC0 ;# ptr - .4byte 0x800D4AD0 ;# ptr - .4byte 0x800D4AE0 ;# ptr + .byte4 Attach__Q34nw4r3g3d12AnmObjMatClrFiPQ34nw4r3g3d15AnmObjMatClrRes + .byte4 Detach__Q34nw4r3g3d12AnmObjMatClrFi + .byte4 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 6d2ddf09..58963f3d 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 - .4byte 0x800DBC40 ;# ptr - .4byte 0x800DB250 ;# ptr - .4byte 0x800DB110 ;# ptr - .4byte 0x800DBCE0 ;# ptr - .4byte 0x800DBCD0 ;# ptr - .4byte 0x800DB120 ;# ptr - .4byte 0x800DB180 ;# ptr - .4byte 0x800DB190 ;# ptr - .4byte 0x800DB1C0 ;# ptr - .4byte 0x800DB1D0 ;# ptr - .4byte 0x800DAD60 ;# ptr - .4byte 0x800DAD70 ;# ptr - .4byte 0x800DADC0 ;# ptr - .4byte 0x800DADD0 ;# ptr - .4byte 0x800DADE0 ;# ptr - .4byte 0x800DADF0 ;# ptr - .4byte 0x800DAE00 ;# ptr - .4byte 0x800DAE10 ;# ptr - .4byte 0x800DAE20 ;# ptr - .4byte 0x800DAE30 ;# ptr - .4byte 0x800DAE40 ;# ptr - .4byte 0x800DAE50 ;# ptr - .4byte 0x800DAE60 ;# ptr - .4byte 0x800DB2A0 ;# ptr - .4byte 0x800DB3E0 ;# ptr - .4byte 0x800DB450 ;# ptr - .4byte 0x800DB5D0 ;# ptr - .4byte 0x800DB680 ;# ptr - .4byte 0x800DBA30 ;# ptr - .4byte 0x800DBA70 ;# ptr - .4byte 0x800DB7E0 ;# ptr - .4byte 0x800DB880 ;# ptr - .4byte 0x800DB910 ;# ptr - .4byte 0x800DB9A0 ;# ptr + .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 .global __vt__Q34nw4r3g3d6AnmScn __vt__Q34nw4r3g3d6AnmScn: .4byte 0 .4byte 0 - .4byte 0x800DBC90 ;# ptr + .byte4 IsDerivedFrom__Q34nw4r3g3d6AnmScnCFQ44nw4r3g3d6G3dObj7TypeObj .4byte 0 - .4byte 0x800DAD80 ;# ptr - .4byte 0x800DBD00 ;# ptr - .4byte 0x800DBCF0 ;# ptr + .byte4 __dt__Q34nw4r3g3d6AnmScnFv + .byte4 GetTypeObj__Q34nw4r3g3d6AnmScnCFv + .byte4 GetTypeName__Q34nw4r3g3d6AnmScnCFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x800DAD60 ;# ptr - .4byte 0x800DAD70 ;# ptr + .byte4 Attach__Q34nw4r3g3d6AnmScnFiPQ34nw4r3g3d9AnmScnRes + .byte4 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 2d6f9322..e07aec5d 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 - .4byte 0x800DA540 ;# ptr - .4byte 0x800DA530 ;# ptr - .4byte 0x800DA620 ;# ptr - .4byte 0x800DA610 ;# ptr - .4byte 0x800DA600 ;# ptr - .4byte 0x800DA050 ;# ptr - .4byte 0x800DA120 ;# ptr - .4byte 0x800DA200 ;# ptr - .4byte 0x800DA130 ;# ptr - .4byte 0x800DA1F0 ;# ptr - .4byte 0x800DA2F0 ;# ptr - .4byte 0x800D9740 ;# ptr - .4byte 0x800DA4B0 ;# ptr - .4byte 0x800D9750 ;# ptr - .4byte 0x800D9760 ;# ptr - .4byte 0x800D9790 ;# ptr - .4byte 0x800D9770 ;# ptr - .4byte 0x800D9780 ;# ptr + .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 .global __vt__Q34nw4r3g3d14AnmObjShpBlend __vt__Q34nw4r3g3d14AnmObjShpBlend: .4byte 0 .4byte 0 - .4byte 0x800DA630 ;# ptr - .4byte 0x800D9960 ;# ptr - .4byte 0x800DA740 ;# ptr - .4byte 0x800DA730 ;# ptr - .4byte 0x800DA720 ;# ptr - .4byte 0x800D9860 ;# ptr - .4byte 0x800D9870 ;# ptr - .4byte 0x800D9850 ;# ptr - .4byte 0x800D98D0 ;# ptr - .4byte 0x800D98E0 ;# ptr - .4byte 0x800D9940 ;# ptr - .4byte 0x800D9950 ;# ptr - .4byte 0x800D9AF0 ;# ptr - .4byte 0x800D9820 ;# ptr - .4byte 0x800D9830 ;# ptr - .4byte 0x800D9840 ;# ptr - .4byte 0x800D9DF0 ;# ptr - .4byte 0x800D9E00 ;# ptr + .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 .global __vt__Q34nw4r3g3d13AnmObjShpNode __vt__Q34nw4r3g3d13AnmObjShpNode: .4byte 0 .4byte 0 - .4byte 0x800DA6B0 ;# ptr - .4byte 0x800D9960 ;# ptr - .4byte 0x800D97B0 ;# ptr - .4byte 0x800DA7C0 ;# ptr - .4byte 0x800DA7B0 ;# ptr - .4byte 0x800D9860 ;# ptr - .4byte 0x800D9870 ;# ptr - .4byte 0x800D9850 ;# ptr - .4byte 0x800D98D0 ;# ptr - .4byte 0x800D98E0 ;# ptr - .4byte 0x800D9940 ;# ptr - .4byte 0x800D9950 ;# ptr + .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 0 - .4byte 0x800D9820 ;# ptr - .4byte 0x800D9830 ;# ptr - .4byte 0x800D9840 ;# ptr - .4byte 0x800D9770 ;# ptr - .4byte 0x800D9780 ;# ptr + .byte4 Attach__Q34nw4r3g3d13AnmObjShpNodeFiPQ34nw4r3g3d12AnmObjShpRes + .byte4 Detach__Q34nw4r3g3d13AnmObjShpNodeFi + .byte4 DetachAll__Q34nw4r3g3d13AnmObjShpNodeFv + .byte4 SetWeight__Q34nw4r3g3d9AnmObjShpFif + .byte4 GetWeight__Q34nw4r3g3d9AnmObjShpCFi .global __vt__Q34nw4r3g3d9AnmObjShp __vt__Q34nw4r3g3d9AnmObjShp: .4byte 0 .4byte 0 - .4byte 0x800DA5B0 ;# ptr + .byte4 IsDerivedFrom__Q34nw4r3g3d9AnmObjShpCFQ44nw4r3g3d6G3dObj7TypeObj .4byte 0 - .4byte 0x800D97A0 ;# ptr - .4byte 0x800DA7E0 ;# ptr - .4byte 0x800DA7D0 ;# ptr + .byte4 __dt__Q34nw4r3g3d9AnmObjShpFv + .byte4 GetTypeObj__Q34nw4r3g3d9AnmObjShpCFv + .byte4 GetTypeName__Q34nw4r3g3d9AnmObjShpCFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x800D9740 ;# ptr + .byte4 Release__Q34nw4r3g3d9AnmObjShpFv .4byte 0 - .4byte 0x800D9750 ;# ptr - .4byte 0x800D9760 ;# ptr - .4byte 0x800D9790 ;# ptr - .4byte 0x800D9770 ;# ptr - .4byte 0x800D9780 ;# ptr + .byte4 Attach__Q34nw4r3g3d9AnmObjShpFiPQ34nw4r3g3d12AnmObjShpRes + .byte4 Detach__Q34nw4r3g3d9AnmObjShpFi + .byte4 DetachAll__Q34nw4r3g3d9AnmObjShpFv + .byte4 SetWeight__Q34nw4r3g3d9AnmObjShpFif + .byte4 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 daccb214..08c1f38d 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 - .4byte 0x800D6D50 ;# ptr - .4byte 0x800D6B40 ;# ptr - .4byte 0x800D6E30 ;# ptr - .4byte 0x800D6E20 ;# ptr - .4byte 0x800D6E10 ;# ptr - .4byte 0x800D6740 ;# ptr - .4byte 0x800D6800 ;# ptr - .4byte 0x800D68E0 ;# ptr - .4byte 0x800D6810 ;# ptr - .4byte 0x800D68D0 ;# ptr - .4byte 0x800D69C0 ;# ptr - .4byte 0x800D6140 ;# ptr - .4byte 0x800D6AC0 ;# ptr - .4byte 0x800D6150 ;# ptr - .4byte 0x800D6160 ;# ptr - .4byte 0x800D6170 ;# ptr + .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 .global __vt__Q34nw4r3g3d20AnmObjTexPatOverride __vt__Q34nw4r3g3d20AnmObjTexPatOverride: .4byte 0 .4byte 0 - .4byte 0x800D6E40 ;# ptr - .4byte 0x800D6340 ;# ptr - .4byte 0x800D6F50 ;# ptr - .4byte 0x800D6F40 ;# ptr - .4byte 0x800D6F30 ;# ptr - .4byte 0x800D6240 ;# ptr - .4byte 0x800D6250 ;# ptr - .4byte 0x800D6230 ;# ptr - .4byte 0x800D62B0 ;# ptr - .4byte 0x800D62C0 ;# ptr - .4byte 0x800D6320 ;# ptr - .4byte 0x800D6330 ;# ptr - .4byte 0x800D6490 ;# ptr - .4byte 0x800D6200 ;# ptr - .4byte 0x800D6210 ;# ptr - .4byte 0x800D6220 ;# ptr + .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 .global __vt__Q34nw4r3g3d16AnmObjTexPatNode __vt__Q34nw4r3g3d16AnmObjTexPatNode: .4byte 0 .4byte 0 - .4byte 0x800D6EC0 ;# ptr - .4byte 0x800D6340 ;# ptr - .4byte 0x800D6190 ;# ptr - .4byte 0x800D6FD0 ;# ptr - .4byte 0x800D6FC0 ;# ptr - .4byte 0x800D6240 ;# ptr - .4byte 0x800D6250 ;# ptr - .4byte 0x800D6230 ;# ptr - .4byte 0x800D62B0 ;# ptr - .4byte 0x800D62C0 ;# ptr - .4byte 0x800D6320 ;# ptr - .4byte 0x800D6330 ;# ptr + .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 0 - .4byte 0x800D6200 ;# ptr - .4byte 0x800D6210 ;# ptr - .4byte 0x800D6220 ;# ptr + .byte4 Attach__Q34nw4r3g3d16AnmObjTexPatNodeFiPQ34nw4r3g3d15AnmObjTexPatRes + .byte4 Detach__Q34nw4r3g3d16AnmObjTexPatNodeFi + .byte4 DetachAll__Q34nw4r3g3d16AnmObjTexPatNodeFv .global __vt__Q34nw4r3g3d12AnmObjTexPat __vt__Q34nw4r3g3d12AnmObjTexPat: .4byte 0 .4byte 0 - .4byte 0x800D6DC0 ;# ptr + .byte4 IsDerivedFrom__Q34nw4r3g3d12AnmObjTexPatCFQ44nw4r3g3d6G3dObj7TypeObj .4byte 0 - .4byte 0x800D6180 ;# ptr - .4byte 0x800D6FF0 ;# ptr - .4byte 0x800D6FE0 ;# ptr + .byte4 __dt__Q34nw4r3g3d12AnmObjTexPatFv + .byte4 GetTypeObj__Q34nw4r3g3d12AnmObjTexPatCFv + .byte4 GetTypeName__Q34nw4r3g3d12AnmObjTexPatCFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x800D6140 ;# ptr + .byte4 Release__Q34nw4r3g3d12AnmObjTexPatFv .4byte 0 - .4byte 0x800D6150 ;# ptr - .4byte 0x800D6160 ;# ptr - .4byte 0x800D6170 ;# ptr + .byte4 Attach__Q34nw4r3g3d12AnmObjTexPatFiPQ34nw4r3g3d15AnmObjTexPatRes + .byte4 Detach__Q34nw4r3g3d12AnmObjTexPatFi + .byte4 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 6430d531..3dc8b301 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 - .4byte 0x800D7B70 ;# ptr - .4byte 0x800D7910 ;# ptr - .4byte 0x800D7C50 ;# ptr - .4byte 0x800D7C40 ;# ptr - .4byte 0x800D7C30 ;# ptr - .4byte 0x800D7600 ;# ptr - .4byte 0x800D76C0 ;# ptr - .4byte 0x800D77A0 ;# ptr - .4byte 0x800D76D0 ;# ptr - .4byte 0x800D7790 ;# ptr - .4byte 0x800D7880 ;# ptr - .4byte 0x800D7000 ;# ptr - .4byte 0x800D7890 ;# ptr - .4byte 0x800D7010 ;# ptr - .4byte 0x800D7020 ;# ptr - .4byte 0x800D7030 ;# ptr + .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 .global __vt__Q34nw4r3g3d20AnmObjTexSrtOverride __vt__Q34nw4r3g3d20AnmObjTexSrtOverride: .4byte 0 .4byte 0 - .4byte 0x800D7C60 ;# ptr - .4byte 0x800D7200 ;# ptr - .4byte 0x800D7D70 ;# ptr - .4byte 0x800D7D60 ;# ptr - .4byte 0x800D7D50 ;# ptr - .4byte 0x800D7100 ;# ptr - .4byte 0x800D7110 ;# ptr - .4byte 0x800D70F0 ;# ptr - .4byte 0x800D7170 ;# ptr - .4byte 0x800D7180 ;# ptr - .4byte 0x800D71E0 ;# ptr - .4byte 0x800D71F0 ;# ptr - .4byte 0x800D7350 ;# ptr - .4byte 0x800D70C0 ;# ptr - .4byte 0x800D70D0 ;# ptr - .4byte 0x800D70E0 ;# ptr + .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 .global __vt__Q34nw4r3g3d16AnmObjTexSrtNode __vt__Q34nw4r3g3d16AnmObjTexSrtNode: .4byte 0 .4byte 0 - .4byte 0x800D7CE0 ;# ptr - .4byte 0x800D7200 ;# ptr - .4byte 0x800D7050 ;# ptr - .4byte 0x800D7DF0 ;# ptr - .4byte 0x800D7DE0 ;# ptr - .4byte 0x800D7100 ;# ptr - .4byte 0x800D7110 ;# ptr - .4byte 0x800D70F0 ;# ptr - .4byte 0x800D7170 ;# ptr - .4byte 0x800D7180 ;# ptr - .4byte 0x800D71E0 ;# ptr - .4byte 0x800D71F0 ;# ptr + .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 0 - .4byte 0x800D70C0 ;# ptr - .4byte 0x800D70D0 ;# ptr - .4byte 0x800D70E0 ;# ptr + .byte4 Attach__Q34nw4r3g3d16AnmObjTexSrtNodeFiPQ34nw4r3g3d15AnmObjTexSrtRes + .byte4 Detach__Q34nw4r3g3d16AnmObjTexSrtNodeFi + .byte4 DetachAll__Q34nw4r3g3d16AnmObjTexSrtNodeFv .global __vt__Q34nw4r3g3d12AnmObjTexSrt __vt__Q34nw4r3g3d12AnmObjTexSrt: .4byte 0 .4byte 0 - .4byte 0x800D7BE0 ;# ptr + .byte4 IsDerivedFrom__Q34nw4r3g3d12AnmObjTexSrtCFQ44nw4r3g3d6G3dObj7TypeObj .4byte 0 - .4byte 0x800D7040 ;# ptr - .4byte 0x800D7E10 ;# ptr - .4byte 0x800D7E00 ;# ptr + .byte4 __dt__Q34nw4r3g3d12AnmObjTexSrtFv + .byte4 GetTypeObj__Q34nw4r3g3d12AnmObjTexSrtCFv + .byte4 GetTypeName__Q34nw4r3g3d12AnmObjTexSrtCFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x800D7000 ;# ptr + .byte4 Release__Q34nw4r3g3d12AnmObjTexSrtFv .4byte 0 - .4byte 0x800D7010 ;# ptr - .4byte 0x800D7020 ;# ptr - .4byte 0x800D7030 ;# ptr + .byte4 Attach__Q34nw4r3g3d12AnmObjTexSrtFiPQ34nw4r3g3d15AnmObjTexSrtRes + .byte4 Detach__Q34nw4r3g3d12AnmObjTexSrtFi + .byte4 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 b1f60cfb..6d4a5b67 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 - .4byte 0x800D4760 ;# ptr - .4byte 0x800D3940 ;# ptr - .4byte 0x800D4860 ;# ptr - .4byte 0x800D4850 ;# ptr - .4byte 0x800D4820 ;# ptr - .4byte 0x800D4390 ;# ptr - .4byte 0x800D4400 ;# ptr - .4byte 0x800D4430 ;# ptr - .4byte 0x800D4410 ;# ptr - .4byte 0x800D4420 ;# ptr - .4byte 0x800D44C0 ;# ptr - .4byte 0x800D3880 ;# ptr - .4byte 0x800D45D0 ;# ptr - .4byte 0x800D38C0 ;# ptr - .4byte 0x800D38D0 ;# ptr + .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 .global __vt__Q34nw4r3g3d11AnmObjVisOR __vt__Q34nw4r3g3d11AnmObjVisOR: .4byte 0 .4byte 0 - .4byte 0x800D48B0 ;# ptr - .4byte 0x800D4030 ;# ptr - .4byte 0x800D49C0 ;# ptr - .4byte 0x800D49B0 ;# ptr - .4byte 0x800D49A0 ;# ptr - .4byte 0x800D3D10 ;# ptr - .4byte 0x800D3D80 ;# ptr - .4byte 0x800D3CB0 ;# ptr - .4byte 0x800D3DD0 ;# ptr - .4byte 0x800D3E40 ;# ptr - .4byte 0x800D3E90 ;# ptr - .4byte 0x800D3F80 ;# ptr - .4byte 0x800D41A0 ;# ptr - .4byte 0x800D3A50 ;# ptr - .4byte 0x800D3B40 ;# ptr + .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 .global __vt__Q34nw4r3g3d13AnmObjVisNode __vt__Q34nw4r3g3d13AnmObjVisNode: .4byte 0 .4byte 0 - .4byte 0x800D4930 ;# ptr - .4byte 0x800D4030 ;# ptr - .4byte 0x800D39C0 ;# ptr - .4byte 0x800D4A60 ;# ptr - .4byte 0x800D4A50 ;# ptr - .4byte 0x800D3D10 ;# ptr - .4byte 0x800D3D80 ;# ptr - .4byte 0x800D3CB0 ;# ptr - .4byte 0x800D3DD0 ;# ptr - .4byte 0x800D3E40 ;# ptr - .4byte 0x800D3E90 ;# ptr - .4byte 0x800D3F80 ;# ptr + .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 0 - .4byte 0x800D3A50 ;# ptr - .4byte 0x800D3B40 ;# ptr + .byte4 Attach__Q34nw4r3g3d13AnmObjVisNodeFiPQ34nw4r3g3d12AnmObjVisRes + .byte4 Detach__Q34nw4r3g3d13AnmObjVisNodeFi .global __vt__Q34nw4r3g3d9AnmObjVis __vt__Q34nw4r3g3d9AnmObjVis: .4byte 0 .4byte 0 - .4byte 0x800D47D0 ;# ptr - .4byte 0x800D3940 ;# ptr - .4byte 0x800D3980 ;# ptr - .4byte 0x800D4A80 ;# ptr - .4byte 0x800D4A70 ;# ptr + .byte4 IsDerivedFrom__Q34nw4r3g3d9AnmObjVisCFQ44nw4r3g3d6G3dObj7TypeObj + .byte4 G3dProc__Q34nw4r3g3d9AnmObjVisFUlUlPv + .byte4 __dt__Q34nw4r3g3d9AnmObjVisFv + .byte4 GetTypeObj__Q34nw4r3g3d9AnmObjVisCFv + .byte4 GetTypeName__Q34nw4r3g3d9AnmObjVisCFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x800D3880 ;# ptr + .byte4 Release__Q34nw4r3g3d9AnmObjVisFv .4byte 0 - .4byte 0x800D38C0 ;# ptr - .4byte 0x800D38D0 ;# ptr + .byte4 Attach__Q34nw4r3g3d9AnmObjVisFiPQ34nw4r3g3d12AnmObjVisRes + .byte4 Detach__Q34nw4r3g3d9AnmObjVisFi .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2LOCAL$$2GetAnmPlayPolicy__Q24nw4r3g3dFQ34nw4r3g3d9AnmPolicy$$2policyTable $$2LOCAL$$2GetAnmPlayPolicy__Q24nw4r3g3dFQ34nw4r3g3d9AnmPolicy$$2policyTable: - .4byte 0x800DBE80 ;# ptr - .4byte 0x800DBE90 ;# ptr + .byte4 PlayPolicy_Onetime__Q24nw4r3g3dFfff + .byte4 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 2db718c0..4a0f2ba4 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 - .4byte 0x800E0F60 ;# ptr - .4byte 0x800E11C0 ;# ptr - .4byte 0x800E1530 ;# ptr - .4byte 0x800E1840 ;# ptr - .4byte 0x800E1C50 ;# ptr - .4byte 0x800E1F60 ;# ptr + .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 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_g3d/g3d_init.s b/asm/libnw4r_g3d/g3d_init.s index f77ae089..e0bbbc1f 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: - .4byte 0x80441190 + .byte4 $$28056 .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_maya.s b/asm/libnw4r_g3d/g3d_maya.s index 34ba6091..015f9cd6 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: - .4byte 0x800E6FC0 ;# ptr - .4byte 0x800E6EC0 ;# ptr - .4byte 0x800E6F70 ;# ptr - .4byte 0x800E6DC0 ;# ptr - .4byte 0x800E6E00 ;# ptr - .4byte 0x800E6D20 ;# ptr - .4byte 0x800E6CE0 ;# ptr + .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 .global $$2LOCAL$$2CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20 $$2LOCAL$$2CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20: - .4byte 0x800E7600 ;# ptr - .4byte 0x800E7420 ;# ptr - .4byte 0x800E7570 ;# ptr - .4byte 0x800E7250 ;# ptr - .4byte 0x800E7280 ;# ptr - .4byte 0x800E7120 ;# ptr - .4byte 0x800E70A0 ;# ptr + .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 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27167 diff --git a/asm/libnw4r_g3d/g3d_obj.s b/asm/libnw4r_g3d/g3d_obj.s index eaefc874..33083d42 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 - .4byte 0x800DBE40 ;# ptr + .byte4 IsDerivedFrom__Q34nw4r3g3d6G3dObjCFQ44nw4r3g3d6G3dObj7TypeObj .4byte 0 - .4byte 0x800DBD10 ;# ptr - .4byte 0x800DBE70 ;# ptr - .4byte 0x800DBE60 ;# ptr + .byte4 __dt__Q34nw4r3g3d6G3dObjFv + .byte4 GetTypeObj__Q34nw4r3g3d6G3dObjCFv + .byte4 GetTypeName__Q34nw4r3g3d6G3dObjCFv .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmchr.s b/asm/libnw4r_g3d/g3d_resanmchr.s index 076f2375..e3023d80 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: - .4byte 0x800D1790 ;# ptr - .4byte 0x800D18B0 ;# ptr - .4byte 0x800D1840 ;# ptr - .4byte 0x800D19A0 ;# ptr - .4byte 0x800D17B0 ;# ptr - .4byte 0x800D1A40 ;# ptr - .4byte 0x800D18F0 ;# ptr - .4byte 0x800D1AE0 ;# ptr + .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 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28848 diff --git a/asm/libnw4r_g3d/g3d_scnmdl.s b/asm/libnw4r_g3d/g3d_scnmdl.s index 53f9072b..073ed1fa 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 - .4byte 0x800F0A10 ;# ptr - .4byte 0x800EF990 ;# ptr - .4byte 0x800F09A0 ;# ptr - .4byte 0x800F0AA0 ;# ptr - .4byte 0x800F0A90 ;# ptr - .4byte 0x800E9830 ;# ptr - .4byte 0x800EFE40 ;# ptr - .4byte 0x800EFE80 ;# ptr - .4byte 0x800E96A0 ;# ptr - .4byte 0x800E96B0 ;# ptr - .4byte 0x800E9900 ;# ptr - .4byte 0x800F05A0 ;# ptr - .4byte 0x800F0710 ;# ptr - .4byte 0x800F0910 ;# ptr - .4byte 0x800F0960 ;# ptr - .4byte 0x800F0980 ;# ptr + .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 diff --git a/asm/libnw4r_g3d/g3d_scnmdlexpand.s b/asm/libnw4r_g3d/g3d_scnmdlexpand.s index 43993bbb..70776825 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 - .4byte 0x800F13E0 ;# ptr - .4byte 0x800F1080 ;# ptr - .4byte 0x800F1360 ;# ptr - .4byte 0x800F1460 ;# ptr - .4byte 0x800F1450 ;# ptr - .4byte 0x800E9D40 ;# ptr - .4byte 0x800E9350 ;# ptr - .4byte 0x800E94F0 ;# ptr - .4byte 0x800E96A0 ;# ptr - .4byte 0x800E96B0 ;# ptr - .4byte 0x800E9110 ;# ptr - .4byte 0x800F0D60 ;# ptr - .4byte 0x800F0EB0 ;# ptr - .4byte 0x800F0FF0 ;# ptr + .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 .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 f9fb9f87..57d119c9 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 - .4byte 0x800EE1B0 ;# ptr - .4byte 0x800EC9B0 ;# ptr - .4byte 0x800EE090 ;# ptr - .4byte 0x800EE230 ;# ptr - .4byte 0x800EE220 ;# ptr - .4byte 0x800E9830 ;# ptr - .4byte 0x800ED240 ;# ptr - .4byte 0x800ED280 ;# ptr - .4byte 0x800E96A0 ;# ptr - .4byte 0x800E96B0 ;# ptr - .4byte 0x800E9900 ;# ptr - .4byte 0x800ED3A0 ;# ptr - .4byte 0x800ED9B0 ;# ptr - .4byte 0x800EDB30 ;# ptr - .4byte 0x800EDC10 ;# ptr - .4byte 0x800EDC70 ;# ptr + .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 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$214161 diff --git a/asm/libnw4r_g3d/g3d_scnobj.s b/asm/libnw4r_g3d/g3d_scnobj.s index 1865a05a..a8001cac 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 - .4byte 0x800EA860 ;# ptr - .4byte 0x800E9FA0 ;# ptr - .4byte 0x800EA7A0 ;# ptr - .4byte 0x800EA900 ;# ptr - .4byte 0x800EA8F0 ;# ptr - .4byte 0x800E9D40 ;# ptr - .4byte 0x800E9350 ;# ptr - .4byte 0x800E94F0 ;# ptr - .4byte 0x800E96A0 ;# ptr - .4byte 0x800E96B0 ;# ptr - .4byte 0x800E9110 ;# ptr - .4byte 0x800EA450 ;# ptr - .4byte 0x800EA5E0 ;# ptr - .4byte 0x800EA6A0 ;# ptr + .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 .global __vt__Q34nw4r3g3d6ScnObj __vt__Q34nw4r3g3d6ScnObj: .4byte 0 .4byte 0 - .4byte 0x800EA8B0 ;# ptr + .byte4 IsDerivedFrom__Q34nw4r3g3d6ScnObjCFQ44nw4r3g3d6G3dObj7TypeObj .4byte 0 - .4byte 0x800E92D0 ;# ptr - .4byte 0x800EA920 ;# ptr - .4byte 0x800EA910 ;# ptr + .byte4 __dt__Q34nw4r3g3d6ScnObjFv + .byte4 GetTypeObj__Q34nw4r3g3d6ScnObjCFv + .byte4 GetTypeName__Q34nw4r3g3d6ScnObjCFv .4byte 0 - .4byte 0x800E9350 ;# ptr - .4byte 0x800E94F0 ;# ptr - .4byte 0x800E96A0 ;# ptr - .4byte 0x800E96B0 ;# ptr - .4byte 0x800E9110 ;# ptr + .byte4 SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl + .byte4 GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl + .byte4 GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv + .byte4 GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv + .byte4 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 817faef6..63346cb7 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 - .4byte 0x800EC300 ;# ptr - .4byte 0x800EB5D0 ;# ptr - .4byte 0x800EC2F0 ;# ptr - .4byte 0x800EB6F0 ;# ptr - .4byte 0x800EBFD0 ;# ptr - .4byte 0x800EC150 ;# ptr - .4byte 0x800EC1C0 ;# ptr - .4byte 0x800EC250 ;# ptr - .4byte 0x800EC2E0 ;# ptr + .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 0 .global __vt__Q34nw4r3g3d7ScnRoot __vt__Q34nw4r3g3d7ScnRoot: .4byte 0 .4byte 0 - .4byte 0x800EC310 ;# ptr - .4byte 0x800EAA70 ;# ptr - .4byte 0x800EB550 ;# ptr - .4byte 0x800EC390 ;# ptr - .4byte 0x800EC380 ;# ptr - .4byte 0x800E9D40 ;# ptr - .4byte 0x800E9350 ;# ptr - .4byte 0x800E94F0 ;# ptr - .4byte 0x800E96A0 ;# ptr - .4byte 0x800E96B0 ;# ptr - .4byte 0x800E9110 ;# ptr - .4byte 0x800EA450 ;# ptr - .4byte 0x800EA5E0 ;# ptr - .4byte 0x800EA6A0 ;# ptr + .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 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$213447 diff --git a/asm/libnw4r_g3d/g3d_state.s b/asm/libnw4r_g3d/g3d_state.s index efd4d506..cb1e5f42 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 - .4byte 0x800DFE00 ;# ptr + .byte4 __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 - .4byte 0x800DFC90 ;# ptr - .4byte 0x800DF520 ;# ptr - .4byte 0x800DFC40 ;# ptr - .4byte 0x800DFAE0 ;# ptr + .byte4 __cl__Q44nw4r3g3d8G3DState11IndMtxOpStdFPQ44nw4r3g3d8G3DState13IndTexMtxInfo + .byte4 __dt__Q44nw4r3g3d8G3DState11IndMtxOpStdFv + .byte4 Reset__Q44nw4r3g3d8G3DState11IndMtxOpStdFv + .byte4 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: - .4byte 0x805103C8 + .byte4 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 aff7ae33..5101c1c1 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: - .4byte 0x800E7CC0 ;# ptr - .4byte 0x800E7BA0 ;# ptr - .4byte 0x800E7C70 ;# ptr - .4byte 0x800E7AC0 ;# ptr - .4byte 0x800E7B00 ;# ptr - .4byte 0x800E7A30 ;# ptr - .4byte 0x800E79F0 ;# ptr + .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 .global $$2LOCAL$$2CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20 $$2LOCAL$$2CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20: - .4byte 0x800E8250 ;# ptr - .4byte 0x800E8090 ;# ptr - .4byte 0x800E81C0 ;# ptr - .4byte 0x800E7F20 ;# ptr - .4byte 0x800E7F50 ;# ptr - .4byte 0x800E7E10 ;# ptr - .4byte 0x800E7D90 ;# ptr + .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 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27161 diff --git a/asm/libnw4r_lyt/lyt_animation.s b/asm/libnw4r_lyt/lyt_animation.s index 7f9431eb..eef301b3 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 - .4byte 0x800FC590 ;# ptr - .4byte 0x800FC660 ;# ptr - .4byte 0x800FC680 ;# ptr - .4byte 0x800FC800 ;# ptr - .4byte 0x800FC9D0 ;# ptr - .4byte 0x800FCAF0 ;# ptr - .4byte 0x800FCCD0 ;# ptr + .byte4 __dt__Q34nw4r3lyt18AnimTransformBasicFv + .byte4 SetResource__Q34nw4r3lyt18AnimTransformBasicFPCQ44nw4r3lyt3res14AnimationBlockPQ34nw4r3lyt16ResourceAccessor + .byte4 SetResource__Q34nw4r3lyt18AnimTransformBasicFPCQ44nw4r3lyt3res14AnimationBlockPQ34nw4r3lyt16ResourceAccessorUs + .byte4 Bind__Q34nw4r3lyt18AnimTransformBasicFPQ34nw4r3lyt4Panebb + .byte4 Bind__Q34nw4r3lyt18AnimTransformBasicFPQ34nw4r3lyt8Materialb + .byte4 Animate__Q34nw4r3lyt18AnimTransformBasicFUlPQ34nw4r3lyt4Pane + .byte4 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 2543f752..fad66d9c 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 - .4byte 0x800FDCD0 ;# ptr - .4byte 0x800FDC00 ;# ptr - .4byte 0x800FDC60 ;# ptr + .byte4 __dt__Q34nw4r3lyt19ArcResourceAccessorFv + .byte4 GetResource__Q34nw4r3lyt19ArcResourceAccessorFUlPCcPUl + .byte4 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 ab5a38b8..209ed07c 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 - .4byte 0x800F9110 ;# ptr + .byte4 __sinit_$$3lyt_bounding_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt8Bounding __vt__Q34nw4r3lyt8Bounding: .4byte 0 .4byte 0 - .4byte 0x800F9090 ;# ptr - .4byte 0x800F9100 ;# ptr - .4byte 0x800F30D0 ;# ptr - .4byte 0x800F33D0 ;# ptr - .4byte 0x800F90F0 ;# ptr - .4byte 0x800F3470 ;# ptr - .4byte 0x800F3500 ;# ptr - .4byte 0x800F2EA0 ;# ptr - .4byte 0x800F2EB0 ;# ptr - .4byte 0x800F2EC0 ;# ptr - .4byte 0x800F2EF0 ;# ptr - .4byte 0x800F2F20 ;# ptr - .4byte 0x800F2F30 ;# ptr - .4byte 0x800F2F40 ;# ptr - .4byte 0x800F3000 ;# ptr - .4byte 0x800F35C0 ;# ptr - .4byte 0x800F35E0 ;# ptr - .4byte 0x800F3670 ;# ptr - .4byte 0x800F3690 ;# ptr - .4byte 0x800F3730 ;# ptr - .4byte 0x800F3740 ;# ptr - .4byte 0x800F3750 ;# ptr - .4byte 0x800F3850 ;# ptr - .4byte 0x800F3A80 ;# ptr - .4byte 0x800F3AA0 ;# ptr - .4byte 0x800F3AB0 ;# ptr - .4byte 0x800F3950 ;# ptr + .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 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/libnw4r_lyt/lyt_drawInfo.s b/asm/libnw4r_lyt/lyt_drawInfo.s index d95b88a9..56b6b596 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 - .4byte 0x800FC260 ;# ptr + .byte4 __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 c82fcf4a..6c366edf 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 - .4byte 0x800F3C10 ;# ptr + .byte4 __dt__Q34nw4r3lyt5GroupFv .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_layout.s b/asm/libnw4r_lyt/lyt_layout.s index 679d6bf7..32a03ff7 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 - .4byte 0x800F40A0 ;# ptr - .4byte 0x800F41D0 ;# ptr - .4byte 0x800F4520 ;# ptr - .4byte 0x800F45A0 ;# ptr - .4byte 0x800F4600 ;# ptr - .4byte 0x800F4690 ;# ptr - .4byte 0x800F46C0 ;# ptr - .4byte 0x800F46F0 ;# ptr - .4byte 0x800F4710 ;# ptr - .4byte 0x800F49B0 ;# ptr - .4byte 0x800F49E0 ;# ptr - .4byte 0x800F4A00 ;# ptr - .4byte 0x800F4A20 ;# ptr - .4byte 0x800F4A80 ;# ptr + .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 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210260 diff --git a/asm/libnw4r_lyt/lyt_material.s b/asm/libnw4r_lyt/lyt_material.s index a6ef1149..86216e16 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 - .4byte 0x800FA490 ;# ptr - .4byte 0x800FAFB0 ;# ptr - .4byte 0x800FBDC0 ;# ptr - .4byte 0x800FBDE0 ;# ptr - .4byte 0x800FBDF0 ;# ptr - .4byte 0x800FBE10 ;# ptr - .4byte 0x800FBED0 ;# ptr - .4byte 0x800FBEE0 ;# ptr - .4byte 0x800FBEF0 ;# ptr - .4byte 0x800FBF40 ;# ptr + .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 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210055 diff --git a/asm/libnw4r_lyt/lyt_pane.s b/asm/libnw4r_lyt/lyt_pane.s index 77a4fed0..bda06d16 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 - .4byte 0x800F3AE0 ;# ptr + .byte4 __sinit_$$3lyt_pane_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$210224 @@ -1161,33 +1161,33 @@ $$210224: __vt__Q34nw4r3lyt4Pane: .4byte 0 .4byte 0 - .4byte 0x800F2CD0 ;# ptr - .4byte 0x800F3AD0 ;# ptr - .4byte 0x800F30D0 ;# ptr - .4byte 0x800F33D0 ;# ptr - .4byte 0x800F3460 ;# ptr - .4byte 0x800F3470 ;# ptr - .4byte 0x800F3500 ;# ptr - .4byte 0x800F2EA0 ;# ptr - .4byte 0x800F2EB0 ;# ptr - .4byte 0x800F2EC0 ;# ptr - .4byte 0x800F2EF0 ;# ptr - .4byte 0x800F2F20 ;# ptr - .4byte 0x800F2F30 ;# ptr - .4byte 0x800F2F40 ;# ptr - .4byte 0x800F3000 ;# ptr - .4byte 0x800F35C0 ;# ptr - .4byte 0x800F35E0 ;# ptr - .4byte 0x800F3670 ;# ptr - .4byte 0x800F3690 ;# ptr - .4byte 0x800F3730 ;# ptr - .4byte 0x800F3740 ;# ptr - .4byte 0x800F3750 ;# ptr - .4byte 0x800F3850 ;# ptr - .4byte 0x800F3A80 ;# ptr - .4byte 0x800F3AA0 ;# ptr - .4byte 0x800F3AB0 ;# ptr - .4byte 0x800F3950 ;# ptr + .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 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29820 diff --git a/asm/libnw4r_lyt/lyt_picture.s b/asm/libnw4r_lyt/lyt_picture.s index 0bc1a282..db22c741 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 - .4byte 0x800F5330 ;# ptr + .byte4 __sinit_$$3lyt_picture_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt7Picture __vt__Q34nw4r3lyt7Picture: .4byte 0 .4byte 0 - .4byte 0x800F4F10 ;# ptr - .4byte 0x800F5320 ;# ptr - .4byte 0x800F30D0 ;# ptr - .4byte 0x800F33D0 ;# ptr - .4byte 0x800F5240 ;# ptr - .4byte 0x800F3470 ;# ptr - .4byte 0x800F3500 ;# ptr - .4byte 0x800F51B0 ;# ptr - .4byte 0x800F51D0 ;# ptr - .4byte 0x800F2EC0 ;# ptr - .4byte 0x800F2EF0 ;# ptr - .4byte 0x800F5200 ;# ptr - .4byte 0x800F5220 ;# ptr - .4byte 0x800F2F40 ;# ptr - .4byte 0x800F3000 ;# ptr - .4byte 0x800F35C0 ;# ptr - .4byte 0x800F35E0 ;# ptr - .4byte 0x800F3670 ;# ptr - .4byte 0x800F3690 ;# ptr - .4byte 0x800F3730 ;# ptr - .4byte 0x800F3740 ;# ptr - .4byte 0x800F3750 ;# ptr - .4byte 0x800F3850 ;# ptr - .4byte 0x800F3A80 ;# ptr - .4byte 0x800F3AA0 ;# ptr - .4byte 0x800F3AB0 ;# ptr - .4byte 0x800F3950 ;# ptr - .4byte 0x800F4FF0 ;# ptr + .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 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28804 diff --git a/asm/libnw4r_lyt/lyt_resourceAccessor.s b/asm/libnw4r_lyt/lyt_resourceAccessor.s index ceae178a..f9165c08 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 - .4byte 0x800FD880 ;# ptr + .byte4 __dt__Q34nw4r3lyt16ResourceAccessorFv .4byte 0 - .4byte 0x800FD8A0 ;# ptr + .byte4 GetFont__Q34nw4r3lyt16ResourceAccessorFPCc .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_textBox.s b/asm/libnw4r_lyt/lyt_textBox.s index f8aa8ff7..2dde9c6a 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 - .4byte 0x800F6AA0 ;# ptr + .byte4 __sinit_$$3lyt_textBox_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt7TextBox __vt__Q34nw4r3lyt7TextBox: .4byte 0 .4byte 0 - .4byte 0x800F5630 ;# ptr - .4byte 0x800F6A90 ;# ptr - .4byte 0x800F30D0 ;# ptr - .4byte 0x800F33D0 ;# ptr - .4byte 0x800F58D0 ;# ptr - .4byte 0x800F3470 ;# ptr - .4byte 0x800F3500 ;# ptr - .4byte 0x800F57D0 ;# ptr - .4byte 0x800F57F0 ;# ptr - .4byte 0x800F2EC0 ;# ptr - .4byte 0x800F2EF0 ;# ptr - .4byte 0x800F5830 ;# ptr - .4byte 0x800F5850 ;# ptr - .4byte 0x800F2F40 ;# ptr - .4byte 0x800F3000 ;# ptr - .4byte 0x800F35C0 ;# ptr - .4byte 0x800F35E0 ;# ptr - .4byte 0x800F3670 ;# ptr - .4byte 0x800F3690 ;# ptr - .4byte 0x800F3730 ;# ptr - .4byte 0x800F3740 ;# ptr - .4byte 0x800F3750 ;# ptr - .4byte 0x800F3850 ;# ptr - .4byte 0x800F3A80 ;# ptr - .4byte 0x800F3AA0 ;# ptr - .4byte 0x800F3AB0 ;# ptr - .4byte 0x800F6570 ;# ptr - .4byte 0x800F6280 ;# ptr - .4byte 0x800F6350 ;# ptr - .4byte 0x800F63A0 ;# ptr - .4byte 0x800F6480 ;# ptr + .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 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/libnw4r_lyt/lyt_window.s b/asm/libnw4r_lyt/lyt_window.s index e04de446..a6f5e1b4 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 - .4byte 0x800F9040 ;# ptr + .byte4 __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 - .4byte 0x800F6D40 ;# ptr - .4byte 0x800F9030 ;# ptr - .4byte 0x800F30D0 ;# ptr - .4byte 0x800F33D0 ;# ptr - .4byte 0x800F7020 ;# ptr - .4byte 0x800F3470 ;# ptr - .4byte 0x800F7200 ;# ptr - .4byte 0x800F6F90 ;# ptr - .4byte 0x800F6FB0 ;# ptr - .4byte 0x800F2EC0 ;# ptr - .4byte 0x800F2EF0 ;# ptr - .4byte 0x800F6FE0 ;# ptr - .4byte 0x800F7000 ;# ptr - .4byte 0x800F2F40 ;# ptr - .4byte 0x800F6E90 ;# ptr - .4byte 0x800F35C0 ;# ptr - .4byte 0x800F35E0 ;# ptr - .4byte 0x800F3670 ;# ptr - .4byte 0x800F7290 ;# ptr - .4byte 0x800F3730 ;# ptr - .4byte 0x800F3740 ;# ptr - .4byte 0x800F3750 ;# ptr - .4byte 0x800F3850 ;# ptr - .4byte 0x800F8FB0 ;# ptr - .4byte 0x800F3AA0 ;# ptr - .4byte 0x800F8FC0 ;# ptr - .4byte 0x800F3950 ;# ptr - .4byte 0x800F9020 ;# ptr - .4byte 0x800F8FF0 ;# ptr - .4byte 0x800F7320 ;# ptr - .4byte 0x800F7430 ;# ptr - .4byte 0x800F7A40 ;# ptr - .4byte 0x800F8180 ;# ptr + .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 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29836 diff --git a/asm/libnw4r_snd/snd_AxManager.s b/asm/libnw4r_snd/snd_AxManager.s index 4cf83b57..4298c506 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 - .4byte 0x80100F90 ;# ptr + .byte4 __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 0cc21bf4..ac96facd 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 - .4byte 0x801054A0 ;# ptr + .byte4 __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 088bac67..3232bf2f 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 - .4byte 0x80106B70 ;# ptr + .byte4 __sinit_$$3snd_BasicSound_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail10BasicSound __vt__Q44nw4r3snd6detail10BasicSound: .4byte 0 .4byte 0 - .4byte 0x80106B60 ;# ptr - .4byte 0x80106B50 ;# ptr - .4byte 0x80106610 ;# ptr + .byte4 GetRuntimeTypeInfo__Q44nw4r3snd6detail10BasicSoundCFv + .byte4 __dt__Q44nw4r3snd6detail10BasicSoundFv + .byte4 Shutdown__Q44nw4r3snd6detail10BasicSoundFv .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80105590 ;# ptr + .byte4 InitParam__Q44nw4r3snd6detail10BasicSoundFv .4byte 0 .4byte 0 - .4byte 0x80106840 ;# ptr - .4byte 0x80106200 ;# ptr - .4byte 0x80106240 ;# ptr + .byte4 OnUpdatePlayerPriority__Q44nw4r3snd6detail10BasicSoundFv + .byte4 UpdateMoveValue__Q44nw4r3snd6detail10BasicSoundFv + .byte4 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 48df4c4d..c302a035 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 - .4byte 0x80106EC0 ;# ptr - .4byte 0x80106DE0 ;# ptr + .byte4 __dt__Q44nw4r3snd6detail19BiquadFilterBpf2048Fv + .byte4 GetCoef__Q44nw4r3snd6detail19BiquadFilterBpf2048CFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef .global __vt__Q44nw4r3snd6detail19BiquadFilterBpf1024 __vt__Q44nw4r3snd6detail19BiquadFilterBpf1024: .4byte 0 .4byte 0 - .4byte 0x80106EB0 ;# ptr - .4byte 0x80106D40 ;# ptr + .byte4 __dt__Q44nw4r3snd6detail19BiquadFilterBpf1024Fv + .byte4 GetCoef__Q44nw4r3snd6detail19BiquadFilterBpf1024CFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef .global __vt__Q44nw4r3snd6detail18BiquadFilterBpf512 __vt__Q44nw4r3snd6detail18BiquadFilterBpf512: .4byte 0 .4byte 0 - .4byte 0x80106EA0 ;# ptr - .4byte 0x80106CA0 ;# ptr + .byte4 __dt__Q44nw4r3snd6detail18BiquadFilterBpf512Fv + .byte4 GetCoef__Q44nw4r3snd6detail18BiquadFilterBpf512CFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef .global __vt__Q44nw4r3snd6detail15BiquadFilterHpf __vt__Q44nw4r3snd6detail15BiquadFilterHpf: .4byte 0 .4byte 0 - .4byte 0x80106E90 ;# ptr - .4byte 0x80106C10 ;# ptr + .byte4 __dt__Q44nw4r3snd6detail15BiquadFilterHpfFv + .byte4 GetCoef__Q44nw4r3snd6detail15BiquadFilterHpfCFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef .global __vt__Q44nw4r3snd6detail15BiquadFilterLpf __vt__Q44nw4r3snd6detail15BiquadFilterLpf: .4byte 0 .4byte 0 - .4byte 0x80106E80 ;# ptr - .4byte 0x80106B80 ;# ptr + .byte4 __dt__Q44nw4r3snd6detail15BiquadFilterLpfFv + .byte4 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 d7fc07b6..b2351077 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 - .4byte 0x80108A80 ;# ptr - .4byte 0x80108AD0 ;# ptr - .4byte 0x80121020 ;# ptr - .4byte 0x80108920 ;# ptr - .4byte 0x80108A70 ;# ptr - .4byte 0x80120630 ;# ptr - .4byte 0x80120640 ;# ptr - .4byte 0x80108A40 ;# ptr - .4byte 0x80108A50 ;# ptr - .4byte 0x80108A20 ;# ptr - .4byte 0x80108A10 ;# ptr - .4byte 0x801089F0 ;# ptr - .4byte 0x801089E0 ;# ptr - .4byte 0x801089D0 ;# ptr - .4byte 0x80108A90 ;# ptr - .4byte 0x80108950 ;# ptr - .4byte 0x80121220 ;# ptr - .4byte 0x80120DF0 ;# ptr - .4byte 0x80108A30 ;# ptr - .4byte 0x80108A00 ;# ptr - .4byte 0x80108AA0 ;# ptr - .4byte 0x80121140 ;# ptr - .4byte 0x80108A60 ;# ptr + .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 0 .global __vt__Q34nw4r3snd15DvdSoundArchive __vt__Q34nw4r3snd15DvdSoundArchive: .4byte 0 .4byte 0 - .4byte 0x80108450 ;# ptr - .4byte 0x80108AC0 ;# ptr - .4byte 0x80108AB0 ;# ptr - .4byte 0x801087F0 ;# ptr - .4byte 0x80108680 ;# ptr - .4byte 0x80108730 ;# ptr + .byte4 __dt__Q34nw4r3snd15DvdSoundArchiveFv + .byte4 detail_GetFileAddress__Q34nw4r3snd15DvdSoundArchiveCFUl + .byte4 detail_GetWaveDataFileAddress__Q34nw4r3snd15DvdSoundArchiveCFUl + .byte4 detail_GetRequiredStreamBufferSize__Q34nw4r3snd15DvdSoundArchiveCFv + .byte4 OpenStream__Q34nw4r3snd15DvdSoundArchiveCFPviUlUl + .byte4 OpenExtStream__Q34nw4r3snd15DvdSoundArchiveCFPviPCcUlUl diff --git a/asm/libnw4r_snd/snd_MmlParser.s b/asm/libnw4r_snd/snd_MmlParser.s index 560ecfde..e9fbd8dd 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 - .4byte 0x8010A530 ;# ptr - .4byte 0x8010AEB0 ;# ptr + .byte4 CommandProc__Q44nw4r3snd6detail9MmlParserCFPQ44nw4r3snd6detail11MmlSeqTrackUlll + .byte4 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 cd4ab784..511d7e1f 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 - .4byte 0x8010B0E0 ;# ptr - .4byte 0x8010B0C0 ;# ptr + .byte4 __dt__Q44nw4r3snd6detail11MmlSeqTrackFv + .byte4 Parse__Q44nw4r3snd6detail11MmlSeqTrackFb diff --git a/asm/libnw4r_snd/snd_MmlSeqTrackAllocator.s b/asm/libnw4r_snd/snd_MmlSeqTrackAllocator.s index 9ba4c943..7feed93a 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 - .4byte 0x8010B250 ;# ptr - .4byte 0x8010B140 ;# ptr - .4byte 0x8010B1B0 ;# ptr - .4byte 0x8010B240 ;# ptr + .byte4 __dt__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFv + .byte4 AllocTrack__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFPQ44nw4r3snd6detail9SeqPlayer + .byte4 FreeTrack__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFPQ44nw4r3snd6detail8SeqTrack + .byte4 GetAllocatableTrackCount__Q44nw4r3snd6detail20MmlSeqTrackAllocatorCFv diff --git a/asm/libnw4r_snd/snd_PlayerHeap.s b/asm/libnw4r_snd/snd_PlayerHeap.s index 0d8f7732..dc150170 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 - .4byte 0x8010B290 ;# ptr - .4byte 0x8010B390 ;# ptr + .byte4 __dt__Q44nw4r3snd6detail10PlayerHeapFv + .byte4 Alloc__Q44nw4r3snd6detail10PlayerHeapFUl diff --git a/asm/libnw4r_snd/snd_SeqPlayer.s b/asm/libnw4r_snd/snd_SeqPlayer.s index 24fa1b4a..9f38229f 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 - .4byte 0x8010C390 ;# ptr - .4byte 0x8010C960 ;# ptr - .4byte 0x8010C9D0 ;# ptr - .4byte 0x8010CB20 ;# ptr - .4byte 0x80109E50 ;# ptr - .4byte 0x80109E40 ;# ptr - .4byte 0x80109E30 ;# ptr + .byte4 __dt__Q44nw4r3snd6detail9SeqPlayerFv + .byte4 Start__Q44nw4r3snd6detail9SeqPlayerFv + .byte4 Stop__Q44nw4r3snd6detail9SeqPlayerFv + .byte4 Pause__Q44nw4r3snd6detail9SeqPlayerFb + .byte4 IsActive__Q44nw4r3snd6detail9SeqPlayerCFv + .byte4 IsStarted__Q44nw4r3snd6detail9SeqPlayerCFv + .byte4 IsPause__Q44nw4r3snd6detail9SeqPlayerCFv .4byte 0 .4byte 0 - .4byte 0x8010D6F0 ;# ptr - .4byte 0x80109E70 ;# ptr - .4byte 0x80109E60 ;# ptr + .byte4 $$2180$$2__dt__Q44nw4r3snd6detail9SeqPlayerFv + .byte4 $$2180$$2InvalidateData__Q44nw4r3snd6detail9SeqPlayerFPCvPCv + .byte4 $$2180$$2InvalidateWaveData__Q44nw4r3snd6detail9SeqPlayerFPCvPCv .4byte 0 .4byte 0 - .4byte 0x8010D700 ;# ptr - .4byte 0x80109E90 ;# ptr - .4byte 0x80109E20 ;# ptr - .4byte 0x80109E80 ;# ptr - .4byte 0x8010CD40 ;# ptr - .4byte 0x80109E10 ;# ptr - .4byte 0x8010D6E0 ;# ptr - .4byte 0x80109DF0 ;# ptr - .4byte 0x80109E00 ;# ptr + .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 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/libnw4r_snd/snd_SeqSound.s b/asm/libnw4r_snd/snd_SeqSound.s index d4a73f4e..9a9681df 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 - .4byte 0x8010DF00 ;# ptr + .byte4 __sinit_$$3snd_SeqSound_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail8SeqSound __vt__Q44nw4r3snd6detail8SeqSound: .4byte 0 .4byte 0 - .4byte 0x8010DEF0 ;# ptr - .4byte 0x8010DBA0 ;# ptr - .4byte 0x8010DAC0 ;# ptr - .4byte 0x8010DEE0 ;# ptr - .4byte 0x8010DD30 ;# ptr - .4byte 0x8010DD50 ;# ptr - .4byte 0x8010D810 ;# ptr - .4byte 0x8010DEC0 ;# ptr - .4byte 0x8010DED0 ;# ptr - .4byte 0x8010DC40 ;# ptr - .4byte 0x80106200 ;# ptr - .4byte 0x80106240 ;# ptr + .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 .global __vt__Q54nw4r3snd6detail8SeqSound11SeqLoadTask __vt__Q54nw4r3snd6detail8SeqSound11SeqLoadTask: .4byte 0 .4byte 0 - .4byte 0x8010D7B0 ;# ptr - .4byte 0x8010DD60 ;# ptr - .4byte 0x8010DE60 ;# ptr - .4byte 0x8010DE90 ;# ptr + .byte4 __dt__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv + .byte4 Execute__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv + .byte4 Cancel__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv + .byte4 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 45315357..c98a3ccd 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 - .4byte 0x8010ED20 ;# ptr + .byte4 ChannelCallbackFunc__Q44nw4r3snd6detail8SeqTrackFPQ44nw4r3snd6detail7ChannelQ54nw4r3snd6detail7Channel21ChannelCallbackStatusUl .4byte 0 .4byte 0 @@ -1481,7 +1481,7 @@ $$29834: __vt__Q44nw4r3snd6detail8SeqTrack: .4byte 0 .4byte 0 - .4byte 0x8010E000 ;# ptr + .byte4 __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 a4636edd..29b767f6 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 - .4byte 0x8010F470 ;# ptr - .4byte 0x8010F630 ;# ptr - .4byte 0x8010F670 ;# ptr - .4byte 0x8010F5F0 ;# ptr - .4byte 0x8010F610 ;# ptr + .byte4 __dt__Q34nw4r3snd10SoundActorFv + .byte4 detail_SetupSound__Q34nw4r3snd10SoundActorFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo + .byte4 detail_ConvertLabelStringToSoundId__Q34nw4r3snd10SoundActorFPCc + .byte4 SetupSound__Q34nw4r3snd10SoundActorFPQ34nw4r3snd11SoundHandleUlPCQ44nw4r3snd14SoundStartable9StartInfoPv + .byte4 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 36ab04ee..d1dc1f3d 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 - .4byte 0x8010F6D0 ;# ptr + .byte4 __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 c0934729..0aa715d5 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 - .4byte 0x80111500 ;# ptr - .4byte 0x801137F0 ;# ptr - .4byte 0x801138A0 ;# ptr + .byte4 __dt__Q34nw4r3snd18SoundArchivePlayerFv + .byte4 InvalidateData__Q34nw4r3snd18SoundArchivePlayerFPCvPCv + .byte4 InvalidateWaveData__Q34nw4r3snd18SoundArchivePlayerFPCvPCv .4byte 0 .4byte 0 - .4byte 0x80113BA0 ;# ptr - .4byte 0x80113B90 ;# ptr - .4byte 0x80113B80 ;# ptr - .4byte 0x8010F690 ;# ptr - .4byte 0x801125C0 ;# ptr + .byte4 $$212$$2__dt__Q34nw4r3snd18SoundArchivePlayerFv + .byte4 $$212$$2detail_SetupSound__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo + .byte4 $$212$$2detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc + .byte4 detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc + .byte4 detail_SetupSound__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo .global __vt__Q44nw4r3snd18SoundArchivePlayer11WsdCallback __vt__Q44nw4r3snd18SoundArchivePlayer11WsdCallback: .4byte 0 .4byte 0 - .4byte 0x80111490 ;# ptr - .4byte 0x80113A80 ;# ptr + .byte4 __dt__Q44nw4r3snd18SoundArchivePlayer11WsdCallbackFv + .byte4 GetWaveSoundData__Q44nw4r3snd18SoundArchivePlayer11WsdCallbackCFPQ44nw4r3snd6detail13WaveSoundInfoPQ44nw4r3snd6detail17WaveSoundNoteInfoPQ44nw4r3snd6detail8WaveInfoPCviiUl .global __vt__Q44nw4r3snd18SoundArchivePlayer17SeqNoteOnCallback __vt__Q44nw4r3snd18SoundArchivePlayer17SeqNoteOnCallback: .4byte 0 .4byte 0 - .4byte 0x80111480 ;# ptr - .4byte 0x80113950 ;# ptr + .byte4 __dt__Q44nw4r3snd18SoundArchivePlayer17SeqNoteOnCallbackFv + .byte4 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 65efc8a7..d0bf70c8 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 - .4byte 0x80113CA0 ;# ptr - .4byte 0x80113D30 ;# ptr + .byte4 __dt__Q34nw4r3snd9SoundHeapFv + .byte4 Alloc__Q34nw4r3snd9SoundHeapFUl diff --git a/asm/libnw4r_snd/snd_SoundSystem.s b/asm/libnw4r_snd/snd_SoundSystem.s index 73bdb281..94a1123a 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 - .4byte 0x80114C90 ;# ptr + .byte4 __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_: - .4byte 0x804424E0 + .byte4 $$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 9c465906..bd7fb861 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 - .4byte 0x801160B0 ;# ptr - .4byte 0x80116540 ;# ptr - .4byte 0x801168A0 ;# ptr - .4byte 0x80116A70 ;# ptr - .4byte 0x80118A20 ;# ptr - .4byte 0x80118A10 ;# ptr - .4byte 0x80118A00 ;# ptr + .byte4 __dt__Q44nw4r3snd6detail10StrmPlayerFv + .byte4 Start__Q44nw4r3snd6detail10StrmPlayerFv + .byte4 Stop__Q44nw4r3snd6detail10StrmPlayerFv + .byte4 Pause__Q44nw4r3snd6detail10StrmPlayerFb + .byte4 IsActive__Q44nw4r3snd6detail10StrmPlayerCFv + .byte4 IsStarted__Q44nw4r3snd6detail10StrmPlayerCFv + .byte4 IsPause__Q44nw4r3snd6detail10StrmPlayerCFv .4byte 0 .4byte 0 - .4byte 0x80118A60 ;# ptr - .4byte 0x80118A50 ;# ptr - .4byte 0x80118A40 ;# ptr - .4byte 0x80118A30 ;# ptr - .4byte 0x801189D0 ;# ptr - .4byte 0x801189E0 ;# ptr - .4byte 0x801189F0 ;# ptr + .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 .global __vt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTask __vt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTask: .4byte 0 .4byte 0 - .4byte 0x801160A0 ;# ptr - .4byte 0x80118860 ;# ptr - .4byte 0x80118930 ;# ptr - .4byte 0x801189C0 ;# ptr + .byte4 __dt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv + .byte4 Execute__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv + .byte4 Cancel__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv + .byte4 OnCancel__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv .global __vt__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTask __vt__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTask: .4byte 0 .4byte 0 - .4byte 0x80116090 ;# ptr - .4byte 0x80118700 ;# ptr - .4byte 0x80118750 ;# ptr - .4byte 0x80118760 ;# ptr + .byte4 __dt__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv + .byte4 Execute__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv + .byte4 Cancel__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv + .byte4 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 a5c7320d..32d27763 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 - .4byte 0x80119110 ;# ptr + .byte4 __sinit_$$3snd_StrmSound_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail9StrmSound __vt__Q44nw4r3snd6detail9StrmSound: .4byte 0 .4byte 0 - .4byte 0x80119100 ;# ptr - .4byte 0x80118F50 ;# ptr - .4byte 0x80118EB0 ;# ptr - .4byte 0x801190F0 ;# ptr - .4byte 0x801190A0 ;# ptr - .4byte 0x801190C0 ;# ptr - .4byte 0x80118B30 ;# ptr - .4byte 0x801190D0 ;# ptr - .4byte 0x801190E0 ;# ptr - .4byte 0x80118FB0 ;# ptr - .4byte 0x80118D50 ;# ptr - .4byte 0x80118DD0 ;# ptr + .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 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210414 diff --git a/asm/libnw4r_snd/snd_Util.s b/asm/libnw4r_snd/snd_Util.s index c26924a8..e7e7414d 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: - .4byte 0x8040C9EC - .4byte 0x8040CDF0 - .4byte 0x8040D1F4 + .byte4 Pan2RatioTableSqrt__Q44nw4r3snd6detail4Util + .byte4 Pan2RatioTableSinCos__Q44nw4r3snd6detail4Util + .byte4 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 6429feb5..1ea71c8f 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 - .4byte 0x80119CB0 ;# ptr - .4byte 0x8011C4D0 ;# ptr - .4byte 0x8011C380 ;# ptr + .byte4 __dt__Q44nw4r3snd6detail5VoiceFv + .byte4 InvalidateData__Q44nw4r3snd6detail5VoiceFPCvPCv + .byte4 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 74794224..6f118fa2 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 - .4byte 0x8011D550 ;# ptr - .4byte 0x8011E390 ;# ptr - .4byte 0x8011E2A0 ;# ptr - .4byte 0x8011E290 ;# ptr + .byte4 __dt__Q34nw4r3snd10WavePlayerFv + .byte4 OnUpdateFrameSoundThread__Q34nw4r3snd10WavePlayerFv + .byte4 OnUpdateVoiceSoundThread__Q34nw4r3snd10WavePlayerFv + .byte4 OnShutdownSoundThread__Q34nw4r3snd10WavePlayerFv .global __vt__Q44nw4r3snd10WavePlayer10WavePacket __vt__Q44nw4r3snd10WavePlayer10WavePacket: .4byte 0 .4byte 0 - .4byte 0x8011E3A0 ;# ptr + .byte4 __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 9bf8083d..591ac542 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 - .4byte 0x8011E700 ;# ptr + .byte4 __sinit_$$3snd_WaveSound_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail9WaveSound __vt__Q44nw4r3snd6detail9WaveSound: .4byte 0 .4byte 0 - .4byte 0x8011E6F0 ;# ptr - .4byte 0x8011E570 ;# ptr - .4byte 0x8011E4D0 ;# ptr - .4byte 0x8011E6E0 ;# ptr - .4byte 0x8011E690 ;# ptr - .4byte 0x8011E6B0 ;# ptr - .4byte 0x80105590 ;# ptr - .4byte 0x8011E6C0 ;# ptr - .4byte 0x8011E6D0 ;# ptr - .4byte 0x8011E5A0 ;# ptr - .4byte 0x80106200 ;# ptr - .4byte 0x80106240 ;# ptr + .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 .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 2e4a6538..45139260 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 - .4byte 0x8011E420 ;# ptr - .4byte 0x8011EDE0 ;# ptr - .4byte 0x8011EDF0 ;# ptr - .4byte 0x8011EF20 ;# ptr - .4byte 0x8011FAC0 ;# ptr - .4byte 0x8011FAA0 ;# ptr - .4byte 0x8011FA80 ;# ptr + .byte4 __dt__Q44nw4r3snd6detail9WsdPlayerFv + .byte4 Start__Q44nw4r3snd6detail9WsdPlayerFv + .byte4 Stop__Q44nw4r3snd6detail9WsdPlayerFv + .byte4 Pause__Q44nw4r3snd6detail9WsdPlayerFb + .byte4 IsActive__Q44nw4r3snd6detail9WsdPlayerCFv + .byte4 IsStarted__Q44nw4r3snd6detail9WsdPlayerCFv + .byte4 IsPause__Q44nw4r3snd6detail9WsdPlayerCFv .4byte 0 .4byte 0 - .4byte 0x8011FB00 ;# ptr - .4byte 0x8011FAF0 ;# ptr - .4byte 0x8011FAE0 ;# ptr + .byte4 $$2180$$2__dt__Q44nw4r3snd6detail9WsdPlayerFv + .byte4 $$2180$$2InvalidateData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv + .byte4 $$2180$$2InvalidateWaveData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv .4byte 0 .4byte 0 - .4byte 0x8011FB30 ;# ptr - .4byte 0x8011FB20 ;# ptr - .4byte 0x80109E20 ;# ptr - .4byte 0x8011FB10 ;# ptr - .4byte 0x8011F000 ;# ptr - .4byte 0x8011FA70 ;# ptr - .4byte 0x8011FA50 ;# ptr - .4byte 0x8011FA60 ;# ptr + .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 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210015 diff --git a/asm/libnw4r_ut/ut_DvdFileStream.s b/asm/libnw4r_ut/ut_DvdFileStream.s index c8f90950..4a8db164 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 - .4byte 0x80120E90 ;# ptr + .byte4 __sinit_$$3ut_DvdFileStream_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ut13DvdFileStream __vt__Q34nw4r2ut13DvdFileStream: .4byte 0 .4byte 0 - .4byte 0x80120E80 ;# ptr - .4byte 0x80120A10 ;# ptr - .4byte 0x80120B30 ;# ptr - .4byte 0x80120B80 ;# ptr - .4byte 0x80120C10 ;# ptr - .4byte 0x80120630 ;# ptr - .4byte 0x80120640 ;# ptr - .4byte 0x80108A40 ;# ptr - .4byte 0x80120E50 ;# ptr - .4byte 0x80108A20 ;# ptr - .4byte 0x80108A10 ;# ptr - .4byte 0x801089F0 ;# ptr - .4byte 0x801089E0 ;# ptr - .4byte 0x801089D0 ;# ptr - .4byte 0x80120E60 ;# ptr - .4byte 0x80120DD0 ;# ptr - .4byte 0x80120DE0 ;# ptr - .4byte 0x80120DF0 ;# ptr - .4byte 0x80108A30 ;# ptr - .4byte 0x80108A00 ;# ptr - .4byte 0x80120E70 ;# ptr - .4byte 0x80120D10 ;# ptr - .4byte 0x80120D50 ;# ptr + .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 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/libnw4r_ut/ut_DvdLockedFileStream.s b/asm/libnw4r_ut/ut_DvdLockedFileStream.s index 3daffe39..af8f6a93 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 - .4byte 0x80121280 ;# ptr + .byte4 __sinit_$$3ut_DvdLockedFileStream_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ut19DvdLockedFileStream __vt__Q34nw4r2ut19DvdLockedFileStream: .4byte 0 .4byte 0 - .4byte 0x80108A80 ;# ptr - .4byte 0x80120FC0 ;# ptr - .4byte 0x80121020 ;# ptr - .4byte 0x80121060 ;# ptr - .4byte 0x80108A70 ;# ptr - .4byte 0x80120630 ;# ptr - .4byte 0x80120640 ;# ptr - .4byte 0x80108A40 ;# ptr - .4byte 0x80108A50 ;# ptr - .4byte 0x80108A20 ;# ptr - .4byte 0x80108A10 ;# ptr - .4byte 0x801089F0 ;# ptr - .4byte 0x801089E0 ;# ptr - .4byte 0x801089D0 ;# ptr - .4byte 0x80120E60 ;# ptr - .4byte 0x80120DD0 ;# ptr - .4byte 0x80121220 ;# ptr - .4byte 0x80120DF0 ;# ptr - .4byte 0x80108A30 ;# ptr - .4byte 0x80108A00 ;# ptr - .4byte 0x80120E70 ;# ptr - .4byte 0x80121140 ;# ptr - .4byte 0x80108A60 ;# ptr + .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 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/libnw4r_ut/ut_FileStream.s b/asm/libnw4r_ut/ut_FileStream.s index 100a8f7f..1ccffca8 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 - .4byte 0x80120760 ;# ptr + .byte4 __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 9ccbb64f..7a405281 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 - .4byte 0x8011FE90 ;# ptr + .byte4 ReadNextCharUTF8__Q34nw4r2ut14CharStrmReaderFv .global $$2561 $$2561: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8011FF10 ;# ptr + .byte4 ReadNextCharUTF16__Q34nw4r2ut14CharStrmReaderFv .global $$2562 $$2562: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8011FF50 ;# ptr + .byte4 ReadNextCharSJIS__Q34nw4r2ut14CharStrmReaderFv .global $$2563 $$2563: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8011FF30 ;# ptr + .byte4 ReadNextCharCP1252__Q34nw4r2ut14CharStrmReaderFv diff --git a/asm/libnw4r_ut/ut_IOStream.s b/asm/libnw4r_ut/ut_IOStream.s index 2639709f..66794e5d 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 - .4byte 0x80120650 ;# ptr + .byte4 __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 d8ceb1a1..eae92cea 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 - .4byte 0x80121450 ;# ptr + .byte4 __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 feac12fd..8682c09b 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 - .4byte 0x80122340 ;# ptr - .4byte 0x80121C30 ;# ptr - .4byte 0x80121C40 ;# ptr - .4byte 0x80121C50 ;# ptr - .4byte 0x80121C60 ;# ptr - .4byte 0x80121C80 ;# ptr - .4byte 0x80121CA0 ;# ptr - .4byte 0x80121CB0 ;# ptr - .4byte 0x80121CC0 ;# ptr - .4byte 0x80121CD0 ;# ptr - .4byte 0x80121CE0 ;# ptr - .4byte 0x80121CF0 ;# ptr - .4byte 0x80121D00 ;# ptr - .4byte 0x80121D20 ;# ptr - .4byte 0x80121D40 ;# ptr - .4byte 0x80121E00 ;# ptr - .4byte 0x80121E10 ;# ptr - .4byte 0x80121E60 ;# ptr - .4byte 0x80121F80 ;# ptr - .4byte 0x80122050 ;# ptr - .4byte 0x80122110 ;# ptr + .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 0 diff --git a/asm/libnw4r_ut/ut_ResFontBase.s b/asm/libnw4r_ut/ut_ResFontBase.s index 3e297861..cc3b6c0a 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 - .4byte 0x8011FF30 ;# ptr + .byte4 ReadNextCharCP1252__Q34nw4r2ut14CharStrmReaderFv .global __vt__Q44nw4r2ut6detail11ResFontBase __vt__Q44nw4r2ut6detail11ResFontBase: .4byte 0 .4byte 0 - .4byte 0x80121BF0 ;# ptr - .4byte 0x80121C30 ;# ptr - .4byte 0x80121C40 ;# ptr - .4byte 0x80121C50 ;# ptr - .4byte 0x80121C60 ;# ptr - .4byte 0x80121C80 ;# ptr - .4byte 0x80121CA0 ;# ptr - .4byte 0x80121CB0 ;# ptr - .4byte 0x80121CC0 ;# ptr - .4byte 0x80121CD0 ;# ptr - .4byte 0x80121CE0 ;# ptr - .4byte 0x80121CF0 ;# ptr - .4byte 0x80121D00 ;# ptr - .4byte 0x80121D20 ;# ptr - .4byte 0x80121D40 ;# ptr - .4byte 0x80121E00 ;# ptr - .4byte 0x80121E10 ;# ptr - .4byte 0x80121E60 ;# ptr - .4byte 0x80121F80 ;# ptr - .4byte 0x80122050 ;# ptr - .4byte 0x80122110 ;# ptr + .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 diff --git a/asm/libnw4r_ut/ut_RomFont.s b/asm/libnw4r_ut/ut_RomFont.s index 082314c9..94959756 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 - .4byte 0x8011FF30 ;# ptr + .byte4 ReadNextCharCP1252__Q34nw4r2ut14CharStrmReaderFv .global __vt__Q34nw4r2ut7RomFont __vt__Q34nw4r2ut7RomFont: .4byte 0 .4byte 0 - .4byte 0x80121580 ;# ptr - .4byte 0x801216E0 ;# ptr - .4byte 0x801216F0 ;# ptr - .4byte 0x80121750 ;# ptr - .4byte 0x80121760 ;# ptr - .4byte 0x80121770 ;# ptr - .4byte 0x80121780 ;# ptr - .4byte 0x80121790 ;# ptr - .4byte 0x801217A0 ;# ptr - .4byte 0x801217B0 ;# ptr - .4byte 0x801217C0 ;# ptr - .4byte 0x801217D0 ;# ptr - .4byte 0x801217E0 ;# ptr - .4byte 0x80121800 ;# ptr - .4byte 0x80121820 ;# ptr - .4byte 0x801218B0 ;# ptr - .4byte 0x801218C0 ;# ptr - .4byte 0x80121950 ;# ptr - .4byte 0x801219A0 ;# ptr - .4byte 0x80121AA0 ;# ptr - .4byte 0x80121B60 ;# ptr + .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 .global __vt__Q34nw4r2ut4Font __vt__Q34nw4r2ut4Font: .4byte 0 .4byte 0 - .4byte 0x800F6560 ;# ptr + .byte4 __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 58adf978..9096764b 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 - .4byte 0x80120300 ;# ptr - .4byte 0x80120310 ;# ptr - .4byte 0x80120440 ;# ptr + .byte4 __dt__Q34nw4r2ut19TagProcessorBase$$0w$$1Fv + .byte4 Process__Q34nw4r2ut19TagProcessorBase$$0w$$1FUsPQ34nw4r2ut15PrintContext$$0w$$1 + .byte4 CalcRect__Q34nw4r2ut19TagProcessorBase$$0w$$1FPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext$$0w$$1 .global __vt__Q34nw4r2ut19TagProcessorBase$$0c$$1 __vt__Q34nw4r2ut19TagProcessorBase$$0c$$1: .4byte 0 .4byte 0 - .4byte 0x8011FFC0 ;# ptr - .4byte 0x8011FFD0 ;# ptr - .4byte 0x80120100 ;# ptr + .byte4 __dt__Q34nw4r2ut19TagProcessorBase$$0c$$1Fv + .byte4 Process__Q34nw4r2ut19TagProcessorBase$$0c$$1FUsPQ34nw4r2ut15PrintContext$$0c$$1 + .byte4 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 f530183d..77513aa6 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 - .4byte 0x80126C50 ;# ptr + .byte4 __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 0625eab1..5310223a 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: - .4byte 0x800A37D0 ;# ptr - .4byte 0x800A37E0 ;# ptr + .byte4 AllocatorAllocForExpHeap_ + .byte4 AllocatorFreeForExpHeap_ diff --git a/asm/nand/NANDCheck.s b/asm/nand/NANDCheck.s index fece58e1..df112eeb 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: - .4byte 0x80556660 - .4byte 0x80556668 - .4byte 0x804364D0 - .4byte 0x804364E0 - .4byte 0x804364F0 - .4byte 0x80436500 - .4byte 0x80436510 - .4byte 0x80436520 - .4byte 0x80436530 - .4byte 0x80436540 + .byte4 $$22292 + .byte4 $$22293 + .byte4 $$22294 + .byte4 $$22295 + .byte4 $$22296 + .byte4 $$22297 + .byte4 $$22298 + .byte4 $$22299 + .byte4 $$22300 + .byte4 $$22301 .4byte 0 .4byte 0 diff --git a/asm/nand/NANDCore.s b/asm/nand/NANDCore.s index 2aa502b1..bf78e1bf 100644 --- a/asm/nand/NANDCore.s +++ b/asm/nand/NANDCore.s @@ -1410,7 +1410,7 @@ s_currentDir: .4byte 0 .global s_shutdownFuncInfo s_shutdownFuncInfo: - .4byte 0x8004A010 ;# ptr + .byte4 nandOnShutdown .4byte 0x000000FF .4byte 0 .4byte 0 @@ -1441,7 +1441,7 @@ $$23880: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __NANDVersion __NANDVersion: - .4byte 0x80436380 + .byte4 $$22807 .global $$23783 $$23783: .4byte 0x2F000000 diff --git a/asm/nand/NANDErrorMessage.s b/asm/nand/NANDErrorMessage.s index a6eedb4e..d7a585ec 100644 --- a/asm/nand/NANDErrorMessage.s +++ b/asm/nand/NANDErrorMessage.s @@ -228,159 +228,159 @@ __NANDPrintErrorMessage: .section .rodata, "wa" # 0x80406560 - 0x80421040 .global __NANDMaxBlocksErrorMessageDefault __NANDMaxBlocksErrorMessageDefault: - .4byte 0x804365C8 - .4byte 0x80436624 - .4byte 0x80436690 - .4byte 0x8043670C - .4byte 0x8043679C - .4byte 0x8043682C - .4byte 0x804368BC + .byte4 $$21805 + .byte4 $$21806 + .byte4 $$21807 + .byte4 $$21808 + .byte4 $$21809 + .byte4 $$21810 + .byte4 $$21811 .global __NANDMaxBlocksErrorMessageEurope __NANDMaxBlocksErrorMessageEurope: - .4byte 0x804365C8 - .4byte 0x80436934 - .4byte 0x80436690 - .4byte 0x804369AC - .4byte 0x80436A38 - .4byte 0x8043682C - .4byte 0x804368BC + .byte4 $$21805 + .byte4 $$21812 + .byte4 $$21807 + .byte4 $$21813 + .byte4 $$21814 + .byte4 $$21810 + .byte4 $$21811 .global __NANDMaxFilesErrorMessageDefault __NANDMaxFilesErrorMessageDefault: - .4byte 0x80436BB4 - .4byte 0x80436624 - .4byte 0x80436690 - .4byte 0x80436C18 - .4byte 0x80436CA8 - .4byte 0x80436D38 - .4byte 0x80436DCC + .byte4 $$21817 + .byte4 $$21806 + .byte4 $$21807 + .byte4 $$21818 + .byte4 $$21819 + .byte4 $$21820 + .byte4 $$21821 .global __NANDMaxFilesErrorMessageEurope __NANDMaxFilesErrorMessageEurope: - .4byte 0x80436BB4 - .4byte 0x80436934 - .4byte 0x80436690 - .4byte 0x804369AC - .4byte 0x80436A38 - .4byte 0x80436D38 - .4byte 0x80436DCC + .byte4 $$21817 + .byte4 $$21812 + .byte4 $$21807 + .byte4 $$21813 + .byte4 $$21814 + .byte4 $$21820 + .byte4 $$21821 .global __NANDCorruptErrorMessageDefault __NANDCorruptErrorMessageDefault: - .4byte 0x80436F3C - .4byte 0x80436F90 - .4byte 0x80436FEC - .4byte 0x8043706C - .4byte 0x804370E8 - .4byte 0x80437168 - .4byte 0x804371E8 + .byte4 $$21824 + .byte4 $$21825 + .byte4 $$21826 + .byte4 $$21827 + .byte4 $$21828 + .byte4 $$21829 + .byte4 $$21830 .global __NANDCorruptErrorMessageEurope __NANDCorruptErrorMessageEurope: - .4byte 0x80436F3C - .4byte 0x80437254 - .4byte 0x804372B8 - .4byte 0x80437338 - .4byte 0x804373AC - .4byte 0x80437168 - .4byte 0x804371E8 + .byte4 $$21824 + .byte4 $$21831 + .byte4 $$21832 + .byte4 $$21833 + .byte4 $$21834 + .byte4 $$21829 + .byte4 $$21830 .global __NANDBusyErrorMessageDefault __NANDBusyErrorMessageDefault: - .4byte 0x80437504 - .4byte 0x80437574 - .4byte 0x804375CC - .4byte 0x80437660 - .4byte 0x804376E0 - .4byte 0x80437770 - .4byte 0x804377F8 + .byte4 $$21837 + .byte4 $$21838 + .byte4 $$21839 + .byte4 $$21840 + .byte4 $$21841 + .byte4 $$21842 + .byte4 $$21843 .global __NANDBusyErrorMessageEurope __NANDBusyErrorMessageEurope: - .4byte 0x80437504 - .4byte 0x8043787C - .4byte 0x804375CC - .4byte 0x804378E0 - .4byte 0x8043795C - .4byte 0x80437770 - .4byte 0x804377F8 + .byte4 $$21837 + .byte4 $$21844 + .byte4 $$21839 + .byte4 $$21845 + .byte4 $$21846 + .byte4 $$21842 + .byte4 $$21843 .global __NANDUnknownErrorMessageDefault __NANDUnknownErrorMessageDefault: - .4byte 0x80437AD4 - .4byte 0x80437B48 - .4byte 0x80437BB0 - .4byte 0x80437C4C - .4byte 0x80437D00 - .4byte 0x80437DA4 - .4byte 0x80437E68 + .byte4 $$21849 + .byte4 $$21850 + .byte4 $$21851 + .byte4 $$21852 + .byte4 $$21853 + .byte4 $$21854 + .byte4 $$21855 .global __NANDUnknownErrorMessageEurope __NANDUnknownErrorMessageEurope: - .4byte 0x80437AD4 - .4byte 0x80437F04 - .4byte 0x80437BB0 - .4byte 0x80437F98 - .4byte 0x80438048 - .4byte 0x80437DA4 - .4byte 0x80437E68 + .byte4 $$21849 + .byte4 $$21856 + .byte4 $$21851 + .byte4 $$21857 + .byte4 $$21858 + .byte4 $$21854 + .byte4 $$21855 .global $$21868 $$21868: .4byte 0xFFFFFF94 .4byte 0 - .4byte 0x80407A38 + .byte4 __NANDMaxBlocksErrorMessageDefault .4byte 0xFFFFFF95 .4byte 0 - .4byte 0x80407A70 + .byte4 __NANDMaxFilesErrorMessageDefault .4byte 0xFFFFFF99 .4byte 0 - .4byte 0x80407AA8 + .byte4 __NANDCorruptErrorMessageDefault .4byte 0xFFFFFF8A .4byte 0 - .4byte 0x80407AE0 + .byte4 __NANDBusyErrorMessageDefault .4byte 0xFFFFFFEA .4byte 0 - .4byte 0x80407AE0 + .byte4 __NANDBusyErrorMessageDefault .4byte 0xFFFFFF8B .4byte 0 - .4byte 0x80407B18 + .byte4 __NANDUnknownErrorMessageDefault .4byte 0xFFFFFFF7 .4byte 0 - .4byte 0x80407B18 + .byte4 __NANDUnknownErrorMessageDefault .4byte 0xFFFFFF94 .4byte 0x00000001 - .4byte 0x80407A54 + .byte4 __NANDMaxBlocksErrorMessageEurope .4byte 0xFFFFFF95 .4byte 0x00000001 - .4byte 0x80407A8C + .byte4 __NANDMaxFilesErrorMessageEurope .4byte 0xFFFFFF99 .4byte 0x00000001 - .4byte 0x80407AC4 + .byte4 __NANDCorruptErrorMessageEurope .4byte 0xFFFFFF8A .4byte 0x00000001 - .4byte 0x80407AFC + .byte4 __NANDBusyErrorMessageEurope .4byte 0xFFFFFFEA .4byte 0x00000001 - .4byte 0x80407AFC + .byte4 __NANDBusyErrorMessageEurope .4byte 0xFFFFFF8B .4byte 0x00000001 - .4byte 0x80407B34 + .byte4 __NANDUnknownErrorMessageEurope .4byte 0xFFFFFFF7 .4byte 0x00000001 - .4byte 0x80407B34 + .byte4 __NANDUnknownErrorMessageEurope .4byte 0xFFFFFF94 .4byte 0x00000002 - .4byte 0x8055E710 + .byte4 __NANDMaxBlocksErrorMessageChinaKorea .4byte 0xFFFFFF95 .4byte 0x00000002 - .4byte 0x8055E718 + .byte4 __NANDMaxFilesErrorMessageChinaKorea .4byte 0xFFFFFF99 .4byte 0x00000002 - .4byte 0x8055E720 + .byte4 __NANDCorruptErrorMessageChinaKorea .4byte 0xFFFFFF8A .4byte 0x00000002 - .4byte 0x8055E728 + .byte4 __NANDBusyErrorMessageChinaKorea .4byte 0xFFFFFFEA .4byte 0x00000002 - .4byte 0x8055E728 + .byte4 __NANDBusyErrorMessageChinaKorea .4byte 0xFFFFFF8B .4byte 0x00000002 - .4byte 0x8055E730 + .byte4 __NANDUnknownErrorMessageChinaKorea .4byte 0xFFFFFFF7 .4byte 0x00000002 - .4byte 0x8055E730 + .byte4 __NANDUnknownErrorMessageChinaKorea .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1497,24 +1497,24 @@ $$21860: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global __NANDMaxBlocksErrorMessageChinaKorea __NANDMaxBlocksErrorMessageChinaKorea: - .4byte 0x80436AC8 - .4byte 0x80436B3C + .byte4 $$21815 + .byte4 $$21816 .global __NANDMaxFilesErrorMessageChinaKorea __NANDMaxFilesErrorMessageChinaKorea: - .4byte 0x80436E4C - .4byte 0x80436EC4 + .byte4 $$21822 + .byte4 $$21823 .global __NANDCorruptErrorMessageChinaKorea __NANDCorruptErrorMessageChinaKorea: - .4byte 0x80437430 - .4byte 0x8043749C + .byte4 $$21835 + .byte4 $$21836 .global __NANDBusyErrorMessageChinaKorea __NANDBusyErrorMessageChinaKorea: - .4byte 0x804379EC - .4byte 0x80437A70 + .byte4 $$21847 + .byte4 $$21848 .global __NANDUnknownErrorMessageChinaKorea __NANDUnknownErrorMessageChinaKorea: - .4byte 0x804380F8 - .4byte 0x80438184 + .byte4 $$21859 + .byte4 $$21860 .global $$21888 $$21888: .4byte 0xFFFFFF00 diff --git a/asm/nrel/ExpHeapMapUser.s b/asm/nrel/ExpHeapMapUser.s index 2da9f9c5..981ed151 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: - .4byte 0x80556A98 + .byte4 __RTTI__Q44nrel6devkit7heapmap14ExpHeapMapUser .4byte 0 - .4byte 0x8014BC00 ;# ptr - .4byte 0x8014B9E8 ;# ptr - .4byte 0x8014B9EC ;# ptr - .4byte 0x8014B9F4 ;# ptr - .4byte 0x8014B9FC ;# ptr - .4byte 0x8014BA04 ;# ptr - .4byte 0x8014BA0C ;# ptr - .4byte 0x8014BA14 ;# ptr - .4byte 0x8014BA1C ;# ptr - .4byte 0x8014BB34 ;# ptr + .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 .global $$22500 $$22500: .asciz "nrel::devkit::heapmap::ExpHeapMapUser" .balign 4 .global $$22501 $$22501: - .4byte 0x80556AA0 + .byte4 __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser .4byte 0 .4byte 0 .4byte 0 .global __vt__Q44nrel6devkit7heapmap12IHeapMapUser __vt__Q44nrel6devkit7heapmap12IHeapMapUser: - .4byte 0x80556AA0 + .byte4 __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: - .4byte 0x80446C88 - .4byte 0x80446CB0 + .byte4 $$22500 + .byte4 $$22501 .global __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser: - .4byte 0x80446CF0 + .byte4 $$22502 .4byte 0 diff --git a/asm/os/OS.s b/asm/os/OS.s index 2ec7053b..5a205ea1 100644 --- a/asm/os/OS.s +++ b/asm/os/OS.s @@ -1649,7 +1649,7 @@ __OSExceptionLocations: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __OSVersion __OSVersion: - .4byte 0x80421DD8 + .byte4 $$21 .global $$21784 $$21784: .asciz "RVA 1\n" @@ -1671,7 +1671,7 @@ $$21187: .balign 4 .global AppGameNameForSysMenu AppGameNameForSysMenu: - .4byte 0x805564A8 + .byte4 $$21187 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/os/OSAlarm.s b/asm/os/OSAlarm.s index 89bf32ea..683f9be5 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: - .4byte 0x8001BF00 ;# ptr + .byte4 OnReset .4byte 0xFFFFFFFF .4byte 0 .4byte 0 diff --git a/asm/os/OSMemory.s b/asm/os/OSMemory.s index dc14296f..08c96683 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: - .4byte 0x80022320 ;# ptr + .byte4 OnShutdown .4byte 0x0000007F .4byte 0 .4byte 0 diff --git a/asm/os/OSThread.s b/asm/os/OSThread.s index 40a665df..a62d7ff2 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: - .4byte 0x800244A0 ;# ptr + .byte4 DefaultSwitchThreadCallback .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/os/OSUtf.s b/asm/os/OSUtf.s index de5cbc5c..3b01596d 100644 --- a/asm/os/OSUtf.s +++ b/asm/os/OSUtf.s @@ -12299,11 +12299,11 @@ UcsFF: .4byte 0 .global UcsSjisTable UcsSjisTable: - .4byte 0x80423A40 + .byte4 Ucs00 .4byte 0 .4byte 0 - .4byte 0x80423C40 - .4byte 0x80423E40 + .byte4 Ucs03 + .byte4 Ucs04 .4byte 0 .4byte 0 .4byte 0 @@ -12331,13 +12331,13 @@ UcsSjisTable: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80424040 - .4byte 0x80424240 - .4byte 0x80424440 - .4byte 0x80424640 + .byte4 Ucs20 + .byte4 Ucs21 + .byte4 Ucs22 + .byte4 Ucs23 .4byte 0 - .4byte 0x80424840 - .4byte 0x80424A40 + .byte4 Ucs25 + .byte4 Ucs26 .4byte 0 .4byte 0 .4byte 0 @@ -12347,7 +12347,7 @@ UcsSjisTable: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80424C40 + .byte4 Ucs30 .4byte 0 .4byte 0 .4byte 0 @@ -12377,88 +12377,88 @@ UcsSjisTable: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80424E40 - .4byte 0x80425040 - .4byte 0x80425240 - .4byte 0x80425440 - .4byte 0x80425640 - .4byte 0x80425840 - .4byte 0x80425A40 - .4byte 0x80425C40 - .4byte 0x80425E40 - .4byte 0x80426040 - .4byte 0x80426240 - .4byte 0x80426440 - .4byte 0x80426640 - .4byte 0x80426840 - .4byte 0x80426A40 - .4byte 0x80426C40 - .4byte 0x80426E40 - .4byte 0x80427040 - .4byte 0x80427240 - .4byte 0x80427440 - .4byte 0x80427640 - .4byte 0x80427840 - .4byte 0x80427A40 - .4byte 0x80427C40 - .4byte 0x80427E40 - .4byte 0x80428040 - .4byte 0x80428240 - .4byte 0x80428440 - .4byte 0x80428640 - .4byte 0x80428840 - .4byte 0x80428A40 - .4byte 0x80428C40 - .4byte 0x80428E40 - .4byte 0x80429040 - .4byte 0x80429240 - .4byte 0x80429440 - .4byte 0x80429640 - .4byte 0x80429840 - .4byte 0x80429A40 - .4byte 0x80429C40 - .4byte 0x80429E40 - .4byte 0x8042A040 - .4byte 0x8042A240 - .4byte 0x8042A440 - .4byte 0x8042A640 - .4byte 0x8042A840 - .4byte 0x8042AA40 - .4byte 0x8042AC40 - .4byte 0x8042AE40 - .4byte 0x8042B040 - .4byte 0x8042B240 - .4byte 0x8042B440 - .4byte 0x8042B640 - .4byte 0x8042B840 - .4byte 0x8042BA40 - .4byte 0x8042BC40 - .4byte 0x8042BE40 - .4byte 0x8042C040 - .4byte 0x8042C240 - .4byte 0x8042C440 - .4byte 0x8042C640 - .4byte 0x8042C840 - .4byte 0x8042CA40 - .4byte 0x8042CC40 - .4byte 0x8042CE40 - .4byte 0x8042D040 - .4byte 0x8042D240 - .4byte 0x8042D440 - .4byte 0x8042D640 - .4byte 0x8042D840 - .4byte 0x8042DA40 - .4byte 0x8042DC40 - .4byte 0x8042DE40 - .4byte 0x8042E040 - .4byte 0x8042E240 - .4byte 0x8042E440 - .4byte 0x8042E640 - .4byte 0x8042E840 - .4byte 0x8042EA40 - .4byte 0x8042EC40 - .4byte 0x8042EE40 - .4byte 0x8042F040 + .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 0 .4byte 0 .4byte 0 @@ -12554,4 +12554,4 @@ UcsSjisTable: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8042F240 + .byte4 UcsFF diff --git a/asm/pad/Pad.s b/asm/pad/Pad.s index 817200bf..26052b70 100644 --- a/asm/pad/Pad.s +++ b/asm/pad/Pad.s @@ -1758,7 +1758,7 @@ $$21: .balign 4 .global ShutdownFunctionInfo ShutdownFunctionInfo: - .4byte 0x80053C60 ;# ptr + .byte4 OnShutdown .4byte 0x0000007F .4byte 0 .4byte 0 @@ -1766,7 +1766,7 @@ ShutdownFunctionInfo: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __PADVersion __PADVersion: - .4byte 0x80438530 + .byte4 $$21 .global ResettingChan ResettingChan: .4byte 0x00000020 @@ -1781,7 +1781,7 @@ Spec: .4byte 0x00000005 .global MakeStatus MakeStatus: - .4byte 0x80053850 ;# ptr + .byte4 SPEC2_MakeStatus .global CmdReadOrigin CmdReadOrigin: .4byte 0x41000000 diff --git a/asm/sc/scsystem.s b/asm/sc/scsystem.s index 291d7440..35ae33e8 100644 --- a/asm/sc/scsystem.s +++ b/asm/sc/scsystem.s @@ -1820,81 +1820,81 @@ $$2871: .4byte 0 .global NameAndIDTbl NameAndIDTbl: - .4byte 0x8055667C + .byte4 $$2835 .4byte 0 - .4byte 0x80556684 + .byte4 $$2836 .4byte 0x00000001 - .4byte 0x80556690 + .byte4 $$2837 .4byte 0x00000002 - .4byte 0x80556698 + .byte4 $$2838 .4byte 0x00000003 - .4byte 0x805566A0 + .byte4 $$2839 .4byte 0x00000004 - .4byte 0x805566A8 + .byte4 $$2840 .4byte 0x00000005 - .4byte 0x805566B0 + .byte4 $$2841 .4byte 0x00000006 - .4byte 0x80438240 + .byte4 $$2842 .4byte 0x00000007 - .4byte 0x805566B8 + .byte4 $$2843 .4byte 0x00000008 - .4byte 0x805566C0 + .byte4 $$2844 .4byte 0x00000009 - .4byte 0x805566C8 + .byte4 $$2845 .4byte 0x0000000A - .4byte 0x805566D0 + .byte4 $$2846 .4byte 0x0000000B - .4byte 0x805566D8 + .byte4 $$2847 .4byte 0x0000000C - .4byte 0x805566E0 + .byte4 $$2848 .4byte 0x0000000D - .4byte 0x805566E8 + .byte4 $$2849 .4byte 0x0000000E - .4byte 0x805566F0 + .byte4 $$2850 .4byte 0x0000000F - .4byte 0x8043824C + .byte4 $$2851 .4byte 0x00000010 - .4byte 0x805566F8 + .byte4 $$2852 .4byte 0x00000011 - .4byte 0x80556700 + .byte4 $$2853 .4byte 0x00000012 - .4byte 0x80556708 + .byte4 $$2854 .4byte 0x00000013 - .4byte 0x80438258 + .byte4 $$2855 .4byte 0x00000014 - .4byte 0x80438264 + .byte4 $$2856 .4byte 0x00000015 - .4byte 0x80438270 + .byte4 $$2857 .4byte 0x00000016 - .4byte 0x8043827C + .byte4 $$2858 .4byte 0x00000017 - .4byte 0x80556710 + .byte4 $$2859 .4byte 0x00000018 - .4byte 0x80556718 + .byte4 $$2860 .4byte 0x00000019 - .4byte 0x80556720 + .byte4 $$2861 .4byte 0x0000001A - .4byte 0x80556728 + .byte4 $$2862 .4byte 0x0000001B - .4byte 0x80556730 + .byte4 $$2863 .4byte 0x0000001C - .4byte 0x80556738 + .byte4 $$2864 .4byte 0x0000001D - .4byte 0x80556740 + .byte4 $$2865 .4byte 0x0000001E - .4byte 0x80556748 + .byte4 $$2866 .4byte 0x0000001F - .4byte 0x80556750 + .byte4 $$2867 .4byte 0x00000020 - .4byte 0x80556758 + .byte4 $$2868 .4byte 0x00000021 - .4byte 0x80556760 + .byte4 $$2869 .4byte 0x00000022 - .4byte 0x80556768 + .byte4 $$2870 .4byte 0x00000023 - .4byte 0x80438288 + .byte4 $$2871 .4byte 0x00000024 - .4byte 0x80556770 + .byte4 $$2872 .4byte 0x00000025 .global $$22788 $$22788: @@ -1912,7 +1912,7 @@ $$22788: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __SCVersion __SCVersion: - .4byte 0x804381F8 + .byte4 $$21 .global $$2835 $$2835: .asciz "IPL.CB" diff --git a/asm/si/SIBios.s b/asm/si/SIBios.s index c4a794c3..ece57c60 100644 --- a/asm/si/SIBios.s +++ b/asm/si/SIBios.s @@ -1579,7 +1579,7 @@ Type: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __SIVersion __SIVersion: - .4byte 0x8042FB88 + .byte4 $$21 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/AbilityBase.s b/asm/src/AbilityBase.s index 417ed174..e489c179 100644 --- a/asm/src/AbilityBase.s +++ b/asm/src/AbilityBase.s @@ -99,25 +99,25 @@ isDepleted__Q43scn4step4hero11AbilityBaseCFv: __vt__Q43scn4step4hero11AbilityBase: .4byte 0 .4byte 0 - .4byte 0x8032B798 - .4byte 0x8032B79C - .4byte 0x8032B7A0 - .4byte 0x8032B7A4 - .4byte 0x8032B7A8 - .4byte 0x8032B7AC - .4byte 0x8032B7B0 - .4byte 0x8032B7B4 - .4byte 0x8032B7B8 - .4byte 0x8032B7BC - .4byte 0x8032B7C0 - .4byte 0x8032B7C4 - .4byte 0x8032B7C8 - .4byte 0x8032B7CC - .4byte 0x8032B7D0 - .4byte 0x8032B7D4 - .4byte 0x8032B7D8 - .4byte 0x8032B7DC - .4byte 0x8032B7E0 - .4byte 0x8032B7E4 - .4byte 0x8032B7E8 + .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 0 diff --git a/asm/src/AbilityCustomBase.s b/asm/src/AbilityCustomBase.s index 03b2bc79..6afe9e32 100644 --- a/asm/src/AbilityCustomBase.s +++ b/asm/src/AbilityCustomBase.s @@ -22,5 +22,5 @@ GetRuntimeTypeInfo__Q43scn4step4hero17AbilityCustomBaseCFv: __vt__Q43scn4step4hero17AbilityCustomBase: .4byte 0 .4byte 0 - .4byte 0x8032B804 - .4byte 0x8032B800 + .byte4 GetRuntimeTypeInfo__Q43scn4step4hero17AbilityCustomBaseCFv + .byte4 __dt__Q43scn4step4hero17AbilityCustomBaseFv diff --git a/asm/src/AbilityKindUtil.s b/asm/src/AbilityKindUtil.s index 5e31fb25..bb836e55 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: - .4byte 0x80482780 - .4byte 0x80482798 - .4byte 0x804827B0 - .4byte 0x80482780 - .4byte 0x804827C8 - .4byte 0x804827E0 - .4byte 0x80482780 - .4byte 0x80482780 - .4byte 0x804827F8 - .4byte 0x80482810 - .4byte 0x80482780 - .4byte 0x80482828 - .4byte 0x80482780 - .4byte 0x80482780 - .4byte 0x80482780 - .4byte 0x80482780 - .4byte 0x80482780 - .4byte 0x80482840 - .4byte 0x80482780 - .4byte 0x80482858 - .4byte 0x80482780 - .4byte 0x80482870 - .4byte 0x80482780 - .4byte 0x80482780 - .4byte 0x80482888 - .4byte 0x80482780 - .4byte 0x80482780 - .4byte 0x80482780 - .4byte 0x80482780 - .4byte 0x80482780 - .4byte 0x80482780 - .4byte 0x80482780 - .4byte 0x80482780 - .4byte 0x804828A0 - .4byte 0x804828B0 - .4byte 0x804828C4 + .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 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249304 diff --git a/asm/src/AbilityPanel.s b/asm/src/AbilityPanel.s index 2ba5e7c6..1dfe4e87 100644 --- a/asm/src/AbilityPanel.s +++ b/asm/src/AbilityPanel.s @@ -473,20 +473,20 @@ $$251791: .4byte 0x00000024 .global $$251826 $$251826: - .4byte 0x80558058 - .4byte 0x80558060 - .4byte 0x80558068 - .4byte 0x80558070 - .4byte 0x8045FAB8 - .4byte 0x8045FAC4 - .4byte 0x80558078 - .4byte 0x80558080 - .4byte 0x80558088 - .4byte 0x80558090 - .4byte 0x80558098 - .4byte 0x805580A0 - .4byte 0x8045FAD0 - .4byte 0x8045FADC + .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 .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: - .4byte 0x8045F9D8 - .4byte 0x8045F9EC - .4byte 0x8045FA00 - .4byte 0x8045FA18 - .4byte 0x8045FA2C - .4byte 0x8045FA40 - .4byte 0x8045FA54 + .byte4 $$251574 + .byte4 $$251575 + .byte4 $$251576 + .byte4 $$251577 + .byte4 $$251578 + .byte4 $$251579 + .byte4 $$251580 .global $$252687 $$252687: .asciz "challengeability/Main" diff --git a/asm/src/AbilitySelect.s b/asm/src/AbilitySelect.s index ffef76e2..e74925fb 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: - .4byte 0x805580F0 - .4byte 0x805580F8 - .4byte 0x80558100 - .4byte 0x80558108 - .4byte 0x80558110 - .4byte 0x80558118 - .4byte 0x80558120 + .byte4 $$251749 + .byte4 $$251750 + .byte4 $$251751 + .byte4 $$251752 + .byte4 $$251753 + .byte4 $$251754 + .byte4 $$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: - .4byte 0x8045FB74 - .4byte 0x8045FB84 - .4byte 0x8045FB94 + .byte4 $$251757 + .byte4 $$251758 + .byte4 $$251759 .global areaPanelTbl__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 areaPanelTbl__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2: - .4byte 0x80415948 - .4byte 0x80415980 - .4byte 0x804159B8 + .byte4 area1Panel__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 + .byte4 area2Panel__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 + .byte4 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 9c5dc1eb..f662232a 100644 --- a/asm/src/ActionAttack.s +++ b/asm/src/ActionAttack.s @@ -287,21 +287,21 @@ $$252816: __vt__Q53scn4step7gimmick10guideboard12ActionAttack: .4byte 0 .4byte 0 - .4byte 0x8031027C - .4byte 0x80310284 - .4byte 0x80310294 - .4byte 0x80310318 - .4byte 0x80310340 - .4byte 0x80310570 - .4byte 0x8031056C - .4byte 0x80310568 - .4byte 0x80310564 - .4byte 0x80310560 - .4byte 0x8031055C - .4byte 0x80310558 - .4byte 0x80310554 - .4byte 0x80310550 - .4byte 0x803103C8 + .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 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252801 diff --git a/asm/src/ActionDrink.s b/asm/src/ActionDrink.s index b19819b8..362d7e00 100644 --- a/asm/src/ActionDrink.s +++ b/asm/src/ActionDrink.s @@ -336,21 +336,21 @@ $$252932: __vt__Q53scn4step7gimmick10guideboard11ActionDrink: .4byte 0 .4byte 0 - .4byte 0x803105C8 - .4byte 0x803105D0 - .4byte 0x803105D4 - .4byte 0x80310624 - .4byte 0x80310698 - .4byte 0x80310720 - .4byte 0x8031056C - .4byte 0x80310894 - .4byte 0x80310564 - .4byte 0x80310560 - .4byte 0x8031055C - .4byte 0x80310558 - .4byte 0x80310554 - .4byte 0x80310550 - .4byte 0x80310574 + .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 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/ActionHover.s b/asm/src/ActionHover.s index 9ce812bd..110244b7 100644 --- a/asm/src/ActionHover.s +++ b/asm/src/ActionHover.s @@ -207,21 +207,21 @@ $$252816: __vt__Q53scn4step7gimmick10guideboard11ActionHover: .4byte 0 .4byte 0 - .4byte 0x80310A48 - .4byte 0x80310A50 - .4byte 0x80310A54 - .4byte 0x80310AA4 - .4byte 0x80310AA8 - .4byte 0x80310570 - .4byte 0x8031056C - .4byte 0x80310568 - .4byte 0x80310564 - .4byte 0x80310B30 - .4byte 0x8031055C - .4byte 0x80310558 - .4byte 0x80310554 - .4byte 0x80310550 - .4byte 0x80310574 + .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 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252801 diff --git a/asm/src/ActionRun.s b/asm/src/ActionRun.s index 957d4fbc..b24dbb7a 100644 --- a/asm/src/ActionRun.s +++ b/asm/src/ActionRun.s @@ -308,21 +308,21 @@ $$253279: __vt__Q53scn4step7gimmick10guideboard9ActionRun: .4byte 0 .4byte 0 - .4byte 0x80310CF0 - .4byte 0x80310CF8 - .4byte 0x80310CFC - .4byte 0x80310D4C - .4byte 0x80310D50 - .4byte 0x80310570 - .4byte 0x8031056C - .4byte 0x80310568 - .4byte 0x80310564 - .4byte 0x80310560 - .4byte 0x8031055C - .4byte 0x80310558 - .4byte 0x80310554 - .4byte 0x80310550 - .4byte 0x80310574 + .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 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253250 diff --git a/asm/src/ActionThroughLand.s b/asm/src/ActionThroughLand.s index b1ae2559..948f7bef 100644 --- a/asm/src/ActionThroughLand.s +++ b/asm/src/ActionThroughLand.s @@ -313,21 +313,21 @@ $$253269: __vt__Q53scn4step7gimmick10guideboard17ActionThroughLand: .4byte 0 .4byte 0 - .4byte 0x80311108 - .4byte 0x80311110 - .4byte 0x80311134 - .4byte 0x803111D8 - .4byte 0x803111DC - .4byte 0x80310570 - .4byte 0x8031056C - .4byte 0x80310568 - .4byte 0x80310564 - .4byte 0x80310560 - .4byte 0x8031055C - .4byte 0x80310558 - .4byte 0x80310554 - .4byte 0x80311378 - .4byte 0x80310574 + .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 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253223 diff --git a/asm/src/ActionVacuumSuper.s b/asm/src/ActionVacuumSuper.s index 06a5dea5..a707a2d8 100644 --- a/asm/src/ActionVacuumSuper.s +++ b/asm/src/ActionVacuumSuper.s @@ -311,21 +311,21 @@ $$252901: __vt__Q53scn4step7gimmick10guideboard17ActionVacuumSuper: .4byte 0 .4byte 0 - .4byte 0x80311538 - .4byte 0x80310578 - .4byte 0x80311540 - .4byte 0x80311590 - .4byte 0x80311630 - .4byte 0x80310570 - .4byte 0x8031056C - .4byte 0x80310568 - .4byte 0x80310564 - .4byte 0x80310560 - .4byte 0x803116B8 - .4byte 0x80311734 - .4byte 0x80311794 - .4byte 0x80310550 - .4byte 0x80310574 + .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 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/ActionVomit.s b/asm/src/ActionVomit.s index f5eb6655..20ee6280 100644 --- a/asm/src/ActionVomit.s +++ b/asm/src/ActionVomit.s @@ -336,21 +336,21 @@ $$252932: __vt__Q53scn4step7gimmick10guideboard11ActionVomit: .4byte 0 .4byte 0 - .4byte 0x80311954 - .4byte 0x8031195C - .4byte 0x80311960 - .4byte 0x803119B0 - .4byte 0x80311A24 - .4byte 0x80311AAC - .4byte 0x80311C20 - .4byte 0x80310568 - .4byte 0x80310564 - .4byte 0x80310560 - .4byte 0x8031055C - .4byte 0x80310558 - .4byte 0x80310554 - .4byte 0x80310550 - .4byte 0x80310574 + .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 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/ActorDiamond.s b/asm/src/ActorDiamond.s index 02d081e6..9da0990e 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 - .4byte 0x801B141C ;# ptr - .4byte 0x801B312C ;# ptr - .4byte 0x801B3124 ;# ptr - .4byte 0x801B3134 ;# ptr - .4byte 0x801B3184 ;# ptr + .byte4 __dt__Q35mcoll6detail12ActorDiamondFv + .byte4 actorCurrentPos__Q35mcoll6detail12ActorDiamondCFv + .byte4 actorSetCurrentPos__Q35mcoll6detail12ActorDiamondFRCQ33hel4math7Vector2 + .byte4 actorDetect__Q35mcoll6detail12ActorDiamondFRCQ35mcoll6detail7LandSetRQ35mcoll6detail10IResponderRCQ33hel4math7Vector2RCQ35mcoll6detail17ActorDetectOption + .byte4 actorDrawDebug__Q35mcoll6detail12ActorDiamondCFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/AddOnMathDirection3.s b/asm/src/AddOnMathDirection3.s index ec07f0c6..d9c7fc4b 100644 --- a/asm/src/AddOnMathDirection3.s +++ b/asm/src/AddOnMathDirection3.s @@ -1069,32 +1069,32 @@ $$254687: $$254769: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801A1468 ;# ptr + .byte4 restructLeftUp__Q33hel4math10Direction3Fv .global $$254815 $$254815: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801A155C ;# ptr + .byte4 restructLeftFront__Q33hel4math10Direction3Fv .global $$254827 $$254827: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801A15F4 ;# ptr + .byte4 restructUpLeft__Q33hel4math10Direction3Fv .global $$254840 $$254840: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801A168C ;# ptr + .byte4 restructUpFront__Q33hel4math10Direction3Fv .global $$254854 $$254854: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801A1724 ;# ptr + .byte4 restructFrontLeft__Q33hel4math10Direction3Fv .global $$254863 $$254863: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801A17BC ;# ptr + .byte4 restructFrontUp__Q33hel4math10Direction3Fv .asciz "Assertion failed.\n" .balign 4 .asciz "MintFuncProxy.hpp" diff --git a/asm/src/AddOnMint.s b/asm/src/AddOnMint.s index 0c56c502..f26a6404 100644 --- a/asm/src/AddOnMint.s +++ b/asm/src/AddOnMint.s @@ -31648,57 +31648,57 @@ $$255070: $$255246: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80198B8C ;# ptr + .byte4 currentG3DAnimIndex__Q24gobj12MintGearAnimCFv .global $$255273 $$255273: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80198C58 ;# ptr + .byte4 setFrameRate__Q24gobj12MintGearAnimCFf .global $$255285 $$255285: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80198D64 ;# ptr + .byte4 frameRate__Q24gobj12MintGearAnimCFv .global $$255299 $$255299: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80198DB4 ;# ptr + .byte4 isLooped__Q24gobj12MintGearAnimCFv .global $$255318 $$255318: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80198E90 ;# ptr + .byte4 isAnimEnd__Q24gobj12MintGearAnimCFv .global $$255327 $$255327: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80198EE0 ;# ptr + .byte4 setFrame__Q24gobj12MintGearAnimFf .global $$255336 $$255336: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80198F30 ;# ptr + .byte4 totalFrame__Q24gobj12MintGearAnimCFv .global $$255350 $$255350: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80199014 ;# ptr + .byte4 frame__Q24gobj12MintGearAnimCFv .global $$255359 $$255359: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801990C0 ;# ptr + .byte4 start__Q24gobj12MintGearAnimCFUlbUl .global $$255366 $$255366: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80199158 ;# ptr + .byte4 start__Q24gobj12MintGearAnimCFUlb .global $$255373 $$255373: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801991DC ;# ptr + .byte4 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 - .4byte 0x802373A0 ;# ptr - .4byte 0x80237264 ;# ptr + .byte4 __dt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers18StateRainBombStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1Fv + .byte4 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 - .4byte 0x8023739C ;# ptr - .4byte 0x802372B0 ;# ptr + .byte4 __dt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers9StateBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers9StateBomb6Config$$1Fv + .byte4 create__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers9StateBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers9StateBomb6Config$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers14StateBombStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers14StateBombStart$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x80237398 ;# ptr - .4byte 0x80237310 ;# ptr + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers14StateBombStart$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers14StateBombStart$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateSwingPursuit$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateSwingPursuit$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x80237394 ;# ptr - .4byte 0x8023732C ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateSwingPursuit$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateSwingPursuit$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers10StateSwing$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers10StateSwing$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x80237390 ;# ptr - .4byte 0x80237348 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers10StateSwing$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers10StateSwing$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateJumpBigStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateJumpBigStart$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8023738C ;# ptr - .4byte 0x80237364 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers17StateJumpBigStart$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 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 - .4byte 0x80237388 ;# ptr - .4byte 0x802371BC ;# ptr + .byte4 __dt__Q24util165StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1Fv + .byte4 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 - .4byte 0x80237384 ;# ptr - .4byte 0x802371E0 ;# ptr + .byte4 __dt__Q24util173StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1Fv + .byte4 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 - .4byte 0x80237380 ;# ptr - .4byte 0x80237240 ;# ptr + .byte4 __dt__Q24util170StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1Fv + .byte4 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 - .4byte 0x80239E2C ;# ptr - .4byte 0x80239E10 ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSummon$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 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 - .4byte 0x8024C990 ;# ptr - .4byte 0x8024C88C ;# ptr + .byte4 __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateShot$$4PQ43scn4step4boss4Boss$$4f$$1Fv + .byte4 create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateShot$$4PQ43scn4step4boss4Boss$$4f$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior21StateMoveThunderStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior21StateMoveThunderStart$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8024C98C ;# ptr - .4byte 0x8024C8CC ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior21StateMoveThunderStart$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior21StateMoveThunderStart$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateThunderStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateThunderStart$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8024C988 ;# ptr - .4byte 0x8024C8E8 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateThunderStart$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateThunderStart$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior10StateGlide$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior10StateGlide$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8024C984 ;# ptr - .4byte 0x8024C904 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior10StateGlide$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior10StateGlide$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateDash$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateDash$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8024C980 ;# ptr - .4byte 0x8024C920 ;# ptr + .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateDash$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateDash$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateHeightAdjust$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateHeightAdjust$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8024C97C ;# ptr - .4byte 0x8024C93C ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateHeightAdjust$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior17StateHeightAdjust$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior20StateMoveToOtherSide$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior20StateMoveToOtherSide$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8024C978 ;# ptr - .4byte 0x8024C958 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior20StateMoveToOtherSide$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 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 - .4byte 0x8024C974 ;# ptr - .4byte 0x8024C8AC ;# ptr + .byte4 __dt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateCall$$4PQ43scn4step4boss4Boss$$4Ul$$1Fv + .byte4 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 - .4byte 0x80251B40 ;# ptr - .4byte 0x80251A30 ;# ptr + .byte4 __dt__Q24util228StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv + .byte4 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 - .4byte 0x80251B3C ;# ptr - .4byte 0x80251AC0 ;# ptr + .byte4 __dt__Q24util140StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10gigantedge9StateShot$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss10gigantedge9StateShot6Config$$1Fv + .byte4 create__Q24util140StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10gigantedge9StateShot$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss10gigantedge9StateShot6Config$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10gigantedge10StateGuard$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10gigantedge10StateGuard$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x80251B38 ;# ptr - .4byte 0x80251B0C ;# ptr + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10gigantedge10StateGuard$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 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 - .4byte 0x80251B34 ;# ptr - .4byte 0x80251A04 ;# ptr + .byte4 __dt__Q24util251StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv + .byte4 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 - .4byte 0x80251B30 ;# ptr - .4byte 0x80251A58 ;# ptr + .byte4 __dt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common13StateMoveBack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv + .byte4 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 - .4byte 0x80251B2C ;# ptr - .4byte 0x80251AB8 ;# ptr + .byte4 __dt__Q24util177StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv + .byte4 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 - .4byte 0x80251B28 ;# ptr - .4byte 0x80251ABC ;# ptr + .byte4 __dt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv + .byte4 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 - .4byte 0x802534E0 ;# ptr - .4byte 0x80253420 ;# ptr + .byte4 __dt__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo17StateChargeAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss8kingsdoo17StateChargeAttack6Config$$1Fv + .byte4 create__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo17StateChargeAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss8kingsdoo17StateChargeAttack6Config$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo22StateChargeAttackStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo22StateChargeAttackStart$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x802534DC ;# ptr - .4byte 0x8025346C ;# ptr + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo22StateChargeAttackStart$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo22StateChargeAttackStart$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x802534D8 ;# ptr - .4byte 0x80253488 ;# ptr + .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo21StateJumpCenterAttack$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo21StateJumpCenterAttack$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x802534D4 ;# ptr - .4byte 0x802534A4 ;# ptr + .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo21StateJumpCenterAttack$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 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 - .4byte 0x802534D0 ;# ptr - .4byte 0x802533EC ;# ptr + .byte4 __dt__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv + .byte4 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 - .4byte 0x802534CC ;# ptr - .4byte 0x802533F0 ;# ptr + .byte4 __dt__Q24util210StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv + .byte4 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 - .4byte 0x802534C8 ;# ptr - .4byte 0x802533E8 ;# ptr + .byte4 __dt__Q24util242StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv + .byte4 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 - .4byte 0x802534C4 ;# ptr - .4byte 0x80253418 ;# ptr + .byte4 __dt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv + .byte4 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 - .4byte 0x802534C0 ;# ptr - .4byte 0x8025341C ;# ptr + .byte4 __dt__Q24util171StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1Fv + .byte4 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 - .4byte 0x80255638 ;# ptr - .4byte 0x802555A4 ;# ptr + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateTornadoRise$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateTornadoRise$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateRollingStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateRollingStart$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x80255634 ;# ptr - .4byte 0x802555C0 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateRollingStart$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 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 - .4byte 0x80255630 ;# ptr - .4byte 0x802554DC ;# ptr + .byte4 __dt__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv + .byte4 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 - .4byte 0x8025562C ;# ptr - .4byte 0x80255534 ;# ptr + .byte4 __dt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv + .byte4 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 - .4byte 0x80255628 ;# ptr - .4byte 0x80255538 ;# ptr + .byte4 __dt__Q24util146StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath13StateRollJump$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9moundeath13StateRollJump6Config$$1Fv + .byte4 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 - .4byte 0x80255624 ;# ptr - .4byte 0x80255584 ;# ptr + .byte4 __dt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv + .byte4 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 - .4byte 0x80255620 ;# ptr - .4byte 0x802554E0 ;# ptr + .byte4 __dt__Q24util167StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv + .byte4 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 - .4byte 0x8025561C ;# ptr - .4byte 0x802555DC ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath9StateJump$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath9StateJump$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateMoveForward$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateMoveForward$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x80255618 ;# ptr - .4byte 0x802555F8 ;# ptr + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateMoveForward$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 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 - .4byte 0x80255614 ;# ptr - .4byte 0x802554E4 ;# ptr + .byte4 __dt__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1Fv + .byte4 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 - .4byte 0x80259630 ;# ptr - .4byte 0x80259600 ;# ptr + .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros18StateCaptureAttack$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 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 - .4byte 0x8025962C ;# ptr - .4byte 0x80259564 ;# ptr + .byte4 __dt__Q24util260StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv + .byte4 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 - .4byte 0x80259628 ;# ptr - .4byte 0x8025956C ;# ptr + .byte4 __dt__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateQuivery$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss13watergalboros12StateQuivery6Config$$1Fv + .byte4 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 - .4byte 0x80259624 ;# ptr - .4byte 0x802595C0 ;# ptr + .byte4 __dt__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv + .byte4 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 - .4byte 0x80259620 ;# ptr - .4byte 0x802595E0 ;# ptr + .byte4 __dt__Q24util149StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros16StateAttackJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv + .byte4 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 - .4byte 0x8025961C ;# ptr - .4byte 0x80259568 ;# ptr + .byte4 __dt__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1Fv + .byte4 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 - .4byte 0x8025B8EC ;# ptr - .4byte 0x8025B8A0 ;# ptr + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy15StateRootAttack$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy15StateRootAttack$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateVacuumStart$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateVacuumStart$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8025B8E8 ;# ptr - .4byte 0x8025B8BC ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateVacuumStart$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 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 - .4byte 0x8025B8E4 ;# ptr - .4byte 0x8025B87C ;# ptr + .byte4 __dt__Q24util134StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateFallEnemy$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6whispy10ScriptKind$$4Ul$$1Fv + .byte4 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 - .4byte 0x8025B8E0 ;# ptr - .4byte 0x8025B804 ;# ptr + .byte4 __dt__Q24util113StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy23StateShotAirBallTornado$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1Fv + .byte4 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 - .4byte 0x8025B8DC ;# ptr - .4byte 0x8025B82C ;# ptr + .byte4 __dt__Q24util109StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy19StateShotAirBallBig$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1Fv + .byte4 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 - .4byte 0x8025B8D8 ;# ptr - .4byte 0x8025B854 ;# ptr + .byte4 __dt__Q24util106StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateShotAirBall$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1Fv + .byte4 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 - .4byte 0x80260384 ;# ptr - .4byte 0x802602B8 ;# ptr + .byte4 __dt__Q24util212StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv + .byte4 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 - .4byte 0x80260380 ;# ptr - .4byte 0x802602C4 ;# ptr + .byte4 __dt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1Fv + .byte4 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 - .4byte 0x8026037C ;# ptr - .4byte 0x80260310 ;# ptr + .byte4 __dt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble11StateAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble11StateAttack6Config$$1Fv + .byte4 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 - .4byte 0x80260378 ;# ptr - .4byte 0x802602B4 ;# ptr + .byte4 __dt__Q24util245StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9StateDash$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv + .byte4 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 - .4byte 0x80260374 ;# ptr - .4byte 0x802602BC ;# ptr + .byte4 __dt__Q24util175StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateMoveForward$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateMoveDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv + .byte4 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 - .4byte 0x80260370 ;# ptr - .4byte 0x802602C0 ;# ptr + .byte4 __dt__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv + .byte4 create__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv .4byte 0 .4byte 0 .4byte 0 @@ -33236,72 +33236,72 @@ $$258935: $$259186: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8026BD28 ;# ptr + .byte4 releaseAndVanish__Q43scn4step5chara10MintEffectCFv .global $$259211 $$259211: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8026BDD4 ;# ptr + .byte4 release__Q43scn4step5chara10MintEffectCFv .global $$259220 $$259220: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8026BEA8 ;# ptr + .byte4 requestND__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math10Direction3RCQ33hel4math7Vector3f .global $$259229 $$259229: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8026BF68 ;# ptr + .byte4 requestND__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math10Direction3RCQ33hel4math7Vector3 .global $$259238 $$259238: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8026C028 ;# ptr + .byte4 requestND__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math10Direction3f .global $$259246 $$259246: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8026C0D4 ;# ptr + .byte4 requestND__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math10Direction3 .global $$259254 $$259254: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8026C194 ;# ptr + .byte4 requestN__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math7Vector3f .global $$259262 $$259262: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8026C240 ;# ptr + .byte4 requestN__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlRCQ33hel4math7Vector3 .global $$259270 $$259270: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8026C2EC ;# ptr + .byte4 requestN__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUlf .global $$259277 $$259277: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8026C384 ;# ptr + .byte4 requestN__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindUl .global $$259284 $$259284: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8026C444 ;# ptr + .byte4 requestPD__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindRCQ33hel4math7Vector3RCQ33hel4math10Direction3f .global $$259293 $$259293: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8026C4F0 ;# ptr + .byte4 requestPD__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindRCQ33hel4math7Vector3RCQ33hel4math10Direction3 .global $$259302 $$259302: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8026C59C ;# ptr + .byte4 requestP__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindRCQ33hel4math7Vector3f .global $$259310 $$259310: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8026C634 ;# ptr + .byte4 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 - .4byte 0x80290F8C ;# ptr - .4byte 0x80290F10 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x80290F88 ;# ptr - .4byte 0x80290F2C ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80290F84 ;# ptr - .4byte 0x80290F48 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80290F80 ;# ptr - .4byte 0x80290F64 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x80296D04 ;# ptr - .4byte 0x80296C68 ;# ptr + .byte4 __dt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight13StateStepBack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight13StateStepBack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80296D00 ;# ptr - .4byte 0x80296C84 ;# ptr + .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight13StateStepBack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight13StateStepBack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight9StateWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80296CFC ;# ptr - .4byte 0x80296CA0 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight17StateDoubleAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight17StateDoubleAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80296CF8 ;# ptr - .4byte 0x80296CBC ;# ptr + .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight17StateDoubleAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight17StateDoubleAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80296CF4 ;# ptr - .4byte 0x80296CD8 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x80298A28 ;# ptr - .4byte 0x8029892C ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateDive$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateDive$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80298A24 ;# ptr - .4byte 0x80298948 ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateDive$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateDive$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80298A20 ;# ptr - .4byte 0x80298964 ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper14StateFlyingOut$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper14StateFlyingOut$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80298A1C ;# ptr - .4byte 0x80298980 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper14StateFlyingOut$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper14StateFlyingOut$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80298A18 ;# ptr - .4byte 0x8029899C ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80298A14 ;# ptr - .4byte 0x802989B8 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateMove$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80298A10 ;# ptr - .4byte 0x802989D4 ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80298A0C ;# ptr - .4byte 0x802989F0 ;# ptr + .byte4 __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x8029CB3C ;# ptr - .4byte 0x8029CAE0 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x8029CB38 ;# ptr - .4byte 0x8029CAFC ;# ptr + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x8029CB34 ;# ptr - .4byte 0x8029CB18 ;# ptr + .byte4 __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x8029E240 ;# ptr - .4byte 0x8029E224 ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5bowby11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802A0BCC ;# ptr - .4byte 0x802A0B70 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802A0BC8 ;# ptr - .4byte 0x802A0B8C ;# ptr + .byte4 __dt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802A0BC4 ;# ptr - .4byte 0x802A0BA8 ;# ptr + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802A2404 ;# ptr - .4byte 0x802A23E8 ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802A5F94 ;# ptr - .4byte 0x802A5F18 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateLookAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateLookAround$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802A5F90 ;# ptr - .4byte 0x802A5F34 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateLookAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateLookAround$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802A5F8C ;# ptr - .4byte 0x802A5F50 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateCreditMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateCreditMove$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802A5F88 ;# ptr - .4byte 0x802A5F6C ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateCreditMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802A6C84 ;# ptr - .4byte 0x802A6C68 ;# ptr + .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateDive$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802ACF38 ;# ptr - .4byte 0x802ACF1C ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802ADEE4 ;# ptr - .4byte 0x802ADE9C ;# ptr + .byte4 __dt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateBack$$4PQ43scn4step5enemy5Enemy$$4f$$1Fv + .byte4 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 - .4byte 0x802ADEE0 ;# ptr - .4byte 0x802ADE78 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateMove$$4PQ43scn4step5enemy5Enemy$$4f$$4f$$1Fv + .byte4 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 - .4byte 0x802ADEDC ;# ptr - .4byte 0x802ADEBC ;# ptr + .byte4 __dt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr8StateFly$$4PQ43scn4step5enemy5Enemy$$4f$$1Fv + .byte4 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 - .4byte 0x802B1BBC ;# ptr - .4byte 0x802B1A3C ;# ptr + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802B1BB8 ;# ptr - .4byte 0x802B1A9C ;# ptr + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802B1BB4 ;# ptr - .4byte 0x802B1AF8 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802B1BB0 ;# ptr - .4byte 0x802B1B14 ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateAgony$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateAgony$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802B1BAC ;# ptr - .4byte 0x802B1B30 ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer10StateAgony$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802B1BA8 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802B36D4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B3B20 ;# ptr - .4byte 0x8028DDE8 ;# ptr - .4byte 0x802B1A34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6flamer12StateMoveCCWFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy6flamer9StateMoveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6flamer9StateMoveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .byte4 isInitCWR__Q53scn4step5enemy6flamer12StateMoveCCWCFv .global __vt__Q53scn4step5enemy6flamer12StateMoveCWR __vt__Q53scn4step5enemy6flamer12StateMoveCWR: .4byte 0 .4byte 0 - .4byte 0x802B1B4C ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802B36D4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B3B20 ;# ptr - .4byte 0x8028DDE8 ;# ptr - .4byte 0x802B1A38 ;# ptr + .byte4 __dt__Q53scn4step5enemy6flamer12StateMoveCWRFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy6flamer9StateMoveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6flamer9StateMoveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .byte4 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 - .4byte 0x802B5684 ;# ptr - .4byte 0x802B5648 ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra8StateFly$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra8StateFly$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802B5680 ;# ptr - .4byte 0x802B5664 ;# ptr + .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802B69C0 ;# ptr - .4byte 0x802B6984 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802B69BC ;# ptr - .4byte 0x802B69A0 ;# ptr + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802BA0FC ;# ptr - .4byte 0x802BA0C0 ;# ptr + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead15StateAttackShot$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead15StateAttackShot$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead17StateAttackBreath$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead17StateAttackBreath$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802BA0F8 ;# ptr - .4byte 0x802BA0DC ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead17StateAttackBreath$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802BB120 ;# ptr - .4byte 0x802BB0E4 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateFollow$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateFollow$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802BB11C ;# ptr - .4byte 0x802BB100 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802BC5C0 ;# ptr - .4byte 0x802BC544 ;# ptr + .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu15StateMoveAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu15StateMoveAround$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802BC5BC ;# ptr - .4byte 0x802BC560 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu15StateMoveAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu15StateMoveAround$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateMove$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802BC5B8 ;# ptr - .4byte 0x802BC57C ;# ptr + .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802BC5B4 ;# ptr - .4byte 0x802BC598 ;# ptr + .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802BF09C ;# ptr - .4byte 0x802BF040 ;# ptr + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe17StateWalkStepBack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe17StateWalkStepBack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802BF098 ;# ptr - .4byte 0x802BF05C ;# ptr + .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe17StateWalkStepBack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe17StateWalkStepBack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802BF094 ;# ptr - .4byte 0x802BF078 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802C1B00 ;# ptr - .4byte 0x802C1A84 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C1AFC ;# ptr - .4byte 0x802C1AA0 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C1AF8 ;# ptr - .4byte 0x802C1ABC ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C1AF4 ;# ptr - .4byte 0x802C1AD8 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802C33F8 ;# ptr - .4byte 0x802C33BC ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C33F4 ;# ptr - .4byte 0x802C33D8 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802C4CE8 ;# ptr - .4byte 0x802C4CCC ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802C71A0 ;# ptr - .4byte 0x802C7184 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5noddy9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802C776C ;# ptr - .4byte 0x802C7710 ;# ptr + .byte4 __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStay$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStay$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C7768 ;# ptr - .4byte 0x802C772C ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStay$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStay$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C7764 ;# ptr - .4byte 0x802C7748 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802C9AC8 ;# ptr - .4byte 0x802C9A4C ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateFlyWaitFix$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateFlyWaitFix$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C9AC4 ;# ptr - .4byte 0x802C9A68 ;# ptr + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack1Way$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack1Way$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C9AC0 ;# ptr - .4byte 0x802C9A84 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack1Way$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack1Way$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack3Way$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack3Way$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C9ABC ;# ptr - .4byte 0x802C9AA0 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack3Way$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802D1568 ;# ptr - .4byte 0x802D152C ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr10StateThrow$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr10StateThrow$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802D1564 ;# ptr - .4byte 0x802D1548 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr10StateThrow$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802D360C ;# ptr - .4byte 0x802D35D0 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateStay$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateStay$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateWalkStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateWalkStart$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802D3608 ;# ptr - .4byte 0x802D35EC ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateWalkStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802D949C ;# ptr - .4byte 0x802D9480 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy11StateEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802DC838 ;# ptr - .4byte 0x802DC7BC ;# ptr + .byte4 __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld11StateEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld11StateEscape$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802DC834 ;# ptr - .4byte 0x802DC7D8 ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld11StateEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld11StateEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld10StateChase$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld10StateChase$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802DC830 ;# ptr - .4byte 0x802DC7F4 ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateDash$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateDash$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802DC82C ;# ptr - .4byte 0x802DC810 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateDash$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802DFD9C ;# ptr - .4byte 0x802DFD60 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802DFD98 ;# ptr - .4byte 0x802DFD7C ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802E11F4 ;# ptr - .4byte 0x802E11B8 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802E11F0 ;# ptr - .4byte 0x802E11D4 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802E259C ;# ptr - .4byte 0x802E2560 ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802E2598 ;# ptr - .4byte 0x802E257C ;# ptr + .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802E480C ;# ptr - .4byte 0x802E4770 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory17StateGroundAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory17StateGroundAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802E4808 ;# ptr - .4byte 0x802E478C ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory8StateFly$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory8StateFly$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802E4804 ;# ptr - .4byte 0x802E47A8 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802E4800 ;# ptr - .4byte 0x802E47C4 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802E47FC ;# ptr - .4byte 0x802E47E0 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802E6BE8 ;# ptr - .4byte 0x802E6BAC ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802E6BE4 ;# ptr - .4byte 0x802E6BC8 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802EA414 ;# ptr - .4byte 0x802EA338 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWarp$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWarp$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802EA410 ;# ptr - .4byte 0x802EA354 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWarp$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWarp$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802EA40C ;# ptr - .4byte 0x802EA370 ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802EA408 ;# ptr - .4byte 0x802EA38C ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateWallAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateWallAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802EA404 ;# ptr - .4byte 0x802EA3A8 ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateWallAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage15StateWallAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802EA400 ;# ptr - .4byte 0x802EA3C4 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802EA3FC ;# ptr - .4byte 0x802EA3E0 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802ED1DC ;# ptr - .4byte 0x802ED1C0 ;# ptr + .byte4 __dt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802EF954 ;# ptr - .4byte 0x802EF918 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802EF950 ;# ptr - .4byte 0x802EF934 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802F005C ;# ptr - .4byte 0x802F0040 ;# ptr + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10watergalbo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x802F0734 ;# ptr - .4byte 0x802F0718 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6whippy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6whippy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255444 @@ -36553,32 +36553,32 @@ $$259434: $$259597: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8032FA4C + .byte4 effectWarp__Q43scn4step4hero8MintGearCFv .global $$259638 $$259638: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8032FB4C + .byte4 effect__Q43scn4step4hero8MintGearCFv .global $$259647 $$259647: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8032FBFC + .byte4 anim__Q43scn4step4hero8MintGearCFv .global $$259669 $$259669: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8032FCC8 + .byte4 isAnimExist__Q43scn4step4hero8MintGearCFv .global $$259683 $$259683: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8032FD60 + .byte4 setNodeVisibility__Q43scn4step4hero8MintGearCFUlb .global $$259690 $$259690: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8032FDE4 + .byte4 setVisibility__Q43scn4step4hero8MintGearCFb .asciz "Assertion failed.\n" .balign 4 .asciz "MintFuncProxy.hpp" diff --git a/asm/src/AddWiiRemote.s b/asm/src/AddWiiRemote.s index 0dedcf78..c5403a05 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: - .4byte 0x804572A8 + .byte4 $$252041 .global $$253617 $$253617: .asciz "Base" diff --git a/asm/src/AdditionalMove.s b/asm/src/AdditionalMove.s index 78f4ea6f..e80dc56a 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 - .4byte 0x8032DF00 - .4byte 0x8032DEE4 + .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 51cb5ed3..fb150357 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 - .4byte 0x8040566C + .byte4 __sinit_$$3Alarm_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util5Alarm __vt__Q24util5Alarm: .4byte 0 .4byte 0 - .4byte 0x80405558 + .byte4 __dt__Q24util5AlarmFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/AnimScript.s b/asm/src/AnimScript.s index ef85f428..aa13daa2 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: - .4byte 0x80454FD0 + .byte4 $$248723 .global PLAY_ONE_SHOT__Q24gobj10AnimScript PLAY_ONE_SHOT__Q24gobj10AnimScript: - .4byte 0x80454FF4 + .byte4 $$248724 diff --git a/asm/src/AppImpl.s b/asm/src/AppImpl.s index 9a7162f0..7a84d7a2 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 - .4byte 0x80175364 ;# ptr - .4byte 0x80175750 ;# ptr + .byte4 __dt__Q23app7AppImplFv + .byte4 drawerExecDraw__Q23app7AppImplFv .4byte 0 .4byte 0 - .4byte 0x80176260 ;# ptr + .byte4 $$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 88dd203d..70721310 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: - .4byte 0x8055A528 - .4byte 0x8055A530 - .4byte 0x8055A538 - .4byte 0x8055A53C + .byte4 $$253051 + .byte4 $$253052 + .byte4 $$253053 + .byte4 $$253054 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254295 diff --git a/asm/src/BCOpCode.s b/asm/src/BCOpCode.s index 2cfc284e..8ad6fce7 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: - .4byte 0x8055731C - .4byte 0x80557320 - .4byte 0x80557328 - .4byte 0x80557330 - .4byte 0x80557338 - .4byte 0x80557340 - .4byte 0x80557348 - .4byte 0x80557350 - .4byte 0x80557358 - .4byte 0x80557360 - .4byte 0x80557368 - .4byte 0x80557370 - .4byte 0x80557378 - .4byte 0x80557380 - .4byte 0x80557388 - .4byte 0x80557390 - .4byte 0x80557398 - .4byte 0x805573A0 - .4byte 0x805573A8 - .4byte 0x805573B0 - .4byte 0x805573B8 - .4byte 0x805573C0 - .4byte 0x805573C8 - .4byte 0x805573D0 - .4byte 0x805573D8 - .4byte 0x805573E0 - .4byte 0x805573E8 - .4byte 0x805573F0 - .4byte 0x805573F8 - .4byte 0x80557400 - .4byte 0x80557408 - .4byte 0x80557410 - .4byte 0x80557418 - .4byte 0x80557420 - .4byte 0x80557428 - .4byte 0x80557430 - .4byte 0x80557438 - .4byte 0x80557440 - .4byte 0x80557448 - .4byte 0x80557450 - .4byte 0x80557458 - .4byte 0x80557460 - .4byte 0x80557468 - .4byte 0x80557470 - .4byte 0x80557478 - .4byte 0x80557480 - .4byte 0x80557488 - .4byte 0x80557490 - .4byte 0x80557498 - .4byte 0x8055749C - .4byte 0x805574A4 - .4byte 0x805574AC - .4byte 0x805574B4 - .4byte 0x805574BC - .4byte 0x805574C4 - .4byte 0x805574CC - .4byte 0x805574D4 - .4byte 0x805574DC - .4byte 0x805574E4 - .4byte 0x805574EC - .4byte 0x805574F4 - .4byte 0x805574FC - .4byte 0x80557504 - .4byte 0x8055750C - .4byte 0x80557514 - .4byte 0x8055751C + .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 .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 98db087f..45109a50 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 - .4byte 0x80207284 ;# ptr + .byte4 __sinit_$$3BG_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253189 diff --git a/asm/src/BGLayout.s b/asm/src/BGLayout.s index c2bc8e14..3f036784 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: - .4byte 0x80460468 + .byte4 $$251541 .4byte 0 diff --git a/asm/src/BGModel.s b/asm/src/BGModel.s index 569c4894..bcd734d0 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: - .4byte 0x8045EAB0 + .byte4 $$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: - .4byte 0x80460478 + .byte4 $$251679 .global $$251825 $$251825: .4byte 0x4D617000 diff --git a/asm/src/BackupFileData2.s b/asm/src/BackupFileData2.s index a14befbf..0e51a9fb 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 - .4byte 0x80420FC8 + .byte4 UseMaster1AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2 .4byte 0x00000007 .4byte 0x00000003 - .4byte 0x80420FD4 + .byte4 UseMaster2AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2 .4byte 0x0000000A .4byte 0x00000007 - .4byte 0x80420FE0 + .byte4 UseMaster3AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2 .4byte 0x0000000B .4byte 0x00000007 - .4byte 0x80420FE0 + .byte4 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 41260f4d..6fff3606 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: - .4byte 0x80492670 - .4byte 0x80492688 - .4byte 0x8049269C - .4byte 0x804926B0 - .4byte 0x804926C0 - .4byte 0x804926D8 - .4byte 0x804926F0 - .4byte 0x80492708 - .4byte 0x8049271C - .4byte 0x8049269C - .4byte 0x80492734 + .byte4 $$248723 + .byte4 $$248724 + .byte4 $$248725 + .byte4 $$248726 + .byte4 $$248727 + .byte4 $$248728 + .byte4 $$248729 + .byte4 $$248730 + .byte4 $$248731 + .byte4 $$248725 + .byte4 $$248732 diff --git a/asm/src/BinDecorationKindUtil.s b/asm/src/BinDecorationKindUtil.s index cd8fe9d5..632153e9 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: - .4byte 0x80492778 + .byte4 $$248877 .4byte 0x3F800000 .4byte 0 - .4byte 0x80492784 + .byte4 $$248878 .4byte 0x3F800000 .4byte 0 - .4byte 0x80492794 + .byte4 $$248879 .4byte 0x3F800000 .4byte 0 - .4byte 0x804927A8 + .byte4 $$248880 .4byte 0x3F800000 .4byte 0 - .4byte 0x804927BC + .byte4 $$248881 .4byte 0x3F800000 .4byte 0 - .4byte 0x804927C8 + .byte4 $$248882 .4byte 0x3F800000 .4byte 0 - .4byte 0x804927D4 + .byte4 $$248883 .4byte 0x3F800000 .4byte 0 - .4byte 0x804927E0 + .byte4 $$248884 .4byte 0x3DCCCCCD .4byte 0 - .4byte 0x804927EC + .byte4 $$248885 .4byte 0x3F800000 .4byte 0 - .4byte 0x804927F8 + .byte4 $$248886 .4byte 0x3F800000 .4byte 0 - .4byte 0x80492804 + .byte4 $$248887 .4byte 0x3F800000 .4byte 0 - .4byte 0x80492810 + .byte4 $$248888 .4byte 0x3F800000 .4byte 0 - .4byte 0x8049281C + .byte4 $$248889 .4byte 0x3F800000 .4byte 0 - .4byte 0x80492828 + .byte4 $$248890 .4byte 0x3F800000 .4byte 0 - .4byte 0x80492834 + .byte4 $$248891 .4byte 0x3F800000 .4byte 0 - .4byte 0x80492840 + .byte4 $$248892 .4byte 0x3F800000 .4byte 0 - .4byte 0x8049284C + .byte4 $$248893 .4byte 0x3F800000 .4byte 0 - .4byte 0x80492858 + .byte4 $$248894 .4byte 0x3F800000 .4byte 0 - .4byte 0x80492864 + .byte4 $$248895 .4byte 0x3F800000 .4byte 0 - .4byte 0x80492870 + .byte4 $$248896 .4byte 0x3F800000 .4byte 0 - .4byte 0x8049287C + .byte4 $$248897 .4byte 0x3F800000 .4byte 0 - .4byte 0x8049287C + .byte4 $$248897 .4byte 0x3F800000 .4byte 0 - .4byte 0x8049287C + .byte4 $$248897 .4byte 0x3F800000 .4byte 0 - .4byte 0x8049287C + .byte4 $$248897 .4byte 0x3F800000 .4byte 0 - .4byte 0x80492888 + .byte4 $$248898 .4byte 0x3F800000 .4byte 0 - .4byte 0x80492894 + .byte4 $$248899 .4byte 0x3DCCCCCD .4byte 0 - .4byte 0x8055BF00 + .byte4 $$248900 .4byte 0x3DCCCCCD .4byte 0 - .4byte 0x8055BF08 + .byte4 $$248901 .4byte 0x3F800000 .4byte 0 - .4byte 0x804928A0 + .byte4 $$248902 .4byte 0x3F800000 .4byte 0 - .4byte 0x8055BF10 + .byte4 $$248903 .4byte 0x3F800000 .4byte 0 - .4byte 0x8055BF18 + .byte4 $$248904 .4byte 0x3F800000 .4byte 0 .4byte 0 diff --git a/asm/src/Block.s b/asm/src/Block.s index 15f1745c..5fe19fa7 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: - .4byte 0x80558340 - .4byte 0x80558348 - .4byte 0x80558350 - .4byte 0x80558358 - .4byte 0x80558360 - .4byte 0x80558368 - .4byte 0x80558370 - .4byte 0x80558378 - .4byte 0x80558380 - .4byte 0x80558388 - .4byte 0x804604A8 - .4byte 0x804604B4 - .4byte 0x804604C0 - .4byte 0x804604CC - .4byte 0x804604D8 - .4byte 0x804604E4 - .4byte 0x804604F0 - .4byte 0x804604FC - .4byte 0x80460508 - .4byte 0x80460514 - .4byte 0x80460520 - .4byte 0x8046052C - .4byte 0x80460538 - .4byte 0x80460544 - .4byte 0x80460550 - .4byte 0x8046055C - .4byte 0x80460568 - .4byte 0x80460574 - .4byte 0x80460580 - .4byte 0x8046058C - .4byte 0x80460598 - .4byte 0x804605A4 - .4byte 0x804605B0 - .4byte 0x804605BC - .4byte 0x804605C8 - .4byte 0x804605D4 - .4byte 0x804605E0 - .4byte 0x804605EC + .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 .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: - .4byte 0x80460490 + .byte4 $$251712 .4byte 0 .global $$251713 $$251713: diff --git a/asm/src/BlockResFiles.s b/asm/src/BlockResFiles.s index 839fb3be..b1ab18c0 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 - .4byte 0x80302E30 + .byte4 __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: - .4byte 0x8047FF88 + .byte4 $$248773 .4byte 0 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8047FFA0 - .4byte 0x8055A580 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8047FFA0 - .4byte 0x8055A588 - .4byte 0x8047FFA0 - .4byte 0x8055A590 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8047FFB8 + .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 0 - .4byte 0x8047FFD0 + .byte4 $$248780 .4byte 0 - .4byte 0x8047FFD0 + .byte4 $$248780 .4byte 0 - .4byte 0x8047FFF0 + .byte4 $$248781 .4byte 0 - .4byte 0x8047FFA0 - .4byte 0x8055A598 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8047FFA0 - .4byte 0x80480010 - .4byte 0x8047FFA0 - .4byte 0x8048001C - .4byte 0x8047FFA0 - .4byte 0x80480028 - .4byte 0x8047FFA0 - .4byte 0x8055A5A0 - .4byte 0x8047FFA0 - .4byte 0x8055A5A8 - .4byte 0x8047FFA0 - .4byte 0x80480034 - .4byte 0x80480040 + .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 0 - .4byte 0x8047FFA0 - .4byte 0x80480058 - .4byte 0x80480064 + .byte4 $$248775 + .byte4 $$248790 + .byte4 $$248791 .4byte 0 - .4byte 0x8048007C + .byte4 $$248792 .4byte 0 - .4byte 0x80480098 + .byte4 $$248793 .4byte 0 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 - .4byte 0x8055A578 + .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 .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: - .4byte 0x8055A570 + .byte4 $$248772 .4byte 0 diff --git a/asm/src/Boss.s b/asm/src/Boss.s index f4461379..af776dc4 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 - .4byte 0x8022C084 ;# ptr + .byte4 __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 ede81a5c..9f33fdb7 100644 --- a/asm/src/BossPanel.s +++ b/asm/src/BossPanel.s @@ -1433,7 +1433,7 @@ $$257130: $$257147: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80402CD4 + .byte4 start__Q23snd11SERequestorFUl .global $$257172 $$257172: .asciz "step/game/Main" @@ -1465,7 +1465,7 @@ $$257296: $$257322: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803A6380 + .byte4 appearParts__Q43scn4step4info9BossPanelFv .global $$257433 $$257433: .asciz "PartsExN" @@ -1494,7 +1494,7 @@ $$257439: $$257458: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803A6414 + .byte4 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 - .4byte 0x803A691C - .4byte 0x803A6728 - .4byte 0x803A6768 - .4byte 0x803A6784 + .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 .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 - .4byte 0x803A6918 - .4byte 0x803A6788 - .4byte 0x803A67C8 - .4byte 0x803A67E4 + .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 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 - .4byte 0x803A6914 - .4byte 0x803A67E8 - .4byte 0x803A6828 - .4byte 0x803A6844 + .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 0 .4byte 0 .4byte 0 diff --git a/asm/src/BrainAttack.s b/asm/src/BrainAttack.s index 86f933a9..ca4b563a 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 - .4byte 0x802A2700 ;# ptr - .4byte 0x802A26E0 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateLostHat$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateLostHat$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5cappy11BrainAttack __vt__Q53scn4step5enemy5cappy11BrainAttack: .4byte 0 .4byte 0 - .4byte 0x802A26FC ;# ptr - .4byte 0x802A2444 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802A24C0 ;# ptr - .4byte 0x802A266C ;# ptr + .byte4 __dt__Q53scn4step5enemy5cappy11BrainAttackFv + .byte4 onStart__Q53scn4step5enemy5cappy11BrainAttackFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy5cappy11BrainAttackFv + .byte4 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 - .4byte 0x802AF4D8 ;# ptr - .4byte 0x802AF4B8 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4elec11BrainAttack __vt__Q53scn4step5enemy4elec11BrainAttack: .4byte 0 .4byte 0 - .4byte 0x802AF4D4 ;# ptr - .4byte 0x802AF430 ;# ptr - .4byte 0x802AF4B4 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy4elec11BrainAttackFv + .byte4 onStart__Q53scn4step5enemy4elec11BrainAttackFv + .byte4 onRecover__Q53scn4step5enemy4elec11BrainAttackFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -864,11 +864,11 @@ __vt__Q53scn4step5enemy4elec11BrainAttack: __vt__Q53scn4step5enemy6flamer11BrainAttack: .4byte 0 .4byte 0 - .4byte 0x802B1DC8 ;# ptr - .4byte 0x802B1BFC ;# ptr - .4byte 0x802B1CB0 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6flamer11BrainAttackFv + .byte4 onStart__Q53scn4step5enemy6flamer11BrainAttackFv + .byte4 onRecover__Q53scn4step5enemy6flamer11BrainAttackFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802B6AA4 ;# ptr - .4byte 0x802B6A84 ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy7gigatzo11BrainAttack __vt__Q53scn4step5enemy7gigatzo11BrainAttack: .4byte 0 .4byte 0 - .4byte 0x802B6AA0 ;# ptr - .4byte 0x802B6A00 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy7gigatzo11BrainAttackFv + .byte4 onStart__Q53scn4step5enemy7gigatzo11BrainAttackFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -894,11 +894,11 @@ __vt__Q53scn4step5enemy7gigatzo11BrainAttack: __vt__Q53scn4step5enemy7hothead11BrainAttack: .4byte 0 .4byte 0 - .4byte 0x802BA25C ;# ptr - .4byte 0x802BA13C ;# ptr - .4byte 0x802BA1F0 ;# ptr - .4byte 0x802BA1F4 ;# ptr - .4byte 0x802BA1F8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7hothead11BrainAttackFv + .byte4 onStart__Q53scn4step5enemy7hothead11BrainAttackFv + .byte4 onRecover__Q53scn4step5enemy7hothead11BrainAttackFv + .byte4 onLanding__Q53scn4step5enemy7hothead11BrainAttackFv + .byte4 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 - .4byte 0x802C34E0 ;# ptr - .4byte 0x802C34C0 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6leafan11BrainAttack __vt__Q53scn4step5enemy6leafan11BrainAttack: .4byte 0 .4byte 0 - .4byte 0x802C34DC ;# ptr - .4byte 0x802C3438 ;# ptr - .4byte 0x802C34BC ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6leafan11BrainAttackFv + .byte4 onStart__Q53scn4step5enemy6leafan11BrainAttackFv + .byte4 onRecover__Q53scn4step5enemy6leafan11BrainAttackFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -924,11 +924,11 @@ __vt__Q53scn4step5enemy6leafan11BrainAttack: __vt__Q53scn4step5enemy10watergalbo11BrainAttack: .4byte 0 .4byte 0 - .4byte 0x802F0130 ;# ptr - .4byte 0x8027EE28 ;# ptr - .4byte 0x802F009C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy10watergalbo11BrainAttackFv + .byte4 onStart__Q43scn4step5enemy9BrainBaseFv + .byte4 onRecover__Q53scn4step5enemy10watergalbo11BrainAttackFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -936,9 +936,9 @@ __vt__Q53scn4step5enemy10watergalbo11BrainAttack: __vt__Q53scn4step5enemy6whippy11BrainAttack: .4byte 0 .4byte 0 - .4byte 0x802F0778 ;# ptr - .4byte 0x802F0774 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6whippy11BrainAttackFv + .byte4 onStart__Q53scn4step5enemy6whippy11BrainAttackFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainAttackStraight.s b/asm/src/BrainAttackStraight.s index 0ad60e6c..5be0a6e0 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 - .4byte 0x802C5D18 ;# ptr - .4byte 0x802C5CF8 ;# ptr + .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8needlous19BrainAttackStraight __vt__Q53scn4step5enemy8needlous19BrainAttackStraight: .4byte 0 .4byte 0 - .4byte 0x802C5D14 ;# ptr - .4byte 0x8027EE28 ;# ptr - .4byte 0x802C5A80 ;# ptr - .4byte 0x802C5B50 ;# ptr - .4byte 0x802C5B54 ;# ptr + .byte4 __dt__Q53scn4step5enemy8needlous19BrainAttackStraightFv + .byte4 onStart__Q43scn4step5enemy9BrainBaseFv + .byte4 onRecover__Q53scn4step5enemy8needlous19BrainAttackStraightFv + .byte4 onLanding__Q53scn4step5enemy8needlous19BrainAttackStraightFv + .byte4 update__Q53scn4step5enemy8needlous19BrainAttackStraightFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/BrainBase.s b/asm/src/BrainBase.s index 345b72ce..03f5bb7e 100644 --- a/asm/src/BrainBase.s +++ b/asm/src/BrainBase.s @@ -57,9 +57,9 @@ lbl_8027EE78: __vt__Q43scn4step5enemy9BrainBase: .4byte 0 .4byte 0 - .4byte 0x8027EE38 ;# ptr - .4byte 0x8027EE28 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q43scn4step5enemy9BrainBaseFv + .byte4 onStart__Q43scn4step5enemy9BrainBaseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainBound.s b/asm/src/BrainBound.s index 253f22eb..0d4c3751 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 - .4byte 0x802E78C0 ;# ptr - .4byte 0x802E78A0 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect10StateBound$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect10StateBound$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10stareffect10BrainBound __vt__Q53scn4step5enemy10stareffect10BrainBound: .4byte 0 .4byte 0 - .4byte 0x802E78BC ;# ptr - .4byte 0x802E781C ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy10stareffect10BrainBoundFv + .byte4 onStart__Q53scn4step5enemy10stareffect10BrainBoundFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainChase.s b/asm/src/BrainChase.s index 8b365add..eed6ce6a 100644 --- a/asm/src/BrainChase.s +++ b/asm/src/BrainChase.s @@ -621,11 +621,11 @@ __dt__Q53scn4step5enemy5sheld10BrainChaseFv: __vt__Q53scn4step5enemy7blipper10BrainChase: .4byte 0 .4byte 0 - .4byte 0x80298B50 ;# ptr - .4byte 0x80298A68 ;# ptr - .4byte 0x80298B4C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy7blipper10BrainChaseFv + .byte4 onStart__Q53scn4step5enemy7blipper10BrainChaseFv + .byte4 onRecover__Q53scn4step5enemy7blipper10BrainChaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -633,11 +633,11 @@ __vt__Q53scn4step5enemy7blipper10BrainChase: __vt__Q53scn4step5enemy6degout10BrainChase: .4byte 0 .4byte 0 - .4byte 0x802AD0EC ;# ptr - .4byte 0x802ACFF4 ;# ptr - .4byte 0x802AD070 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6degout10BrainChaseFv + .byte4 onStart__Q53scn4step5enemy6degout10BrainChaseFv + .byte4 onRecover__Q53scn4step5enemy6degout10BrainChaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -645,11 +645,11 @@ __vt__Q53scn4step5enemy6degout10BrainChase: __vt__Q53scn4step5enemy7mumbies10BrainChase: .4byte 0 .4byte 0 - .4byte 0x802C4DB0 ;# ptr - .4byte 0x802C4D28 ;# ptr - .4byte 0x802C4DAC ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy7mumbies10BrainChaseFv + .byte4 onStart__Q53scn4step5enemy7mumbies10BrainChaseFv + .byte4 onRecover__Q53scn4step5enemy7mumbies10BrainChaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802D96FC ;# ptr - .4byte 0x802D969C ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateAngerChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateAngerChase$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateFaceChange$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateFaceChange$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802D96F8 ;# ptr - .4byte 0x802D96B8 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateFaceChange$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateFaceChange$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy10StateChase$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy10StateChase$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802D96F4 ;# ptr - .4byte 0x802D96D4 ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6scarfy10BrainChase __vt__Q53scn4step5enemy6scarfy10BrainChase: .4byte 0 .4byte 0 - .4byte 0x802D96F0 ;# ptr - .4byte 0x802D94DC ;# ptr - .4byte 0x802D9558 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6scarfy10BrainChaseFv + .byte4 onStart__Q53scn4step5enemy6scarfy10BrainChaseFv + .byte4 onRecover__Q53scn4step5enemy6scarfy10BrainChaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -687,9 +687,9 @@ __vt__Q53scn4step5enemy6scarfy10BrainChase: __vt__Q53scn4step5enemy5sheld10BrainChase: .4byte 0 .4byte 0 - .4byte 0x802DCA00 ;# ptr - .4byte 0x8027EE28 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802DC878 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy5sheld10BrainChaseFv + .byte4 onStart__Q43scn4step5enemy9BrainBaseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy5sheld10BrainChaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainCreditFallToGoodbye.s b/asm/src/BrainCreditFallToGoodbye.s index d9ed6ab5..1cacbb1a 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 - .4byte 0x802D3764 ;# ptr - .4byte 0x802D3744 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5rocky24BrainCreditFallToGoodbye __vt__Q53scn4step5enemy5rocky24BrainCreditFallToGoodbye: .4byte 0 .4byte 0 - .4byte 0x802D3760 ;# ptr - .4byte 0x802D364C ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy5rocky24BrainCreditFallToGoodbyeFv + .byte4 onStart__Q53scn4step5enemy5rocky24BrainCreditFallToGoodbyeFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainCreditPraise.s b/asm/src/BrainCreditPraise.s index 06d4802d..ef5110e8 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 - .4byte 0x802910C8 ;# ptr - .4byte 0x80291050 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common11StatePraise$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common11StatePraise$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6common17BrainCreditPraise __vt__Q53scn4step5enemy6common17BrainCreditPraise: .4byte 0 .4byte 0 - .4byte 0x8029106C ;# ptr - .4byte 0x80290FCC ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv + .byte4 onStart__Q53scn4step5enemy6common17BrainCreditPraiseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -244,11 +244,11 @@ __vt__Q53scn4step5enemy6common17BrainCreditPraise: __vt__Q53scn4step5enemy6bouncy17BrainCreditPraise: .4byte 0 .4byte 0 - .4byte 0x8029CC08 ;# ptr - .4byte 0x8029CB7C ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6bouncy17BrainCreditPraiseFv + .byte4 onStart__Q53scn4step5enemy6bouncy17BrainCreditPraiseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -256,9 +256,9 @@ __vt__Q53scn4step5enemy6bouncy17BrainCreditPraise: __vt__Q53scn4step5enemy6sparky17BrainCreditPraise: .4byte 0 .4byte 0 - .4byte 0x802E6CB4 ;# ptr - .4byte 0x802E6C28 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6sparky17BrainCreditPraiseFv + .byte4 onStart__Q53scn4step5enemy6sparky17BrainCreditPraiseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainCreditWalkToPraise.s b/asm/src/BrainCreditWalkToPraise.s index 16a9ac30..182dc3cd 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 - .4byte 0x802A0C90 ;# ptr - .4byte 0x802A0C0C ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy11broomhatter23BrainCreditWalkToPraiseFv + .byte4 onStart__Q53scn4step5enemy11broomhatter23BrainCreditWalkToPraiseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -211,11 +211,11 @@ __vt__Q53scn4step5enemy11broomhatter23BrainCreditWalkToPraise: __vt__Q53scn4step5enemy6chilly23BrainCreditWalkToPraise: .4byte 0 .4byte 0 - .4byte 0x802A6058 ;# ptr - .4byte 0x802A5FD4 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6chilly23BrainCreditWalkToPraiseFv + .byte4 onStart__Q53scn4step5enemy6chilly23BrainCreditWalkToPraiseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802ED2C0 ;# ptr - .4byte 0x802ED2A0 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee23BrainCreditWalkToPraise __vt__Q53scn4step5enemy9waddledee23BrainCreditWalkToPraise: .4byte 0 .4byte 0 - .4byte 0x802ED2BC ;# ptr - .4byte 0x802ED21C ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledee23BrainCreditWalkToPraiseFv + .byte4 onStart__Q53scn4step5enemy9waddledee23BrainCreditWalkToPraiseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainDash.s b/asm/src/BrainDash.s index 74a002d9..5ed72ec8 100644 --- a/asm/src/BrainDash.s +++ b/asm/src/BrainDash.s @@ -126,9 +126,9 @@ __dt__Q53scn4step5enemy5sheld9BrainDashFv: __vt__Q53scn4step5enemy5sheld9BrainDash: .4byte 0 .4byte 0 - .4byte 0x802DCB88 ;# ptr - .4byte 0x8027EE28 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802DCA40 ;# ptr - .4byte 0x802DCB84 ;# ptr + .byte4 __dt__Q53scn4step5enemy5sheld9BrainDashFv + .byte4 onStart__Q43scn4step5enemy9BrainBaseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy5sheld9BrainDashFv + .byte4 update__Q53scn4step5enemy5sheld9BrainDashFv .4byte 0 diff --git a/asm/src/BrainDive.s b/asm/src/BrainDive.s index 0a71bc34..6fb7afaf 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 - .4byte 0x802A6F14 ;# ptr - .4byte 0x802A6ED4 ;# ptr + .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateBack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateBack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como12StateCutFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como12StateCutFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802A6F10 ;# ptr - .4byte 0x802A6EF0 ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como12StateCutFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como12StateCutFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4como9BrainDive __vt__Q53scn4step5enemy4como9BrainDive: .4byte 0 .4byte 0 - .4byte 0x802A6F0C ;# ptr - .4byte 0x802A6CC4 ;# ptr - .4byte 0x802A6DE8 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy4como9BrainDiveFv + .byte4 onStart__Q53scn4step5enemy4como9BrainDiveFv + .byte4 onRecover__Q53scn4step5enemy4como9BrainDiveFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/BrainEscape.s b/asm/src/BrainEscape.s index c7a65f46..03e8e62e 100644 --- a/asm/src/BrainEscape.s +++ b/asm/src/BrainEscape.s @@ -65,9 +65,9 @@ __dt__Q53scn4step5enemy5sheld11BrainEscapeFv: __vt__Q53scn4step5enemy5sheld11BrainEscape: .4byte 0 .4byte 0 - .4byte 0x802DCC4C ;# ptr - .4byte 0x8027EE28 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802DCBC8 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy5sheld11BrainEscapeFv + .byte4 onStart__Q43scn4step5enemy9BrainBaseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy5sheld11BrainEscapeFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFactory.s b/asm/src/BrainFactory.s index 22e9099f..8d2914c4 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: - .4byte 0x80470C1C - .4byte 0x80470C34 - .4byte 0x80470C54 - .4byte 0x80470C54 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C90 - .4byte 0x80470CA8 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470CC0 - .4byte 0x80470C74 - .4byte 0x80470CDC - .4byte 0x80470CFC - .4byte 0x80470D18 - .4byte 0x80470D34 - .4byte 0x80470D4C - .4byte 0x80470D64 - .4byte 0x80470D7C - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470D98 - .4byte 0x80470DC0 - .4byte 0x80470DE0 - .4byte 0x80470E04 - .4byte 0x80470E1C - .4byte 0x80470E38 - .4byte 0x80470E50 - .4byte 0x80470C74 - .4byte 0x80470E68 - .4byte 0x80470C74 - .4byte 0x80470E80 - .4byte 0x80470C74 - .4byte 0x80470E98 - .4byte 0x80470EB4 - .4byte 0x80470ED0 - .4byte 0x80470EF0 - .4byte 0x80470F10 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470F2C - .4byte 0x80470F44 - .4byte 0x80470F5C - .4byte 0x80470F7C - .4byte 0x80470F98 - .4byte 0x80470F98 - .4byte 0x80470F98 - .4byte 0x80470FB0 - .4byte 0x80470FCC - .4byte 0x80470FEC - .4byte 0x80470FCC - .4byte 0x8047100C - .4byte 0x80471028 - .4byte 0x80471040 - .4byte 0x8047105C - .4byte 0x80471078 - .4byte 0x80471094 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x804710B4 - .4byte 0x804710D0 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x804710E8 - .4byte 0x80471104 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80471124 - .4byte 0x80471144 - .4byte 0x80471168 - .4byte 0x8047118C - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x804711B0 - .4byte 0x804711D4 - .4byte 0x804711F8 - .4byte 0x80470C74 - .4byte 0x8047121C - .4byte 0x8047121C - .4byte 0x80470C74 - .4byte 0x8047123C - .4byte 0x80471258 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80471270 - .4byte 0x8047128C - .4byte 0x804712AC - .4byte 0x804712C4 - .4byte 0x804712DC - .4byte 0x804712F4 - .4byte 0x80471310 - .4byte 0x8047132C - .4byte 0x8047134C - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80471368 - .4byte 0x80471380 - .4byte 0x80471398 - .4byte 0x804713B0 - .4byte 0x804713C8 - .4byte 0x804713E0 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x804713F8 - .4byte 0x804713F8 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80471410 - .4byte 0x8047142C - .4byte 0x80471448 - .4byte 0x80471464 - .4byte 0x80471480 - .4byte 0x80471498 - .4byte 0x804714B0 - .4byte 0x804714C8 - .4byte 0x804714E8 - .4byte 0x80471500 - .4byte 0x80471518 - .4byte 0x80471040 - .4byte 0x80471124 - .4byte 0x804710E8 - .4byte 0x80471104 - .4byte 0x80471144 - .4byte 0x80471530 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x8047154C - .4byte 0x80471564 - .4byte 0x80471584 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470D64 - .4byte 0x8047159C - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80471040 - .4byte 0x80471124 - .4byte 0x804710E8 - .4byte 0x80471104 - .4byte 0x80471144 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80471104 - .4byte 0x80471144 - .4byte 0x80471104 - .4byte 0x80471144 - .4byte 0x80471104 - .4byte 0x80471144 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80471104 - .4byte 0x80471144 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80471368 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x804715C0 - .4byte 0x80470C74 - .4byte 0x804715E0 - .4byte 0x80471600 - .4byte 0x80471620 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470D64 - .4byte 0x80470C74 - .4byte 0x80470C54 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C54 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C1C - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80471644 - .4byte 0x80471644 - .4byte 0x80471644 - .4byte 0x80471664 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C54 - .4byte 0x80470C54 - .4byte 0x80471688 - .4byte 0x80470C74 - .4byte 0x804716A0 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x804716C0 - .4byte 0x804716E0 - .4byte 0x80471704 - .4byte 0x80471724 - .4byte 0x80471744 - .4byte 0x80471768 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x8047178C - .4byte 0x804717B0 - .4byte 0x804717D4 - .4byte 0x804717F4 - .4byte 0x80471818 - .4byte 0x80471838 - .4byte 0x80471854 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80471878 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80471898 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x804718B8 - .4byte 0x804718D8 - .4byte 0x804718F4 - .4byte 0x80471910 - .4byte 0x8047192C - .4byte 0x8047194C - .4byte 0x80471968 - .4byte 0x8047198C - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x804719B0 - .4byte 0x804719CC - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x80470C74 - .4byte 0x804719E8 - .4byte 0x80471A10 - .4byte 0x80471A38 - .4byte 0x80471A60 - .4byte 0x80470C74 + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/src/BrainFattyBuffer.s b/asm/src/BrainFattyBuffer.s index 04b24b5a..da81528a 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 - .4byte 0x80298C38 ;# ptr - .4byte 0x80298C18 ;# ptr + .byte4 __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferAppearFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferAppearFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy7blipper16BrainFattyBuffer __vt__Q53scn4step5enemy7blipper16BrainFattyBuffer: .4byte 0 .4byte 0 - .4byte 0x80298C34 ;# ptr - .4byte 0x80298B90 ;# ptr - .4byte 0x80298C14 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy7blipper16BrainFattyBufferFv + .byte4 onStart__Q53scn4step5enemy7blipper16BrainFattyBufferFv + .byte4 onRecover__Q53scn4step5enemy7blipper16BrainFattyBufferFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFix.s b/asm/src/BrainFix.s index 6b2c59f3..de457509 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 - .4byte 0x802DFEFC ;# ptr - .4byte 0x802DFEDC ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6shotzo8BrainFix __vt__Q53scn4step5enemy6shotzo8BrainFix: .4byte 0 .4byte 0 - .4byte 0x802DFEF8 ;# ptr - .4byte 0x802DFDDC ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6shotzo8BrainFixFv + .byte4 onStart__Q53scn4step5enemy6shotzo8BrainFixFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFixCeil.s b/asm/src/BrainFixCeil.s index 7c35cd91..478cedf6 100644 --- a/asm/src/BrainFixCeil.s +++ b/asm/src/BrainFixCeil.s @@ -141,11 +141,11 @@ __dt__Q53scn4step5enemy6shotzo12BrainFixCeilFv: __vt__Q53scn4step5enemy6shotzo12BrainFixCeil: .4byte 0 .4byte 0 - .4byte 0x802E00D4 ;# ptr - .4byte 0x802DFF3C ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6shotzo12BrainFixCeilFv + .byte4 onStart__Q53scn4step5enemy6shotzo12BrainFixCeilFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/BrainFlushPursuit.s b/asm/src/BrainFlushPursuit.s index a4be0331..97c91fbf 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 - .4byte 0x80291240 ;# ptr - .4byte 0x80291200 ;# ptr + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlushWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlushWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x8029123C ;# ptr - .4byte 0x8029121C ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlushWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlushWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6common17BrainFlushPursuit __vt__Q53scn4step5enemy6common17BrainFlushPursuit: .4byte 0 .4byte 0 - .4byte 0x80291238 ;# ptr - .4byte 0x80291108 ;# ptr - .4byte 0x80291184 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common17BrainFlushPursuitFv + .byte4 onStart__Q53scn4step5enemy6common17BrainFlushPursuitFv + .byte4 onRecover__Q53scn4step5enemy6common17BrainFlushPursuitFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFly.s b/asm/src/BrainFly.s index c5244e69..4cf0b115 100644 --- a/asm/src/BrainFly.s +++ b/asm/src/BrainFly.s @@ -903,11 +903,11 @@ __dt__Q53scn4step5enemy6sodory8BrainFlyFv: __vt__Q53scn4step5enemy6common8BrainFly: .4byte 0 .4byte 0 - .4byte 0x80291338 ;# ptr - .4byte 0x80291280 ;# ptr - .4byte 0x80291330 ;# ptr - .4byte 0x80291334 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common8BrainFlyFv + .byte4 onStart__Q53scn4step5enemy6common8BrainFlyFv + .byte4 onRecover__Q53scn4step5enemy6common8BrainFlyFv + .byte4 onLanding__Q53scn4step5enemy6common8BrainFlyFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -915,11 +915,11 @@ __vt__Q53scn4step5enemy6common8BrainFly: __vt__Q53scn4step5enemy5bowby8BrainFly: .4byte 0 .4byte 0 - .4byte 0x8029E308 ;# ptr - .4byte 0x8029E280 ;# ptr - .4byte 0x8029E304 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy5bowby8BrainFlyFv + .byte4 onStart__Q53scn4step5enemy5bowby8BrainFlyFv + .byte4 onRecover__Q53scn4step5enemy5bowby8BrainFlyFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x8029EDE8 ;# ptr - .4byte 0x8029EDC8 ;# ptr + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10brontoburt8BrainFly __vt__Q53scn4step5enemy10brontoburt8BrainFly: .4byte 0 .4byte 0 - .4byte 0x8029EDE4 ;# ptr - .4byte 0x8029ED40 ;# ptr - .4byte 0x8029EDC4 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy10brontoburt8BrainFlyFv + .byte4 onStart__Q53scn4step5enemy10brontoburt8BrainFlyFv + .byte4 onRecover__Q53scn4step5enemy10brontoburt8BrainFlyFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802A54F4 ;# ptr - .4byte 0x802A54D4 ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8cerulean8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8cerulean8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8cerulean8BrainFly __vt__Q53scn4step5enemy8cerulean8BrainFly: .4byte 0 .4byte 0 - .4byte 0x802A54F0 ;# ptr - .4byte 0x802A544C ;# ptr - .4byte 0x802A54D0 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy8cerulean8BrainFlyFv + .byte4 onStart__Q53scn4step5enemy8cerulean8BrainFlyFv + .byte4 onRecover__Q53scn4step5enemy8cerulean8BrainFlyFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -963,11 +963,11 @@ __vt__Q53scn4step5enemy8cerulean8BrainFly: __vt__Q53scn4step5enemy6juckle8BrainFly: .4byte 0 .4byte 0 - .4byte 0x802BB168 ;# ptr - .4byte 0x802BB160 ;# ptr - .4byte 0x802BB164 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6juckle8BrainFlyFv + .byte4 onStart__Q53scn4step5enemy6juckle8BrainFlyFv + .byte4 onRecover__Q53scn4step5enemy6juckle8BrainFlyFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802CF88C ;# ptr - .4byte 0x802CF80C ;# ptr + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce12StateFlyWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce12StateFlyWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802CF888 ;# ptr - .4byte 0x802CF828 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce15StateFlyPursuit$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce15StateFlyPursuit$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802CF884 ;# ptr - .4byte 0x802CF844 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce15StateFlyPursuit$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce15StateFlyPursuit$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802CF880 ;# ptr - .4byte 0x802CF860 ;# ptr + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6pierce8BrainFly __vt__Q53scn4step5enemy6pierce8BrainFly: .4byte 0 .4byte 0 - .4byte 0x802CF87C ;# ptr - .4byte 0x802CF678 ;# ptr - .4byte 0x802CF808 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6pierce8BrainFlyFv + .byte4 onStart__Q53scn4step5enemy6pierce8BrainFlyFv + .byte4 onRecover__Q53scn4step5enemy6pierce8BrainFlyFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1011,11 +1011,11 @@ __vt__Q53scn4step5enemy6pierce8BrainFly: __vt__Q53scn4step5enemy6scarfy8BrainFly: .4byte 0 .4byte 0 - .4byte 0x802D9744 ;# ptr - .4byte 0x802D973C ;# ptr - .4byte 0x802D9740 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6scarfy8BrainFlyFv + .byte4 onStart__Q53scn4step5enemy6scarfy8BrainFlyFv + .byte4 onRecover__Q53scn4step5enemy6scarfy8BrainFlyFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802DBB7C ;# ptr - .4byte 0x802DBB3C ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches9StateMove$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802DBB78 ;# ptr - .4byte 0x802DBB58 ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8searches8BrainFly __vt__Q53scn4step5enemy8searches8BrainFly: .4byte 0 .4byte 0 - .4byte 0x802DBB74 ;# ptr - .4byte 0x802DBA54 ;# ptr - .4byte 0x802DBB38 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy8searches8BrainFlyFv + .byte4 onStart__Q53scn4step5enemy8searches8BrainFlyFv + .byte4 onRecover__Q53scn4step5enemy8searches8BrainFlyFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802E36A0 ;# ptr - .4byte 0x802E3660 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802E369C ;# ptr - .4byte 0x802E367C ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl14StateFlyAround$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5snowl8BrainFly __vt__Q53scn4step5enemy5snowl8BrainFly: .4byte 0 .4byte 0 - .4byte 0x802E3698 ;# ptr - .4byte 0x802E357C ;# ptr - .4byte 0x802E365C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy5snowl8BrainFlyFv + .byte4 onStart__Q53scn4step5enemy5snowl8BrainFlyFv + .byte4 onRecover__Q53scn4step5enemy5snowl8BrainFlyFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1071,9 +1071,9 @@ __vt__Q53scn4step5enemy5snowl8BrainFly: __vt__Q53scn4step5enemy6sodory8BrainFly: .4byte 0 .4byte 0 - .4byte 0x802E4958 ;# ptr - .4byte 0x802E484C ;# ptr - .4byte 0x802E4954 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6sodory8BrainFlyFv + .byte4 onStart__Q53scn4step5enemy6sodory8BrainFlyFv + .byte4 onRecover__Q53scn4step5enemy6sodory8BrainFlyFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFlyAround.s b/asm/src/BrainFlyAround.s index 57234af1..db1eddf1 100644 --- a/asm/src/BrainFlyAround.s +++ b/asm/src/BrainFlyAround.s @@ -155,9 +155,9 @@ __dt__Q53scn4step5enemy6owgulf14BrainFlyAroundFv: __vt__Q53scn4step5enemy6owgulf14BrainFlyAround: .4byte 0 .4byte 0 - .4byte 0x802C9CD4 ;# ptr - .4byte 0x802C9B30 ;# ptr - .4byte 0x802C9BB4 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x802C9BB8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6owgulf14BrainFlyAroundFv + .byte4 onStart__Q53scn4step5enemy6owgulf14BrainFlyAroundFv + .byte4 onRecover__Q53scn4step5enemy6owgulf14BrainFlyAroundFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q53scn4step5enemy6owgulf14BrainFlyAroundFv .4byte 0 diff --git a/asm/src/BrainFlyFarSinCurve.s b/asm/src/BrainFlyFarSinCurve.s index 920278ba..74497405 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 - .4byte 0x8029EEE0 ;# ptr - .4byte 0x8029EEC0 ;# ptr + .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10brontoburt19BrainFlyFarSinCurve __vt__Q53scn4step5enemy10brontoburt19BrainFlyFarSinCurve: .4byte 0 .4byte 0 - .4byte 0x8029EEDC ;# ptr - .4byte 0x8029EE28 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy10brontoburt19BrainFlyFarSinCurveFv + .byte4 onStart__Q53scn4step5enemy10brontoburt19BrainFlyFarSinCurveFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/BrainFlySinCurve.s b/asm/src/BrainFlySinCurve.s index 2f871969..00897680 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 - .4byte 0x80291450 ;# ptr - .4byte 0x80291430 ;# ptr + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6common16BrainFlySinCurve __vt__Q53scn4step5enemy6common16BrainFlySinCurve: .4byte 0 .4byte 0 - .4byte 0x8029144C ;# ptr - .4byte 0x80291378 ;# ptr - .4byte 0x80291428 ;# ptr - .4byte 0x8029142C ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common16BrainFlySinCurveFv + .byte4 onStart__Q53scn4step5enemy6common16BrainFlySinCurveFv + .byte4 onRecover__Q53scn4step5enemy6common16BrainFlySinCurveFv + .byte4 onLanding__Q53scn4step5enemy6common16BrainFlySinCurveFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFlyStraight.s b/asm/src/BrainFlyStraight.s index 86507f10..be3b6fbf 100644 --- a/asm/src/BrainFlyStraight.s +++ b/asm/src/BrainFlyStraight.s @@ -36,9 +36,9 @@ __dt__Q53scn4step5enemy6owgulf16BrainFlyStraightFv: __vt__Q53scn4step5enemy6owgulf16BrainFlyStraight: .4byte 0 .4byte 0 - .4byte 0x802C9D1C ;# ptr - .4byte 0x802C9D14 ;# ptr - .4byte 0x802C9D18 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6owgulf16BrainFlyStraightFv + .byte4 onStart__Q53scn4step5enemy6owgulf16BrainFlyStraightFv + .byte4 onRecover__Q53scn4step5enemy6owgulf16BrainFlyStraightFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFlyUpDown.s b/asm/src/BrainFlyUpDown.s index 6ce32fef..741124fe 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 - .4byte 0x80291568 ;# ptr - .4byte 0x80291548 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6common14BrainFlyUpDown __vt__Q53scn4step5enemy6common14BrainFlyUpDown: .4byte 0 .4byte 0 - .4byte 0x80291564 ;# ptr - .4byte 0x80291490 ;# ptr - .4byte 0x80291540 ;# ptr - .4byte 0x80291544 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common14BrainFlyUpDownFv + .byte4 onStart__Q53scn4step5enemy6common14BrainFlyUpDownFv + .byte4 onRecover__Q53scn4step5enemy6common14BrainFlyUpDownFv + .byte4 onLanding__Q53scn4step5enemy6common14BrainFlyUpDownFv + .byte4 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 - .4byte 0x802D9824 ;# ptr - .4byte 0x802D9804 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6scarfy14BrainFlyUpDown __vt__Q53scn4step5enemy6scarfy14BrainFlyUpDown: .4byte 0 .4byte 0 - .4byte 0x802D9820 ;# ptr - .4byte 0x802D9784 ;# ptr - .4byte 0x802D9800 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6scarfy14BrainFlyUpDownFv + .byte4 onStart__Q53scn4step5enemy6scarfy14BrainFlyUpDownFv + .byte4 onRecover__Q53scn4step5enemy6scarfy14BrainFlyUpDownFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFlyWait.s b/asm/src/BrainFlyWait.s index 52b39d8e..b06a3a12 100644 --- a/asm/src/BrainFlyWait.s +++ b/asm/src/BrainFlyWait.s @@ -36,9 +36,9 @@ __dt__Q53scn4step5enemy6owgulf12BrainFlyWaitFv: __vt__Q53scn4step5enemy6owgulf12BrainFlyWait: .4byte 0 .4byte 0 - .4byte 0x802C9D64 ;# ptr - .4byte 0x802C9D5C ;# ptr - .4byte 0x802C9D60 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6owgulf12BrainFlyWaitFv + .byte4 onStart__Q53scn4step5enemy6owgulf12BrainFlyWaitFv + .byte4 onRecover__Q53scn4step5enemy6owgulf12BrainFlyWaitFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainFollow.s b/asm/src/BrainFollow.s index da943c78..c3bbcb86 100644 --- a/asm/src/BrainFollow.s +++ b/asm/src/BrainFollow.s @@ -89,9 +89,9 @@ __dt__Q53scn4step5enemy6juckle11BrainFollowFv: __vt__Q53scn4step5enemy6juckle11BrainFollow: .4byte 0 .4byte 0 - .4byte 0x802BB26C ;# ptr - .4byte 0x802BB1A8 ;# ptr - .4byte 0x802BB268 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6juckle11BrainFollowFv + .byte4 onStart__Q53scn4step5enemy6juckle11BrainFollowFv + .byte4 onRecover__Q53scn4step5enemy6juckle11BrainFollowFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainGrandLowper.s b/asm/src/BrainGrandLowper.s index 14e77747..b1cc53bc 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 - .4byte 0x80296388 ;# ptr - .4byte 0x80296368 ;# ptr + .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8armordee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8armordee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8armordee16BrainGrandLowper __vt__Q53scn4step5enemy8armordee16BrainGrandLowper: .4byte 0 .4byte 0 - .4byte 0x80296384 ;# ptr - .4byte 0x80296270 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802962EC ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy8armordee16BrainGrandLowperFv + .byte4 onStart__Q53scn4step5enemy8armordee16BrainGrandLowperFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy8armordee16BrainGrandLowperFv + .byte4 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 - .4byte 0x80296DE8 ;# ptr - .4byte 0x80296DC8 ;# ptr + .byte4 __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11bladeknight16BrainGrandLowper __vt__Q53scn4step5enemy11bladeknight16BrainGrandLowper: .4byte 0 .4byte 0 - .4byte 0x80296DE4 ;# ptr - .4byte 0x80296D44 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy11bladeknight16BrainGrandLowperFv + .byte4 onStart__Q53scn4step5enemy11bladeknight16BrainGrandLowperFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x8029CDD0 ;# ptr - .4byte 0x8029CDB0 ;# ptr + .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6bouncy16BrainGrandLowper __vt__Q53scn4step5enemy6bouncy16BrainGrandLowper: .4byte 0 .4byte 0 - .4byte 0x8029CDCC ;# ptr - .4byte 0x8029CC48 ;# ptr - .4byte 0x8029CCC4 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6bouncy16BrainGrandLowperFv + .byte4 onStart__Q53scn4step5enemy6bouncy16BrainGrandLowperFv + .byte4 onRecover__Q53scn4step5enemy6bouncy16BrainGrandLowperFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802A0D78 ;# ptr - .4byte 0x802A0D58 ;# ptr + .byte4 __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11broomhatter16BrainGrandLowper __vt__Q53scn4step5enemy11broomhatter16BrainGrandLowper: .4byte 0 .4byte 0 - .4byte 0x802A0D74 ;# ptr - .4byte 0x802A0CD0 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802A0D54 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy11broomhatter16BrainGrandLowperFv + .byte4 onStart__Q53scn4step5enemy11broomhatter16BrainGrandLowperFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy11broomhatter16BrainGrandLowperFv + .byte4 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 - .4byte 0x802BC704 ;# ptr - .4byte 0x802BC6E4 ;# ptr + .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4kabu16BrainGrandLowper __vt__Q53scn4step5enemy4kabu16BrainGrandLowper: .4byte 0 .4byte 0 - .4byte 0x802BC700 ;# ptr - .4byte 0x802BC600 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x802BC6C0 ;# ptr + .byte4 __dt__Q53scn4step5enemy4kabu16BrainGrandLowperFv + .byte4 onStart__Q53scn4step5enemy4kabu16BrainGrandLowperFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802C7988 ;# ptr - .4byte 0x802C7948 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C7984 ;# ptr - .4byte 0x802C7964 ;# ptr + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5nruff16BrainGrandLowper __vt__Q53scn4step5enemy5nruff16BrainGrandLowper: .4byte 0 .4byte 0 - .4byte 0x802C7980 ;# ptr - .4byte 0x802C77AC ;# ptr - .4byte 0x802C78B8 ;# ptr - .4byte 0x802C783C ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy5nruff16BrainGrandLowperFv + .byte4 onStart__Q53scn4step5enemy5nruff16BrainGrandLowperFv + .byte4 onRecover__Q53scn4step5enemy5nruff16BrainGrandLowperFv + .byte4 onLanding__Q53scn4step5enemy5nruff16BrainGrandLowperFv + .byte4 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 - .4byte 0x802D9904 ;# ptr - .4byte 0x802D98E4 ;# ptr + .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6scarfy16BrainGrandLowper __vt__Q53scn4step5enemy6scarfy16BrainGrandLowper: .4byte 0 .4byte 0 - .4byte 0x802D9900 ;# ptr - .4byte 0x802D9864 ;# ptr - .4byte 0x802D98E0 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6scarfy16BrainGrandLowperFv + .byte4 onStart__Q53scn4step5enemy6scarfy16BrainGrandLowperFv + .byte4 onRecover__Q53scn4step5enemy6scarfy16BrainGrandLowperFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802DCE74 ;# ptr - .4byte 0x802DCE54 ;# ptr + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5sheld16BrainGrandLowper __vt__Q53scn4step5enemy5sheld16BrainGrandLowper: .4byte 0 .4byte 0 - .4byte 0x802DCE70 ;# ptr - .4byte 0x802DCC8C ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802DCD08 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy5sheld16BrainGrandLowperFv + .byte4 onStart__Q53scn4step5enemy5sheld16BrainGrandLowperFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy5sheld16BrainGrandLowperFv + .byte4 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 - .4byte 0x802ED3A0 ;# ptr - .4byte 0x802ED380 ;# ptr + .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee16BrainGrandLowper __vt__Q53scn4step5enemy9waddledee16BrainGrandLowper: .4byte 0 .4byte 0 - .4byte 0x802ED39C ;# ptr - .4byte 0x802ED300 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802ED37C ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledee16BrainGrandLowperFv + .byte4 onStart__Q53scn4step5enemy9waddledee16BrainGrandLowperFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy9waddledee16BrainGrandLowperFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/BrainGround.s b/asm/src/BrainGround.s index d7202ec0..a6b5ddaa 100644 --- a/asm/src/BrainGround.s +++ b/asm/src/BrainGround.s @@ -65,9 +65,9 @@ __dt__Q53scn4step5enemy9tsukikage11BrainGroundFv: __vt__Q53scn4step5enemy9tsukikage11BrainGround: .4byte 0 .4byte 0 - .4byte 0x802EA4D8 ;# ptr - .4byte 0x802EA454 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy9tsukikage11BrainGroundFv + .byte4 onStart__Q53scn4step5enemy9tsukikage11BrainGroundFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainHang.s b/asm/src/BrainHang.s index 4c171d7b..c2ae5cba 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 - .4byte 0x802A70C4 ;# ptr - .4byte 0x802A70A4 ;# ptr + .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateHang$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateHang$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4como9BrainHang __vt__Q53scn4step5enemy4como9BrainHang: .4byte 0 .4byte 0 - .4byte 0x802A70C0 ;# ptr - .4byte 0x802A6F54 ;# ptr - .4byte 0x802A6FEC ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy4como9BrainHangFv + .byte4 onStart__Q53scn4step5enemy4como9BrainHangFv + .byte4 onRecover__Q53scn4step5enemy4como9BrainHangFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/BrainJump.s b/asm/src/BrainJump.s index 0c214c47..53f60a65 100644 --- a/asm/src/BrainJump.s +++ b/asm/src/BrainJump.s @@ -123,11 +123,11 @@ __dt__Q53scn4step5enemy4kabu9BrainJumpFv: __vt__Q53scn4step5enemy7blipper9BrainJump: .4byte 0 .4byte 0 - .4byte 0x80298D60 ;# ptr - .4byte 0x80298C78 ;# ptr - .4byte 0x80298D5C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy7blipper9BrainJumpFv + .byte4 onStart__Q53scn4step5enemy7blipper9BrainJumpFv + .byte4 onRecover__Q53scn4step5enemy7blipper9BrainJumpFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -135,9 +135,9 @@ __vt__Q53scn4step5enemy7blipper9BrainJump: __vt__Q53scn4step5enemy4kabu9BrainJump: .4byte 0 .4byte 0 - .4byte 0x802BC748 ;# ptr - .4byte 0x802BC744 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy4kabu9BrainJumpFv + .byte4 onStart__Q53scn4step5enemy4kabu9BrainJumpFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainJumpAttack.s b/asm/src/BrainJumpAttack.s index f9eb4410..ca01b7d5 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 - .4byte 0x802E12D8 ;# ptr - .4byte 0x802E12B8 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9sirkibble15BrainJumpAttack __vt__Q53scn4step5enemy9sirkibble15BrainJumpAttack: .4byte 0 .4byte 0 - .4byte 0x802E12D4 ;# ptr - .4byte 0x8027EE28 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802E1234 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy9sirkibble15BrainJumpAttackFv + .byte4 onStart__Q43scn4step5enemy9BrainBaseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy9sirkibble15BrainJumpAttackFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainJumpOrAttack.s b/asm/src/BrainJumpOrAttack.s index e6d921b5..e38a1bf8 100644 --- a/asm/src/BrainJumpOrAttack.s +++ b/asm/src/BrainJumpOrAttack.s @@ -50,9 +50,9 @@ __dt__Q53scn4step5enemy9waddledoo17BrainJumpOrAttackFv: __vt__Q53scn4step5enemy9waddledoo17BrainJumpOrAttack: .4byte 0 .4byte 0 - .4byte 0x802EF9D4 ;# ptr - .4byte 0x8027EE28 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802EF994 ;# ptr - .4byte 0x802EF998 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledoo17BrainJumpOrAttackFv + .byte4 onStart__Q43scn4step5enemy9BrainBaseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy9waddledoo17BrainJumpOrAttackFv + .byte4 update__Q53scn4step5enemy9waddledoo17BrainJumpOrAttackFv .4byte 0 diff --git a/asm/src/BrainMain.s b/asm/src/BrainMain.s index ce4b2645..09b93c22 100644 --- a/asm/src/BrainMain.s +++ b/asm/src/BrainMain.s @@ -71,11 +71,11 @@ __dt__Q53scn4step5enemy8dubiorjr9BrainMainFv: __vt__Q53scn4step5enemy8dubiorjr9BrainMain: .4byte 0 .4byte 0 - .4byte 0x802ADFB4 ;# ptr - .4byte 0x802ADF24 ;# ptr - .4byte 0x802ADFB0 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy8dubiorjr9BrainMainFv + .byte4 onStart__Q53scn4step5enemy8dubiorjr9BrainMainFv + .byte4 onRecover__Q53scn4step5enemy8dubiorjr9BrainMainFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/BrainMove.s b/asm/src/BrainMove.s index 045271e9..930a664e 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 - .4byte 0x80298E88 ;# ptr - .4byte 0x80298DA0 ;# ptr - .4byte 0x80298E84 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy7blipper9BrainMoveFv + .byte4 onStart__Q53scn4step5enemy7blipper9BrainMoveFv + .byte4 onRecover__Q53scn4step5enemy7blipper9BrainMoveFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1221,11 +1221,11 @@ __vt__Q53scn4step5enemy7blipper9BrainMove: __vt__Q53scn4step5enemy6bouncy9BrainMove: .4byte 0 .4byte 0 - .4byte 0x8029CF3C ;# ptr - .4byte 0x8029CE10 ;# ptr - .4byte 0x8029CEA0 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6bouncy9BrainMoveFv + .byte4 onStart__Q53scn4step5enemy6bouncy9BrainMoveFv + .byte4 onRecover__Q53scn4step5enemy6bouncy9BrainMoveFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1233,11 +1233,11 @@ __vt__Q53scn4step5enemy6bouncy9BrainMove: __vt__Q53scn4step5enemy6chilly9BrainMove: .4byte 0 .4byte 0 - .4byte 0x802A611C ;# ptr - .4byte 0x802A6098 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6chilly9BrainMoveFv + .byte4 onStart__Q53scn4step5enemy6chilly9BrainMoveFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802AF79C ;# ptr - .4byte 0x802AF67C ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802AF798 ;# ptr - .4byte 0x802AF6D8 ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4elec12StateMoveCCW __vt__Q53scn4step5enemy4elec12StateMoveCCW: .4byte 0 .4byte 0 - .4byte 0x802AF794 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802B0568 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B0A30 ;# ptr - .4byte 0x8028DDE8 ;# ptr - .4byte 0x802AF674 ;# ptr + .byte4 __dt__Q53scn4step5enemy4elec12StateMoveCCWFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy4elec9StateMoveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4elec9StateMoveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .byte4 isInitCWR__Q53scn4step5enemy4elec12StateMoveCCWCFv .global __vt__Q53scn4step5enemy4elec12StateMoveCWR __vt__Q53scn4step5enemy4elec12StateMoveCWR: .4byte 0 .4byte 0 - .4byte 0x802AF738 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802B0568 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B0A30 ;# ptr - .4byte 0x8028DDE8 ;# ptr - .4byte 0x802AF678 ;# ptr + .byte4 __dt__Q53scn4step5enemy4elec12StateMoveCWRFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy4elec9StateMoveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4elec9StateMoveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv + .byte4 isInitCWR__Q53scn4step5enemy4elec12StateMoveCWRCFv .global __vt__Q53scn4step5enemy4elec9BrainMove __vt__Q53scn4step5enemy4elec9BrainMove: .4byte 0 .4byte 0 - .4byte 0x802AF734 ;# ptr - .4byte 0x802AF518 ;# ptr - .4byte 0x802AF5F8 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy4elec9BrainMoveFv + .byte4 onStart__Q53scn4step5enemy4elec9BrainMoveFv + .byte4 onRecover__Q53scn4step5enemy4elec9BrainMoveFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1291,11 +1291,11 @@ __vt__Q53scn4step5enemy4elec9BrainMove: __vt__Q53scn4step5enemy6flamer9BrainMove: .4byte 0 .4byte 0 - .4byte 0x802B1F34 ;# ptr - .4byte 0x802B1E20 ;# ptr - .4byte 0x802B1F00 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6flamer9BrainMoveFv + .byte4 onStart__Q53scn4step5enemy6flamer9BrainMoveFv + .byte4 onRecover__Q53scn4step5enemy6flamer9BrainMoveFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802B43B4 ;# ptr - .4byte 0x802B4394 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5foley9BrainMove __vt__Q53scn4step5enemy5foley9BrainMove: .4byte 0 .4byte 0 - .4byte 0x802B43B0 ;# ptr - .4byte 0x802B4310 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy5foley9BrainMoveFv + .byte4 onStart__Q53scn4step5enemy5foley9BrainMoveFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802B8C28 ;# ptr - .4byte 0x802B8BC8 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo15StateMoveCircle$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo15StateMoveCircle$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveSinCurve$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveSinCurve$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802B8C24 ;# ptr - .4byte 0x802B8BE4 ;# ptr + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveSinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveSinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveStraight$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802B8C20 ;# ptr - .4byte 0x802B8C00 ;# ptr + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateMoveStraight$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5gordo9BrainMove __vt__Q53scn4step5enemy5gordo9BrainMove: .4byte 0 .4byte 0 - .4byte 0x802B8C1C ;# ptr - .4byte 0x802B8A7C ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy5gordo9BrainMoveFv + .byte4 onStart__Q53scn4step5enemy5gordo9BrainMoveFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1351,11 +1351,11 @@ __vt__Q53scn4step5enemy5gordo9BrainMove: __vt__Q53scn4step5enemy5rocky9BrainMove: .4byte 0 .4byte 0 - .4byte 0x802D38DC ;# ptr - .4byte 0x802D37A4 ;# ptr - .4byte 0x802D3828 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy5rocky9BrainMoveFv + .byte4 onStart__Q53scn4step5enemy5rocky9BrainMoveFv + .byte4 onRecover__Q53scn4step5enemy5rocky9BrainMoveFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802D616C ;# ptr - .4byte 0x802D614C ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8rollball9BrainMove __vt__Q53scn4step5enemy8rollball9BrainMove: .4byte 0 .4byte 0 - .4byte 0x802D6168 ;# ptr - .4byte 0x802D60C8 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy8rollball9BrainMoveFv + .byte4 onStart__Q53scn4step5enemy8rollball9BrainMoveFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802E2720 ;# ptr - .4byte 0x802E26E0 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802E271C ;# ptr - .4byte 0x802E26FC ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11sisterbound9BrainMove __vt__Q53scn4step5enemy11sisterbound9BrainMove: .4byte 0 .4byte 0 - .4byte 0x802E2718 ;# ptr - .4byte 0x802E25DC ;# ptr - .4byte 0x802E2664 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy11sisterbound9BrainMoveFv + .byte4 onStart__Q53scn4step5enemy11sisterbound9BrainMoveFv + .byte4 onRecover__Q53scn4step5enemy11sisterbound9BrainMoveFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802E87B0 ;# ptr - .4byte 0x802E8790 ;# ptr + .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy3sun9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy3sun9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy3sun9BrainMove __vt__Q53scn4step5enemy3sun9BrainMove: .4byte 0 .4byte 0 - .4byte 0x802E87AC ;# ptr - .4byte 0x802E870C ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy3sun9BrainMoveFv + .byte4 onStart__Q53scn4step5enemy3sun9BrainMoveFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainMoveAround.s b/asm/src/BrainMoveAround.s index 65a4df5d..ff1328ec 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 - .4byte 0x802BC8C0 ;# ptr - .4byte 0x802BC8A0 ;# ptr + .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4kabu15BrainMoveAround __vt__Q53scn4step5enemy4kabu15BrainMoveAround: .4byte 0 .4byte 0 - .4byte 0x802BC8BC ;# ptr - .4byte 0x802BC788 ;# ptr - .4byte 0x802BC814 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy4kabu15BrainMoveAroundFv + .byte4 onStart__Q53scn4step5enemy4kabu15BrainMoveAroundFv + .byte4 onRecover__Q53scn4step5enemy4kabu15BrainMoveAroundFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainMoveAttack.s b/asm/src/BrainMoveAttack.s index 31d1774a..0ca5f313 100644 --- a/asm/src/BrainMoveAttack.s +++ b/asm/src/BrainMoveAttack.s @@ -407,11 +407,11 @@ __dt__Q53scn4step5enemy10poppybrojr15BrainMoveAttackFv: __vt__Q53scn4step5enemy4elec15BrainMoveAttack: .4byte 0 .4byte 0 - .4byte 0x802AF9FC ;# ptr - .4byte 0x802AF7E4 ;# ptr - .4byte 0x802AF8C4 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x802AF978 ;# ptr + .byte4 __dt__Q53scn4step5enemy4elec15BrainMoveAttackFv + .byte4 onStart__Q53scn4step5enemy4elec15BrainMoveAttackFv + .byte4 onRecover__Q53scn4step5enemy4elec15BrainMoveAttackFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q53scn4step5enemy4elec15BrainMoveAttackFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -419,11 +419,11 @@ __vt__Q53scn4step5enemy4elec15BrainMoveAttack: __vt__Q53scn4step5enemy6flamer15BrainMoveAttack: .4byte 0 .4byte 0 - .4byte 0x802B2164 ;# ptr - .4byte 0x802B1F8C ;# ptr - .4byte 0x802B206C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6flamer15BrainMoveAttackFv + .byte4 onStart__Q53scn4step5enemy6flamer15BrainMoveAttackFv + .byte4 onRecover__Q53scn4step5enemy6flamer15BrainMoveAttackFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -431,11 +431,11 @@ __vt__Q53scn4step5enemy6flamer15BrainMoveAttack: __vt__Q53scn4step5enemy10poppybrojr15BrainMoveAttack: .4byte 0 .4byte 0 - .4byte 0x802D1630 ;# ptr - .4byte 0x802D15A8 ;# ptr - .4byte 0x802D162C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy10poppybrojr15BrainMoveAttackFv + .byte4 onStart__Q53scn4step5enemy10poppybrojr15BrainMoveAttackFv + .byte4 onRecover__Q53scn4step5enemy10poppybrojr15BrainMoveAttackFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/BrainMoveStraight.s b/asm/src/BrainMoveStraight.s index 33d646a1..1b1cb7a0 100644 --- a/asm/src/BrainMoveStraight.s +++ b/asm/src/BrainMoveStraight.s @@ -70,9 +70,9 @@ __dt__Q53scn4step5enemy4kabu17BrainMoveStraightFv: __vt__Q53scn4step5enemy4kabu17BrainMoveStraight: .4byte 0 .4byte 0 - .4byte 0x802BC98C ;# ptr - .4byte 0x802BC900 ;# ptr - .4byte 0x802BC988 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy4kabu17BrainMoveStraightFv + .byte4 onStart__Q53scn4step5enemy4kabu17BrainMoveStraightFv + .byte4 onRecover__Q53scn4step5enemy4kabu17BrainMoveStraightFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainNoseDive.s b/asm/src/BrainNoseDive.s index 7bc3d0ca..e6da96a1 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 - .4byte 0x802CB858 ;# ptr - .4byte 0x802CB818 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802CB854 ;# ptr - .4byte 0x802CB834 ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10parasoldee13BrainNoseDive __vt__Q53scn4step5enemy10parasoldee13BrainNoseDive: .4byte 0 .4byte 0 - .4byte 0x802CB850 ;# ptr - .4byte 0x802CB71C ;# ptr - .4byte 0x802CB798 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x802CB814 ;# ptr + .byte4 __dt__Q53scn4step5enemy10parasoldee13BrainNoseDiveFv + .byte4 onStart__Q53scn4step5enemy10parasoldee13BrainNoseDiveFv + .byte4 onRecover__Q53scn4step5enemy10parasoldee13BrainNoseDiveFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802CD984 ;# ptr - .4byte 0x802CD944 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802CD980 ;# ptr - .4byte 0x802CD960 ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo13StateNoseDive$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10parasoldoo13BrainNoseDive __vt__Q53scn4step5enemy10parasoldoo13BrainNoseDive: .4byte 0 .4byte 0 - .4byte 0x802CD97C ;# ptr - .4byte 0x802CD848 ;# ptr - .4byte 0x802CD8C4 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x802CD940 ;# ptr + .byte4 __dt__Q53scn4step5enemy10parasoldoo13BrainNoseDiveFv + .byte4 onStart__Q53scn4step5enemy10parasoldoo13BrainNoseDiveFv + .byte4 onRecover__Q53scn4step5enemy10parasoldoo13BrainNoseDiveFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q53scn4step5enemy10parasoldoo13BrainNoseDiveFv .4byte 0 diff --git a/asm/src/BrainPuff.s b/asm/src/BrainPuff.s index 704815f0..300a9970 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 - .4byte 0x802E79A4 ;# ptr - .4byte 0x802E7984 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect9StatePuff$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect9StatePuff$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10stareffect9BrainPuff __vt__Q53scn4step5enemy10stareffect9BrainPuff: .4byte 0 .4byte 0 - .4byte 0x802E79A0 ;# ptr - .4byte 0x802E7900 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy10stareffect9BrainPuffFv + .byte4 onStart__Q53scn4step5enemy10stareffect9BrainPuffFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainPursuit.s b/asm/src/BrainPursuit.s index 8548c408..660fe3e7 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 - .4byte 0x8029EFC8 ;# ptr - .4byte 0x8029EFA8 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10brontoburt12BrainPursuit __vt__Q53scn4step5enemy10brontoburt12BrainPursuit: .4byte 0 .4byte 0 - .4byte 0x8029EFC4 ;# ptr - .4byte 0x8029EF20 ;# ptr - .4byte 0x8029EFA4 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy10brontoburt12BrainPursuitFv + .byte4 onStart__Q53scn4step5enemy10brontoburt12BrainPursuitFv + .byte4 onRecover__Q53scn4step5enemy10brontoburt12BrainPursuitFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -161,9 +161,9 @@ __vt__Q53scn4step5enemy10brontoburt12BrainPursuit: __vt__Q53scn4step5enemy6shotzo12BrainPursuit: .4byte 0 .4byte 0 - .4byte 0x802E0198 ;# ptr - .4byte 0x802E0114 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6shotzo12BrainPursuitFv + .byte4 onStart__Q53scn4step5enemy6shotzo12BrainPursuitFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainPursuitCeil.s b/asm/src/BrainPursuitCeil.s index d6500dc9..875b2920 100644 --- a/asm/src/BrainPursuitCeil.s +++ b/asm/src/BrainPursuitCeil.s @@ -32,9 +32,9 @@ __dt__Q53scn4step5enemy6shotzo16BrainPursuitCeilFv: __vt__Q53scn4step5enemy6shotzo16BrainPursuitCeil: .4byte 0 .4byte 0 - .4byte 0x802E01DC ;# ptr - .4byte 0x802E01D8 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6shotzo16BrainPursuitCeilFv + .byte4 onStart__Q53scn4step5enemy6shotzo16BrainPursuitCeilFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainRelease.s b/asm/src/BrainRelease.s index ae60debe..04928d84 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 - .4byte 0x802CB9AC ;# ptr - .4byte 0x802CB98C ;# ptr + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10parasoldee12BrainRelease __vt__Q53scn4step5enemy10parasoldee12BrainRelease: .4byte 0 .4byte 0 - .4byte 0x802CB9A8 ;# ptr - .4byte 0x802CB898 ;# ptr - .4byte 0x802CB984 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x802CB988 ;# ptr + .byte4 __dt__Q53scn4step5enemy10parasoldee12BrainReleaseFv + .byte4 onStart__Q53scn4step5enemy10parasoldee12BrainReleaseFv + .byte4 onRecover__Q53scn4step5enemy10parasoldee12BrainReleaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802CDAD8 ;# ptr - .4byte 0x802CDAB8 ;# ptr + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10parasoldoo12BrainRelease __vt__Q53scn4step5enemy10parasoldoo12BrainRelease: .4byte 0 .4byte 0 - .4byte 0x802CDAD4 ;# ptr - .4byte 0x802CD9C4 ;# ptr - .4byte 0x802CDAB0 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x802CDAB4 ;# ptr + .byte4 __dt__Q53scn4step5enemy10parasoldoo12BrainReleaseFv + .byte4 onStart__Q53scn4step5enemy10parasoldoo12BrainReleaseFv + .byte4 onRecover__Q53scn4step5enemy10parasoldoo12BrainReleaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q53scn4step5enemy10parasoldoo12BrainReleaseFv .4byte 0 diff --git a/asm/src/BrainRise.s b/asm/src/BrainRise.s index 95b196d6..f4bdaa05 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 - .4byte 0x802CAAF4 ;# ptr - .4byte 0x802CAAD4 ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateLink$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateLink$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy7parasol9BrainRise __vt__Q53scn4step5enemy7parasol9BrainRise: .4byte 0 .4byte 0 - .4byte 0x802CAAF0 ;# ptr - .4byte 0x802CAA50 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy7parasol9BrainRiseFv + .byte4 onStart__Q53scn4step5enemy7parasol9BrainRiseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainRun.s b/asm/src/BrainRun.s index 363992f9..a1250ee6 100644 --- a/asm/src/BrainRun.s +++ b/asm/src/BrainRun.s @@ -74,9 +74,9 @@ __dt__Q53scn4step5enemy5nruff8BrainRunFv: __vt__Q53scn4step5enemy5nruff8BrainRun: .4byte 0 .4byte 0 - .4byte 0x802C7A64 ;# ptr - .4byte 0x802C79C8 ;# ptr - .4byte 0x802C7A60 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy5nruff8BrainRunFv + .byte4 onStart__Q53scn4step5enemy5nruff8BrainRunFv + .byte4 onRecover__Q53scn4step5enemy5nruff8BrainRunFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainShot.s b/asm/src/BrainShot.s index 0fb3b98d..151054fd 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 - .4byte 0x802D282C ;# ptr - .4byte 0x802D280C ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy14poppybrojrbomb9BrainShot __vt__Q53scn4step5enemy14poppybrojrbomb9BrainShot: .4byte 0 .4byte 0 - .4byte 0x802D2828 ;# ptr - .4byte 0x802D2788 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy14poppybrojrbomb9BrainShotFv + .byte4 onStart__Q53scn4step5enemy14poppybrojrbomb9BrainShotFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainSmoke.s b/asm/src/BrainSmoke.s index b402dcfc..b42cfdcb 100644 --- a/asm/src/BrainSmoke.s +++ b/asm/src/BrainSmoke.s @@ -65,9 +65,9 @@ __dt__Q53scn4step5enemy9tsukikage10BrainSmokeFv: __vt__Q53scn4step5enemy9tsukikage10BrainSmoke: .4byte 0 .4byte 0 - .4byte 0x802EA59C ;# ptr - .4byte 0x802EA518 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy9tsukikage10BrainSmokeFv + .byte4 onStart__Q53scn4step5enemy9tsukikage10BrainSmokeFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainTeleport.s b/asm/src/BrainTeleport.s index 5f484ad8..4e982e4d 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 - .4byte 0x802BCA7C ;# ptr - .4byte 0x802BCA5C ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu13StateTeleport$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu13StateTeleport$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4kabu13BrainTeleport __vt__Q53scn4step5enemy4kabu13BrainTeleport: .4byte 0 .4byte 0 - .4byte 0x802BCA78 ;# ptr - .4byte 0x802BC9CC ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy4kabu13BrainTeleportFv + .byte4 onStart__Q53scn4step5enemy4kabu13BrainTeleportFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainTeleportRepeat.s b/asm/src/BrainTeleportRepeat.s index 1d0602d9..d535f74f 100644 --- a/asm/src/BrainTeleportRepeat.s +++ b/asm/src/BrainTeleportRepeat.s @@ -113,9 +113,9 @@ __dt__Q53scn4step5enemy4kabu19BrainTeleportRepeatFv: __vt__Q53scn4step5enemy4kabu19BrainTeleportRepeat: .4byte 0 .4byte 0 - .4byte 0x802BCBE8 ;# ptr - .4byte 0x802BCABC ;# ptr - .4byte 0x802BCB78 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy4kabu19BrainTeleportRepeatFv + .byte4 onStart__Q53scn4step5enemy4kabu19BrainTeleportRepeatFv + .byte4 onRecover__Q53scn4step5enemy4kabu19BrainTeleportRepeatFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainWait.s b/asm/src/BrainWait.s index 66e81efc..820a6378 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 - .4byte 0x8029D094 ;# ptr - .4byte 0x8029CF7C ;# ptr - .4byte 0x8029D010 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6bouncy9BrainWaitFv + .byte4 onStart__Q53scn4step5enemy6bouncy9BrainWaitFv + .byte4 onRecover__Q53scn4step5enemy6bouncy9BrainWaitFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -985,11 +985,11 @@ __vt__Q53scn4step5enemy6bouncy9BrainWait: __vt__Q53scn4step5enemy6chilly9BrainWait: .4byte 0 .4byte 0 - .4byte 0x802A61E0 ;# ptr - .4byte 0x802A615C ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6chilly9BrainWaitFv + .byte4 onStart__Q53scn4step5enemy6chilly9BrainWaitFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802AD1CC ;# ptr - .4byte 0x802AD1AC ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6degout9BrainWait __vt__Q53scn4step5enemy6degout9BrainWait: .4byte 0 .4byte 0 - .4byte 0x802AD1C8 ;# ptr - .4byte 0x802AD12C ;# ptr - .4byte 0x802AD130 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6degout9BrainWaitFv + .byte4 onStart__Q53scn4step5enemy6degout9BrainWaitFv + .byte4 onRecover__Q53scn4step5enemy6degout9BrainWaitFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802B4498 ;# ptr - .4byte 0x802B4478 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5foley9BrainWait __vt__Q53scn4step5enemy5foley9BrainWait: .4byte 0 .4byte 0 - .4byte 0x802B4494 ;# ptr - .4byte 0x802B43F4 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy5foley9BrainWaitFv + .byte4 onStart__Q53scn4step5enemy5foley9BrainWaitFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1033,11 +1033,11 @@ __vt__Q53scn4step5enemy5foley9BrainWait: __vt__Q53scn4step5enemy5gemra9BrainWait: .4byte 0 .4byte 0 - .4byte 0x802B583C ;# ptr - .4byte 0x802B56C4 ;# ptr - .4byte 0x802B5774 ;# ptr - .4byte 0x802B5834 ;# ptr - .4byte 0x802B5838 ;# ptr + .byte4 __dt__Q53scn4step5enemy5gemra9BrainWaitFv + .byte4 onStart__Q53scn4step5enemy5gemra9BrainWaitFv + .byte4 onRecover__Q53scn4step5enemy5gemra9BrainWaitFv + .byte4 onLanding__Q53scn4step5enemy5gemra9BrainWaitFv + .byte4 update__Q53scn4step5enemy5gemra9BrainWaitFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1045,11 +1045,11 @@ __vt__Q53scn4step5enemy5gemra9BrainWait: __vt__Q53scn4step5enemy6lanzer9BrainWait: .4byte 0 .4byte 0 - .4byte 0x802C1C60 ;# ptr - .4byte 0x802C1B40 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802C1C18 ;# ptr - .4byte 0x802C1C1C ;# ptr + .byte4 __dt__Q53scn4step5enemy6lanzer9BrainWaitFv + .byte4 onStart__Q53scn4step5enemy6lanzer9BrainWaitFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy6lanzer9BrainWaitFv + .byte4 update__Q53scn4step5enemy6lanzer9BrainWaitFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1057,11 +1057,11 @@ __vt__Q53scn4step5enemy6lanzer9BrainWait: __vt__Q53scn4step5enemy5noddy9BrainWait: .4byte 0 .4byte 0 - .4byte 0x802C71E8 ;# ptr - .4byte 0x802C71E0 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802C71E4 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy5noddy9BrainWaitFv + .byte4 onStart__Q53scn4step5enemy5noddy9BrainWaitFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy5noddy9BrainWaitFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1069,11 +1069,11 @@ __vt__Q53scn4step5enemy5noddy9BrainWait: __vt__Q53scn4step5enemy11sisterbound9BrainWait: .4byte 0 .4byte 0 - .4byte 0x802E288C ;# ptr - .4byte 0x802E2760 ;# ptr - .4byte 0x802E282C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy11sisterbound9BrainWaitFv + .byte4 onStart__Q53scn4step5enemy11sisterbound9BrainWaitFv + .byte4 onRecover__Q53scn4step5enemy11sisterbound9BrainWaitFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1081,11 +1081,11 @@ __vt__Q53scn4step5enemy11sisterbound9BrainWait: __vt__Q53scn4step5enemy6sodory9BrainWait: .4byte 0 .4byte 0 - .4byte 0x802E4B04 ;# ptr - .4byte 0x802E4998 ;# ptr - .4byte 0x802E4AC0 ;# ptr - .4byte 0x802E4ABC ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6sodory9BrainWaitFv + .byte4 onStart__Q53scn4step5enemy6sodory9BrainWaitFv + .byte4 onRecover__Q53scn4step5enemy6sodory9BrainWaitFv + .byte4 onLanding__Q53scn4step5enemy6sodory9BrainWaitFv + .byte4 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 - .4byte 0x802ED574 ;# ptr - .4byte 0x802ED554 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee9BrainWait __vt__Q53scn4step5enemy9waddledee9BrainWait: .4byte 0 .4byte 0 - .4byte 0x802ED570 ;# ptr - .4byte 0x802ED3E8 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x802ED46C ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledee9BrainWaitFv + .byte4 onStart__Q53scn4step5enemy9waddledee9BrainWaitFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q53scn4step5enemy9waddledee9BrainWaitFv .4byte 0 diff --git a/asm/src/BrainWaitAndChase.s b/asm/src/BrainWaitAndChase.s index 8e331c8a..9d3b08e9 100644 --- a/asm/src/BrainWaitAndChase.s +++ b/asm/src/BrainWaitAndChase.s @@ -36,9 +36,9 @@ __dt__Q53scn4step5enemy6degout17BrainWaitAndChaseFv: __vt__Q53scn4step5enemy6degout17BrainWaitAndChase: .4byte 0 .4byte 0 - .4byte 0x802AD214 ;# ptr - .4byte 0x802AD20C ;# ptr - .4byte 0x802AD210 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6degout17BrainWaitAndChaseFv + .byte4 onStart__Q53scn4step5enemy6degout17BrainWaitAndChaseFv + .byte4 onRecover__Q53scn4step5enemy6degout17BrainWaitAndChaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainWaitAttack.s b/asm/src/BrainWaitAttack.s index 2bd98405..b969b53f 100644 --- a/asm/src/BrainWaitAttack.s +++ b/asm/src/BrainWaitAttack.s @@ -36,9 +36,9 @@ __dt__Q53scn4step5enemy10poppybrojr15BrainWaitAttackFv: __vt__Q53scn4step5enemy10poppybrojr15BrainWaitAttack: .4byte 0 .4byte 0 - .4byte 0x802D1678 ;# ptr - .4byte 0x802D1670 ;# ptr - .4byte 0x802D1674 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy10poppybrojr15BrainWaitAttackFv + .byte4 onStart__Q53scn4step5enemy10poppybrojr15BrainWaitAttackFv + .byte4 onRecover__Q53scn4step5enemy10poppybrojr15BrainWaitAttackFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainWaitFlyStraight.s b/asm/src/BrainWaitFlyStraight.s index 7fcb3f05..f9bdb074 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 - .4byte 0x8029F120 ;# ptr - .4byte 0x8029F100 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraight __vt__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraight: .4byte 0 .4byte 0 - .4byte 0x8029F11C ;# ptr - .4byte 0x8029F008 ;# ptr - .4byte 0x8029F084 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraightFv + .byte4 onStart__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraightFv + .byte4 onRecover__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraightFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainWaitPursuit.s b/asm/src/BrainWaitPursuit.s index 1c096c2a..6ea17614 100644 --- a/asm/src/BrainWaitPursuit.s +++ b/asm/src/BrainWaitPursuit.s @@ -67,9 +67,9 @@ __dt__Q53scn4step5enemy10brontoburt16BrainWaitPursuitFv: __vt__Q53scn4step5enemy10brontoburt16BrainWaitPursuit: .4byte 0 .4byte 0 - .4byte 0x8029F1E0 ;# ptr - .4byte 0x8029F160 ;# ptr - .4byte 0x8029F164 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy10brontoburt16BrainWaitPursuitFv + .byte4 onStart__Q53scn4step5enemy10brontoburt16BrainWaitPursuitFv + .byte4 onRecover__Q53scn4step5enemy10brontoburt16BrainWaitPursuitFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainWalk.s b/asm/src/BrainWalk.s index cb09bb14..a8f940a4 100644 --- a/asm/src/BrainWalk.s +++ b/asm/src/BrainWalk.s @@ -456,11 +456,11 @@ __dt__Q53scn4step5enemy5rocky9BrainWalkFv: __vt__Q53scn4step5enemy11bladeknight9BrainWalk: .4byte 0 .4byte 0 - .4byte 0x80296F28 ;# ptr - .4byte 0x80296EA0 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x80296F24 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy11bladeknight9BrainWalkFv + .byte4 onStart__Q53scn4step5enemy11bladeknight9BrainWalkFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy11bladeknight9BrainWalkFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -468,11 +468,11 @@ __vt__Q53scn4step5enemy11bladeknight9BrainWalk: __vt__Q53scn4step5enemy10knucklejoe9BrainWalk: .4byte 0 .4byte 0 - .4byte 0x802BF164 ;# ptr - .4byte 0x802BF0DC ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802BF160 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy10knucklejoe9BrainWalkFv + .byte4 onStart__Q53scn4step5enemy10knucklejoe9BrainWalkFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy10knucklejoe9BrainWalkFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -480,11 +480,11 @@ __vt__Q53scn4step5enemy10knucklejoe9BrainWalk: __vt__Q53scn4step5enemy6lanzer9BrainWalk: .4byte 0 .4byte 0 - .4byte 0x802C1D28 ;# ptr - .4byte 0x802C1CA0 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802C1D24 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6lanzer9BrainWalkFv + .byte4 onStart__Q53scn4step5enemy6lanzer9BrainWalkFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy6lanzer9BrainWalkFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -492,11 +492,11 @@ __vt__Q53scn4step5enemy6lanzer9BrainWalk: __vt__Q53scn4step5enemy5noddy9BrainWalk: .4byte 0 .4byte 0 - .4byte 0x802C72AC ;# ptr - .4byte 0x802C7228 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy5noddy9BrainWalkFv + .byte4 onStart__Q53scn4step5enemy5noddy9BrainWalkFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -504,11 +504,11 @@ __vt__Q53scn4step5enemy5noddy9BrainWalk: __vt__Q53scn4step5enemy10parasoldee9BrainWalk: .4byte 0 .4byte 0 - .4byte 0x802CBA70 ;# ptr - .4byte 0x802CB9EC ;# ptr - .4byte 0x802CBA68 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x802CBA6C ;# ptr + .byte4 __dt__Q53scn4step5enemy10parasoldee9BrainWalkFv + .byte4 onStart__Q53scn4step5enemy10parasoldee9BrainWalkFv + .byte4 onRecover__Q53scn4step5enemy10parasoldee9BrainWalkFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q53scn4step5enemy10parasoldee9BrainWalkFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -516,11 +516,11 @@ __vt__Q53scn4step5enemy10parasoldee9BrainWalk: __vt__Q53scn4step5enemy10parasoldoo9BrainWalk: .4byte 0 .4byte 0 - .4byte 0x802CDB9C ;# ptr - .4byte 0x802CDB18 ;# ptr - .4byte 0x802CDB94 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x802CDB98 ;# ptr + .byte4 __dt__Q53scn4step5enemy10parasoldoo9BrainWalkFv + .byte4 onStart__Q53scn4step5enemy10parasoldoo9BrainWalkFv + .byte4 onRecover__Q53scn4step5enemy10parasoldoo9BrainWalkFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q53scn4step5enemy10parasoldoo9BrainWalkFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -528,9 +528,9 @@ __vt__Q53scn4step5enemy10parasoldoo9BrainWalk: __vt__Q53scn4step5enemy5rocky9BrainWalk: .4byte 0 .4byte 0 - .4byte 0x802D3924 ;# ptr - .4byte 0x802D391C ;# ptr - .4byte 0x802D3920 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy5rocky9BrainWalkFv + .byte4 onStart__Q53scn4step5enemy5rocky9BrainWalkFv + .byte4 onRecover__Q53scn4step5enemy5rocky9BrainWalkFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainWalkAround.s b/asm/src/BrainWalkAround.s index 714042e3..79b60f1a 100644 --- a/asm/src/BrainWalkAround.s +++ b/asm/src/BrainWalkAround.s @@ -400,11 +400,11 @@ __dt__Q53scn4step5enemy9waddledoo15BrainWalkAroundFv: __vt__Q53scn4step5enemy6common15BrainWalkAround: .4byte 0 .4byte 0 - .4byte 0x8029162C ;# ptr - .4byte 0x8027EE28 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802915A8 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common15BrainWalkAroundFv + .byte4 onStart__Q43scn4step5enemy9BrainBaseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy6common15BrainWalkAroundFv + .byte4 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 - .4byte 0x802A0E5C ;# ptr - .4byte 0x802A0E3C ;# ptr + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11broomhatter15BrainWalkAround __vt__Q53scn4step5enemy11broomhatter15BrainWalkAround: .4byte 0 .4byte 0 - .4byte 0x802A0E58 ;# ptr - .4byte 0x8027EE28 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802A0DB8 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy11broomhatter15BrainWalkAroundFv + .byte4 onStart__Q43scn4step5enemy9BrainBaseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy11broomhatter15BrainWalkAroundFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -430,11 +430,11 @@ __vt__Q53scn4step5enemy11broomhatter15BrainWalkAround: __vt__Q53scn4step5enemy6lanzer15BrainWalkAround: .4byte 0 .4byte 0 - .4byte 0x802C1EE0 ;# ptr - .4byte 0x802C1D68 ;# ptr - .4byte 0x802C1E9C ;# ptr - .4byte 0x802C1E98 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6lanzer15BrainWalkAroundFv + .byte4 onStart__Q53scn4step5enemy6lanzer15BrainWalkAroundFv + .byte4 onRecover__Q53scn4step5enemy6lanzer15BrainWalkAroundFv + .byte4 onLanding__Q53scn4step5enemy6lanzer15BrainWalkAroundFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -442,11 +442,11 @@ __vt__Q53scn4step5enemy6lanzer15BrainWalkAround: __vt__Q53scn4step5enemy6sodory15BrainWalkAround: .4byte 0 .4byte 0 - .4byte 0x802E4C38 ;# ptr - .4byte 0x802E4B44 ;# ptr - .4byte 0x802E4BEC ;# ptr - .4byte 0x802E4BE8 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6sodory15BrainWalkAroundFv + .byte4 onStart__Q53scn4step5enemy6sodory15BrainWalkAroundFv + .byte4 onRecover__Q53scn4step5enemy6sodory15BrainWalkAroundFv + .byte4 onLanding__Q53scn4step5enemy6sodory15BrainWalkAroundFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -454,9 +454,9 @@ __vt__Q53scn4step5enemy6sodory15BrainWalkAround: __vt__Q53scn4step5enemy9waddledoo15BrainWalkAround: .4byte 0 .4byte 0 - .4byte 0x802EFA1C ;# ptr - .4byte 0x8027EE28 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802EFA14 ;# ptr - .4byte 0x802EFA18 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledoo15BrainWalkAroundFv + .byte4 onStart__Q43scn4step5enemy9BrainBaseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy9waddledoo15BrainWalkAroundFv + .byte4 update__Q53scn4step5enemy9waddledoo15BrainWalkAroundFv .4byte 0 diff --git a/asm/src/BrainWalkStepBack.s b/asm/src/BrainWalkStepBack.s index 5a818ab4..4e6d4a75 100644 --- a/asm/src/BrainWalkStepBack.s +++ b/asm/src/BrainWalkStepBack.s @@ -116,9 +116,9 @@ __dt__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv: __vt__Q53scn4step5enemy10knucklejoe17BrainWalkStepBack: .4byte 0 .4byte 0 - .4byte 0x802BF2C4 ;# ptr - .4byte 0x802BF1A4 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802BF29C ;# ptr - .4byte 0x802BF2A0 ;# ptr + .byte4 __dt__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv + .byte4 onStart__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv + .byte4 update__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv .4byte 0 diff --git a/asm/src/BrainWalkStraight.s b/asm/src/BrainWalkStraight.s index f4fc0de7..92baff3f 100644 --- a/asm/src/BrainWalkStraight.s +++ b/asm/src/BrainWalkStraight.s @@ -101,11 +101,11 @@ __dt__Q53scn4step5enemy9waddledoo17BrainWalkStraightFv: __vt__Q53scn4step5enemy6common17BrainWalkStraight: .4byte 0 .4byte 0 - .4byte 0x80291704 ;# ptr - .4byte 0x8027EE28 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x80291680 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common17BrainWalkStraightFv + .byte4 onStart__Q43scn4step5enemy9BrainBaseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy6common17BrainWalkStraightFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -113,9 +113,9 @@ __vt__Q53scn4step5enemy6common17BrainWalkStraight: __vt__Q53scn4step5enemy9waddledoo17BrainWalkStraight: .4byte 0 .4byte 0 - .4byte 0x802EFA64 ;# ptr - .4byte 0x8027EE28 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802EFA5C ;# ptr - .4byte 0x802EFA60 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledoo17BrainWalkStraightFv + .byte4 onStart__Q43scn4step5enemy9BrainBaseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy9waddledoo17BrainWalkStraightFv + .byte4 update__Q53scn4step5enemy9waddledoo17BrainWalkStraightFv .4byte 0 diff --git a/asm/src/BrainWalkTurnCliff.s b/asm/src/BrainWalkTurnCliff.s index f507a928..55c731df 100644 --- a/asm/src/BrainWalkTurnCliff.s +++ b/asm/src/BrainWalkTurnCliff.s @@ -32,9 +32,9 @@ __dt__Q53scn4step5enemy6common18BrainWalkTurnCliffFv: __vt__Q53scn4step5enemy6common18BrainWalkTurnCliff: .4byte 0 .4byte 0 - .4byte 0x80291748 ;# ptr - .4byte 0x8027EE28 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x80291744 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common18BrainWalkTurnCliffFv + .byte4 onStart__Q43scn4step5enemy9BrainBaseFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy6common18BrainWalkTurnCliffFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainWall.s b/asm/src/BrainWall.s index 8e27c18e..467a7aac 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 - .4byte 0x802EA6F4 ;# ptr - .4byte 0x802EA6D4 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9tsukikage9BrainWall __vt__Q53scn4step5enemy9tsukikage9BrainWall: .4byte 0 .4byte 0 - .4byte 0x802EA6F0 ;# ptr - .4byte 0x802EA5DC ;# ptr - .4byte 0x802EA658 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy9tsukikage9BrainWallFv + .byte4 onStart__Q53scn4step5enemy9tsukikage9BrainWallFv + .byte4 onRecover__Q53scn4step5enemy9tsukikage9BrainWallFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/BrainWhispy.s b/asm/src/BrainWhispy.s index 8062ad0e..bd68dc45 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 - .4byte 0x8029F2D8 ;# ptr - .4byte 0x8029F2B8 ;# ptr + .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10brontoburt11BrainWhispy __vt__Q53scn4step5enemy10brontoburt11BrainWhispy: .4byte 0 .4byte 0 - .4byte 0x8029F2D4 ;# ptr - .4byte 0x8029F220 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8029F2B4 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy10brontoburt11BrainWhispyFv + .byte4 onStart__Q53scn4step5enemy10brontoburt11BrainWhispyFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy10brontoburt11BrainWhispyFv + .byte4 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 - .4byte 0x802A7234 ;# ptr - .4byte 0x802A7214 ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como11StateAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como11StateAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4como11BrainWhispy __vt__Q53scn4step5enemy4como11BrainWhispy: .4byte 0 .4byte 0 - .4byte 0x802A7230 ;# ptr - .4byte 0x802A7104 ;# ptr - .4byte 0x802A7198 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy4como11BrainWhispyFv + .byte4 onStart__Q53scn4step5enemy4como11BrainWhispyFv + .byte4 onRecover__Q53scn4step5enemy4como11BrainWhispyFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802B8D24 ;# ptr - .4byte 0x802B8D04 ;# ptr + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5gordo11BrainWhispy __vt__Q53scn4step5enemy5gordo11BrainWhispy: .4byte 0 .4byte 0 - .4byte 0x802B8D20 ;# ptr - .4byte 0x802B8C68 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy5gordo11BrainWhispyFv + .byte4 onStart__Q53scn4step5enemy5gordo11BrainWhispyFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802D99FC ;# ptr - .4byte 0x802D99DC ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6scarfy11BrainWhispy __vt__Q53scn4step5enemy6scarfy11BrainWhispy: .4byte 0 .4byte 0 - .4byte 0x802D99F8 ;# ptr - .4byte 0x802D9944 ;# ptr - .4byte 0x802D99D8 ;# ptr - .4byte 0x8027EE30 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6scarfy11BrainWhispyFv + .byte4 onStart__Q53scn4step5enemy6scarfy11BrainWhispyFv + .byte4 onRecover__Q53scn4step5enemy6scarfy11BrainWhispyFv + .byte4 onLanding__Q43scn4step5enemy9BrainBaseFv + .byte4 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 - .4byte 0x802ED66C ;# ptr - .4byte 0x802ED64C ;# ptr + .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee11BrainWhispy __vt__Q53scn4step5enemy9waddledee11BrainWhispy: .4byte 0 .4byte 0 - .4byte 0x802ED668 ;# ptr - .4byte 0x802ED5B4 ;# ptr - .4byte 0x8027EE2C ;# ptr - .4byte 0x802ED648 ;# ptr - .4byte 0x8027EE34 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledee11BrainWhispyFv + .byte4 onStart__Q53scn4step5enemy9waddledee11BrainWhispyFv + .byte4 onRecover__Q43scn4step5enemy9BrainBaseFv + .byte4 onLanding__Q53scn4step5enemy9waddledee11BrainWhispyFv + .byte4 update__Q43scn4step5enemy9BrainBaseFv .4byte 0 diff --git a/asm/src/Button.s b/asm/src/Button.s index d229dcc1..81b61742 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: - .4byte 0x80556FB0 - .4byte 0x80556FB8 - .4byte 0x80556FC0 - .4byte 0x80556FC8 + .byte4 $$251953 + .byte4 $$251954 + .byte4 $$251955 + .byte4 $$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: - .4byte 0x804616A0 - .4byte 0x804616B0 - .4byte 0x804616C0 - .4byte 0x804616D0 - .4byte 0x804616DC - .4byte 0x804616EC - .4byte 0x80461700 - .4byte 0x80461710 - .4byte 0x80461720 - .4byte 0x80461730 - .4byte 0x80461740 - .4byte 0x80461750 - .4byte 0x8046175C + .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 .global TABLE_2__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2 TABLE_2__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2: - .4byte 0x804616A0 - .4byte 0x80461750 - .4byte 0x804616B0 - .4byte 0x804616D0 - .4byte 0x804616EC - .4byte 0x80461700 - .4byte 0x80461710 - .4byte 0x8046175C - .4byte 0x80461720 - .4byte 0x80461720 - .4byte 0x80461720 + .byte4 $$251572 + .byte4 $$251583 + .byte4 $$251573 + .byte4 $$251575 + .byte4 $$251577 + .byte4 $$251578 + .byte4 $$251579 + .byte4 $$251584 + .byte4 $$251580 + .byte4 $$251580 + .byte4 $$251580 .global TABLE_3__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2 TABLE_3__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2: - .4byte 0x804616A0 - .4byte 0x80461750 - .4byte 0x804616B0 - .4byte 0x804616D0 - .4byte 0x804616EC - .4byte 0x80461700 - .4byte 0x80461710 - .4byte 0x8046175C - .4byte 0x80461730 - .4byte 0x80461730 - .4byte 0x80461730 + .byte4 $$251572 + .byte4 $$251583 + .byte4 $$251573 + .byte4 $$251575 + .byte4 $$251577 + .byte4 $$251578 + .byte4 $$251579 + .byte4 $$251584 + .byte4 $$251581 + .byte4 $$251581 + .byte4 $$251581 .global $$252197 $$252197: .asciz "history/Detail" diff --git a/asm/src/CaptureHeroReceiver.s b/asm/src/CaptureHeroReceiver.s index 38efdc5d..e44d8298 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 - .4byte 0x80333B0C - .4byte 0x80333A50 + .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured25StateCapturedWhispyVacuum$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured25StateCapturedWhispyVacuum$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured24StateCapturedWhispyVomit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured24StateCapturedWhispyVomit$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80333B08 - .4byte 0x80333A6C + .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured24StateCapturedWhispyVomit$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured24StateCapturedWhispyVomit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80333B04 - .4byte 0x80333A88 + .byte4 __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyRelease$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyRelease$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80333B00 - .4byte 0x80333AA4 + .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyRelease$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyRelease$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWaterGalborosEat$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWaterGalborosEat$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80333AFC - .4byte 0x80333AC0 + .byte4 __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWaterGalborosEat$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWaterGalborosEat$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80333AF8 - .4byte 0x80333ADC + .byte4 __dt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 837655df..c622d51f 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: - .4byte 0x80460690 + .byte4 $$251790 .global $$252259 $$252259: .asciz "TopL" diff --git a/asm/src/ChainStarter.s b/asm/src/ChainStarter.s index 7e038b01..a80eb280 100644 --- a/asm/src/ChainStarter.s +++ b/asm/src/ChainStarter.s @@ -94,9 +94,9 @@ onSwitchOn__Q53scn4step7gimmick12chainstarter12ChainStarterFv: __vt__Q53scn4step7gimmick12chainstarter12ChainStarter: .4byte 0 .4byte 0 - .4byte 0x803057FC - .4byte 0x80305858 - .4byte 0x802F7CFC - .4byte 0x802F7CF8 - .4byte 0x802F7CF4 - .4byte 0x802F7CF0 + .byte4 __dt__Q53scn4step7gimmick12chainstarter12ChainStarterFv + .byte4 onSwitchOn__Q53scn4step7gimmick12chainstarter12ChainStarterFv + .byte4 onSwitchOff__Q43scn4step7gimmick14SwitchReceiverFv + .byte4 onSwitchToggle__Q43scn4step7gimmick14SwitchReceiverFv + .byte4 onSwitchOnFromSuperBeamSwitch__Q43scn4step7gimmick14SwitchReceiverFv + .byte4 checkDemoPos__Q43scn4step7gimmick14SwitchReceiverCFRQ33hel4math7Vector2 diff --git a/asm/src/ChallengeBattleCtrl.s b/asm/src/ChallengeBattleCtrl.s index d1c365cd..5bf0adeb 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 - .4byte 0x80333E00 - .4byte 0x80333DC0 + .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick24StateChallengeBattleLose$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick24StateChallengeBattleLose$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80333DFC - .4byte 0x80333DDC + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$1Fv diff --git a/asm/src/ChallengeDoor.s b/asm/src/ChallengeDoor.s index 58f2d484..0bd2f761 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: - .4byte 0x80480800 - .4byte 0x80480810 - .4byte 0x80480820 + .byte4 $$257573 + .byte4 $$257574 + .byte4 $$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 - .4byte 0x80307ECC - .4byte 0x80307EA4 + .byte4 __dt__Q24util154StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateEnterChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4Q33scn4step13ChallengeKind$$4b$$1Fv + .byte4 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 - .4byte 0x80306740 + .byte4 __dt__Q53scn4step7gimmick13challengedoor13ChallengeDoorFv .4byte 0 - .4byte 0x80306848 - .4byte 0x80306D6C - .4byte 0x80306D70 - .4byte 0x80306D74 - .4byte 0x80306D78 - .4byte 0x802FC218 - .4byte 0x80305FC4 - .4byte 0x803076D8 - .4byte 0x803076DC - .4byte 0x803076E0 - .4byte 0x803076E4 - .4byte 0x80307C68 - .4byte 0x80307BA0 - .4byte 0x80307BC8 - .4byte 0x80307C24 - .4byte 0x803079C0 - .4byte 0x803079CC + .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 .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 97a1d5da..a0cc7927 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: - .4byte 0x80480A34 - .4byte 0x80480A40 - .4byte 0x80480A4C - .4byte 0x80480A58 - .4byte 0x80480A64 - .4byte 0x80480A70 - .4byte 0x80480A7C - .4byte 0x80480A8C - .4byte 0x80480A98 - .4byte 0x80480AA4 - .4byte 0x80480AB0 - .4byte 0x80480ABC - .4byte 0x80480AC8 + .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 .global $$255490 $$255490: - .4byte 0x8055A60C - .4byte 0x8055A614 - .4byte 0x8055A61C + .byte4 $$255487 + .byte4 $$255488 + .byte4 $$255489 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256036 @@ -992,25 +992,25 @@ $$256299: __vt__Q53scn4step7gimmick13challengedoor19ChallengeDoorMaster: .4byte 0 .4byte 0 - .4byte 0x80308064 - .4byte 0x80308A50 - .4byte 0x803080E8 - .4byte 0x8030811C - .4byte 0x80308130 - .4byte 0x80308144 - .4byte 0x80308198 - .4byte 0x80308234 - .4byte 0x80308348 - .4byte 0x803083A8 - .4byte 0x80308440 - .4byte 0x803083F8 - .4byte 0x80308450 - .4byte 0x80307C68 - .4byte 0x803086D0 - .4byte 0x803086F8 - .4byte 0x80307C24 - .4byte 0x80308720 - .4byte 0x80308724 + .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 .asciz "NW4R:Pointer must not be NULL (p)" .balign 4 .asciz "LinkList.h" @@ -1055,7 +1055,7 @@ $$256158: .4byte 0 .global $$255480 $$255480: - .4byte 0x8055A5FC + .byte4 $$255478 .global lbl_805627C4 lbl_805627C4: - .4byte 0x8055A604 + .byte4 $$255479 diff --git a/asm/src/ChallengeDoorMasterEx.s b/asm/src/ChallengeDoorMasterEx.s index 55c38dd4..5180cbfa 100644 --- a/asm/src/ChallengeDoorMasterEx.s +++ b/asm/src/ChallengeDoorMasterEx.s @@ -505,25 +505,25 @@ $$256693: __vt__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterEx: .4byte 0 .4byte 0 - .4byte 0x80308AE8 - .4byte 0x803090CC - .4byte 0x80308B54 - .4byte 0x80306D6C - .4byte 0x80306D70 - .4byte 0x80306D74 - .4byte 0x80308BB4 - .4byte 0x80308C10 - .4byte 0x80308C54 - .4byte 0x803076D8 - .4byte 0x80308CA0 - .4byte 0x803076E0 - .4byte 0x80308CFC - .4byte 0x80307C68 - .4byte 0x80308D84 - .4byte 0x80309054 - .4byte 0x80308D88 - .4byte 0x8030904C - .4byte 0x80309050 + .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 .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 673335b7..73dcb655 100644 --- a/asm/src/ChallengeDoorMusou.s +++ b/asm/src/ChallengeDoorMusou.s @@ -276,25 +276,25 @@ $$255023: __vt__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusou: .4byte 0 .4byte 0 - .4byte 0x8030918C - .4byte 0x80309410 - .4byte 0x803091F8 - .4byte 0x80306D6C - .4byte 0x80306D70 - .4byte 0x80306D74 - .4byte 0x80306D78 - .4byte 0x80309278 - .4byte 0x803092BC - .4byte 0x803076D8 - .4byte 0x80309300 - .4byte 0x803076E0 - .4byte 0x80309354 - .4byte 0x80307C68 - .4byte 0x80307BA0 - .4byte 0x80307BC8 - .4byte 0x80307C24 - .4byte 0x803079C0 - .4byte 0x803079CC + .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 .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 457fc6f0..859acc99 100644 --- a/asm/src/ChallengeDoorMusouEx.s +++ b/asm/src/ChallengeDoorMusouEx.s @@ -387,25 +387,25 @@ $$256697: __vt__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouEx: .4byte 0 .4byte 0 - .4byte 0x803094A8 - .4byte 0x803098D4 - .4byte 0x803094AC - .4byte 0x80306D6C - .4byte 0x80306D70 - .4byte 0x80306D74 - .4byte 0x8030950C - .4byte 0x80309510 - .4byte 0x80309554 - .4byte 0x803076D8 - .4byte 0x803095A0 - .4byte 0x803076E0 - .4byte 0x803095FC - .4byte 0x80307C68 - .4byte 0x80309600 - .4byte 0x80309604 - .4byte 0x80309608 - .4byte 0x803098CC - .4byte 0x803098D0 + .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 .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 95f1eb0a..1db720c4 100644 --- a/asm/src/ChallengeDoorNormal.s +++ b/asm/src/ChallengeDoorNormal.s @@ -216,25 +216,25 @@ $$255043: __vt__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormal: .4byte 0 .4byte 0 - .4byte 0x803099D4 - .4byte 0x80309AF8 - .4byte 0x803099D8 - .4byte 0x80306D6C - .4byte 0x80306D70 - .4byte 0x80306D74 - .4byte 0x80306D78 - .4byte 0x80309A58 - .4byte 0x80309A9C - .4byte 0x803076D8 - .4byte 0x80309AA0 - .4byte 0x803076E0 - .4byte 0x80309AF4 - .4byte 0x80307C68 - .4byte 0x80307BA0 - .4byte 0x80307BC8 - .4byte 0x80307C24 - .4byte 0x803079C0 - .4byte 0x803079CC + .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 .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 e23079e0..8e895982 100644 --- a/asm/src/ChallengeDoorTraining.s +++ b/asm/src/ChallengeDoorTraining.s @@ -186,25 +186,25 @@ $$254641: __vt__Q53scn4step7gimmick13challengedoor21ChallengeDoorTraining: .4byte 0 .4byte 0 - .4byte 0x80309B6C - .4byte 0x80309D08 - .4byte 0x80309BC8 - .4byte 0x80306D6C - .4byte 0x80306D70 - .4byte 0x80306D74 - .4byte 0x80306D78 - .4byte 0x80309C1C - .4byte 0x80309C60 - .4byte 0x803076D8 - .4byte 0x80309C64 - .4byte 0x803076E0 - .4byte 0x80309CB0 - .4byte 0x80309D04 - .4byte 0x80309CB4 - .4byte 0x80309CDC - .4byte 0x80307C24 - .4byte 0x803079C0 - .4byte 0x803079CC + .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 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254622 diff --git a/asm/src/ChallengeKindUtil.s b/asm/src/ChallengeKindUtil.s index f1583adf..df75f0b2 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 - .4byte 0x80558DA0 - .4byte 0x80558DA0 - .4byte 0x80558DA8 - .4byte 0x80558DA0 + .byte4 $$248746 + .byte4 $$248746 + .byte4 $$248747 + .byte4 $$248746 .4byte 0 .4byte 0x40400000 .4byte 0x0000000B .4byte 0x00000005 - .4byte 0x80558DB0 - .4byte 0x80558DB0 - .4byte 0x80558DB8 - .4byte 0x80558DB0 + .byte4 $$248748 + .byte4 $$248748 + .byte4 $$248749 + .byte4 $$248748 .4byte 0x00000022 .4byte 0x3F800000 .4byte 0x00000008 .4byte 0x00000004 - .4byte 0x80558DBC - .4byte 0x80558DBC - .4byte 0x80558DC4 - .4byte 0x80558DBC + .byte4 $$248750 + .byte4 $$248750 + .byte4 $$248751 + .byte4 $$248750 .4byte 0x0000000F .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80558DC8 - .4byte 0x80558DC8 - .4byte 0x80558DD0 - .4byte 0x80558DD4 + .byte4 $$248752 + .byte4 $$248752 + .byte4 $$248753 + .byte4 $$248754 .4byte 0x00000026 .4byte 0x40000000 .4byte 0x00000004 .4byte 0x00000003 - .4byte 0x80558DDC - .4byte 0x80558DDC - .4byte 0x80558DE4 - .4byte 0x80558DDC + .byte4 $$248755 + .byte4 $$248755 + .byte4 $$248756 + .byte4 $$248755 .4byte 0x0000000B .4byte 0x40A00000 .4byte 0x00000015 .4byte 0x00000007 - .4byte 0x80558DE8 - .4byte 0x80558DE8 - .4byte 0x80558DF0 - .4byte 0x80558DE8 + .byte4 $$248757 + .byte4 $$248757 + .byte4 $$248758 + .byte4 $$248757 .4byte 0x00000019 .4byte 0x40C00000 .4byte 0x00000013 .4byte 0x00000006 - .4byte 0x80558DF4 - .4byte 0x80558DF4 - .4byte 0x80558DFC - .4byte 0x80558DF4 + .byte4 $$248759 + .byte4 $$248759 + .byte4 $$248760 + .byte4 $$248759 .4byte 0x0000001A .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80558E00 - .4byte 0x80558E00 - .4byte 0x80558E08 - .4byte 0x80558DD4 + .byte4 $$248761 + .byte4 $$248761 + .byte4 $$248762 + .byte4 $$248754 .4byte 0x00000027 .4byte 0x41000000 .4byte 0x00000018 .4byte 0x00000008 - .4byte 0x80558E0C - .4byte 0x80558E0C - .4byte 0x80558E14 - .4byte 0x80558E0C + .byte4 $$248763 + .byte4 $$248763 + .byte4 $$248764 + .byte4 $$248763 .4byte 0x00000013 .4byte 0x40E00000 .4byte 0 .4byte 0 - .4byte 0x80558DD4 - .4byte 0x80558DD4 - .4byte 0x80558E18 - .4byte 0x80558DD4 + .byte4 $$248754 + .byte4 $$248754 + .byte4 $$248765 + .byte4 $$248754 .4byte 0x0000001E .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80558E20 - .4byte 0x80558E20 - .4byte 0x80558E28 - .4byte 0x80558DD4 + .byte4 $$248766 + .byte4 $$248766 + .byte4 $$248767 + .byte4 $$248754 .4byte 0x00000028 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80558E30 - .4byte 0x80558E30 - .4byte 0x80558E38 - .4byte 0x80558DD4 + .byte4 $$248768 + .byte4 $$248768 + .byte4 $$248769 + .byte4 $$248754 .4byte 0x00000029 .4byte 0x41000000 .4byte 0x00000018 .4byte 0x00000008 - .4byte 0x80558E40 - .4byte 0x80558E0C - .4byte 0x80558E48 - .4byte 0x80558E0C + .byte4 $$248770 + .byte4 $$248763 + .byte4 $$248771 + .byte4 $$248763 .4byte 0x00000004 .4byte 0x41000000 .4byte 0 .4byte 0 - .4byte 0x804639F8 - .4byte 0x804639F8 - .4byte 0x80558E50 - .4byte 0x80558DD4 + .byte4 $$248772 + .byte4 $$248772 + .byte4 $$248773 + .byte4 $$248754 .4byte 0x0000002A .4byte 0x41000000 .4byte 0 .4byte 0 - .4byte 0x80463A04 - .4byte 0x80463A04 - .4byte 0x80558E54 - .4byte 0x80558DD4 + .byte4 $$248774 + .byte4 $$248774 + .byte4 $$248775 + .byte4 $$248754 .4byte 0x0000002B .4byte 0x41000000 .4byte 0 .4byte 0 - .4byte 0x80463A10 - .4byte 0x80463A10 - .4byte 0x80558E58 - .4byte 0x80558DD4 + .byte4 $$248776 + .byte4 $$248776 + .byte4 $$248777 + .byte4 $$248754 .4byte 0x0000002C .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/src/Chara.s b/asm/src/Chara.s index 2b6cc8c1..f4019720 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: - .4byte 0x80557CB8 - .4byte 0x8045EAD0 - .4byte 0x8045EAF0 - .4byte 0x80557CC0 - .4byte 0x8045EAD0 - .4byte 0x8045EAF0 - .4byte 0x80557CC8 - .4byte 0x8045EAD0 - .4byte 0x8045EAF0 - .4byte 0x80557CD0 - .4byte 0x8045EAD0 - .4byte 0x8045EAF0 - .4byte 0x80557CD8 - .4byte 0x8045EAD0 - .4byte 0x8045EAF0 - .4byte 0x80557CE0 - .4byte 0x8045EAD0 - .4byte 0x8045EAF0 - .4byte 0x80557CE8 - .4byte 0x8045EAD0 - .4byte 0x8045EAF0 + .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 .global $$253282 $$253282: - .4byte 0x8045EB08 - .4byte 0x8045EB18 - .4byte 0x8045EB28 - .4byte 0x8045EB38 - .4byte 0x8045EB48 + .byte4 $$253277 + .byte4 $$253278 + .byte4 $$253279 + .byte4 $$253280 + .byte4 $$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: - .4byte 0x805583B0 - .4byte 0x804606B8 - .4byte 0x804606B8 - .4byte 0x805583B8 - .4byte 0x804606CC - .4byte 0x804606CC - .4byte 0x805583C0 - .4byte 0x804606E4 - .4byte 0x804606E4 - .4byte 0x805583B0 - .4byte 0x804606F8 - .4byte 0x80460718 - .4byte 0x805583B8 - .4byte 0x8046072C - .4byte 0x80460750 - .4byte 0x805583C0 - .4byte 0x80460768 - .4byte 0x80460768 - .4byte 0x805583C8 - .4byte 0x80460778 - .4byte 0x80460778 - .4byte 0x805583D0 - .4byte 0x80460778 - .4byte 0x80460778 - .4byte 0x805583D8 - .4byte 0x80460788 - .4byte 0x80460788 - .4byte 0x804607A0 - .4byte 0x804607AC - .4byte 0x804607AC - .4byte 0x804607C0 - .4byte 0x804607CC - .4byte 0x804607CC + .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 .global $$253204 $$253204: - .4byte 0x804607E4 - .4byte 0x804607F4 - .4byte 0x80460804 - .4byte 0x80460814 - .4byte 0x80460824 + .byte4 $$253199 + .byte4 $$253200 + .byte4 $$253201 + .byte4 $$253202 + .byte4 $$253203 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253229 diff --git a/asm/src/CharaAnimBlender.s b/asm/src/CharaAnimBlender.s index dbb9a522..124fcfed 100644 --- a/asm/src/CharaAnimBlender.s +++ b/asm/src/CharaAnimBlender.s @@ -958,26 +958,26 @@ $$249981: __vt__Q23g3d16CharaAnimBlender: .4byte 0 .4byte 0 - .4byte 0x800D9600 ;# ptr - .4byte 0x800D8380 ;# ptr - .4byte 0x8018CC24 ;# ptr - .4byte 0x800D9710 ;# ptr - .4byte 0x800D9700 ;# ptr - .4byte 0x800D8020 ;# ptr - .4byte 0x800D8030 ;# ptr - .4byte 0x800D8010 ;# ptr - .4byte 0x800D8090 ;# ptr - .4byte 0x800D80A0 ;# ptr - .4byte 0x8018C94C ;# ptr - .4byte 0x800D8220 ;# ptr - .4byte 0x8018C2B4 ;# ptr - .4byte 0x800D7FE0 ;# ptr - .4byte 0x800D7FF0 ;# ptr - .4byte 0x800D8000 ;# ptr - .4byte 0x800D7E70 ;# ptr - .4byte 0x800D7E80 ;# ptr - .4byte 0x800D8110 ;# ptr - .4byte 0x800D8230 ;# ptr + .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 .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 7ba28524..0af7c153 100644 --- a/asm/src/CharaModel.s +++ b/asm/src/CharaModel.s @@ -615,5 +615,5 @@ onDirty__Q23g3d10CharaModelFv: __vt__Q23g3d10CharaModel: .4byte 0 .4byte 0 - .4byte 0x8018D060 ;# ptr - .4byte 0x8018D648 ;# ptr + .byte4 __dt__Q23g3d10CharaModelFv + .byte4 onFrameChanged__Q23g3d10CharaModelFRCQ23g3d17ModelAnimAccessor diff --git a/asm/src/Chronology.s b/asm/src/Chronology.s index 5a493d76..6be00ec6 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 - .4byte 0x80558498 - .4byte 0x80460CD0 + .byte4 $$248724 + .byte4 $$248725 .4byte 0 - .4byte 0x80460CDC + .byte4 $$248726 .4byte 0x000007C8 - .4byte 0x8055849C - .4byte 0x805584A4 + .byte4 $$248727 + .byte4 $$248728 .4byte 0 - .4byte 0x80460CDC + .byte4 $$248726 .4byte 0x000007C9 - .4byte 0x8055849C - .4byte 0x805584AC + .byte4 $$248727 + .byte4 $$248729 .4byte 0 - .4byte 0x80460CE8 + .byte4 $$248730 .4byte 0x000007C9 - .4byte 0x8055849C - .4byte 0x805584A4 + .byte4 $$248727 + .byte4 $$248728 .4byte 0x00000001 - .4byte 0x80460CF8 + .byte4 $$248731 .4byte 0x000007CA - .4byte 0x8055849C - .4byte 0x805584B0 + .byte4 $$248727 + .byte4 $$248732 .4byte 0 - .4byte 0x80460CDC + .byte4 $$248726 .4byte 0x000007CB - .4byte 0x8055849C - .4byte 0x805584B8 + .byte4 $$248727 + .byte4 $$248733 .4byte 0 - .4byte 0x80460D08 + .byte4 $$248734 .4byte 0x000007CB - .4byte 0x8055849C - .4byte 0x805584B8 + .byte4 $$248727 + .byte4 $$248733 .4byte 0x00000001 - .4byte 0x80460D14 + .byte4 $$248735 .4byte 0x000007CB - .4byte 0x8055849C - .4byte 0x805584A4 + .byte4 $$248727 + .byte4 $$248728 .4byte 0x00000002 - .4byte 0x80460D20 + .byte4 $$248736 .4byte 0x000007CC - .4byte 0x8055849C - .4byte 0x805584A4 + .byte4 $$248727 + .byte4 $$248728 .4byte 0x00000003 - .4byte 0x80460CE8 + .byte4 $$248730 .4byte 0x000007CC - .4byte 0x8055849C - .4byte 0x805584B8 + .byte4 $$248727 + .byte4 $$248733 .4byte 0x00000002 - .4byte 0x80460CF8 + .byte4 $$248731 .4byte 0x000007CD - .4byte 0x8055849C - .4byte 0x805584A4 + .byte4 $$248727 + .byte4 $$248728 .4byte 0x00000004 - .4byte 0x80460CE8 + .byte4 $$248730 .4byte 0x000007CD - .4byte 0x8055849C - .4byte 0x805584B8 + .byte4 $$248727 + .byte4 $$248733 .4byte 0x00000003 - .4byte 0x80460CF8 + .byte4 $$248731 .4byte 0x000007CE - .4byte 0x8055849C - .4byte 0x805584C0 + .byte4 $$248727 + .byte4 $$248737 .4byte 0 - .4byte 0x80460CDC + .byte4 $$248726 .4byte 0x000007CF - .4byte 0x8055849C - .4byte 0x805584C8 + .byte4 $$248727 + .byte4 $$248738 .4byte 0 - .4byte 0x80460CDC + .byte4 $$248726 .4byte 0x000007D0 - .4byte 0x8055849C - .4byte 0x805584B8 + .byte4 $$248727 + .byte4 $$248733 .4byte 0x00000004 - .4byte 0x80460CDC + .byte4 $$248726 .4byte 0x000007D1 - .4byte 0x8055849C - .4byte 0x805584A4 + .byte4 $$248727 + .byte4 $$248728 .4byte 0x00000005 - .4byte 0x80460CDC + .byte4 $$248726 .4byte 0x000007D2 - .4byte 0x8055849C - .4byte 0x805584A4 + .byte4 $$248727 + .byte4 $$248728 .4byte 0x00000006 - .4byte 0x80460CE8 + .byte4 $$248730 .4byte 0x000007D2 - .4byte 0x8055849C - .4byte 0x805584D0 + .byte4 $$248727 + .byte4 $$248739 .4byte 0 - .4byte 0x80460CF8 + .byte4 $$248731 .4byte 0x000007D3 - .4byte 0x8055849C - .4byte 0x805584D8 + .byte4 $$248727 + .byte4 $$248740 .4byte 0 - .4byte 0x80460CDC + .byte4 $$248726 .4byte 0x000007D4 - .4byte 0x8055849C - .4byte 0x805584A4 + .byte4 $$248727 + .byte4 $$248728 .4byte 0x00000007 - .4byte 0x80460CDC + .byte4 $$248726 .4byte 0x000007D5 - .4byte 0x8055849C - .4byte 0x805584DC + .byte4 $$248727 + .byte4 $$248741 .4byte 0 - .4byte 0x80460CDC + .byte4 $$248726 .4byte 0x000007D6 - .4byte 0x8055849C - .4byte 0x805584DC + .byte4 $$248727 + .byte4 $$248741 .4byte 0x00000001 - .4byte 0x80460CDC + .byte4 $$248726 .4byte 0x000007D7 - .4byte 0x8055849C - .4byte 0x805584E0 + .byte4 $$248727 + .byte4 $$248742 .4byte 0 - .4byte 0x80460CDC + .byte4 $$248726 .4byte 0x000007D8 - .4byte 0x8055849C - .4byte 0x805584DC + .byte4 $$248727 + .byte4 $$248741 .4byte 0x00000002 - .4byte 0x80460CDC + .byte4 $$248726 .4byte 0x000007D9 - .4byte 0x8055849C - .4byte 0x80460D2C + .byte4 $$248727 + .byte4 $$248743 .4byte 0 - .4byte 0x80460CDC + .byte4 $$248726 .4byte 0x000007DA - .4byte 0x8055849C - .4byte 0x805584E8 + .byte4 $$248727 + .byte4 $$248744 .4byte 0 - .4byte 0x80460CDC + .byte4 $$248726 .4byte 0x000007DB - .4byte 0x8055849C - .4byte 0x805584DC + .byte4 $$248727 + .byte4 $$248741 .4byte 0x00000003 - .4byte 0x80460CE8 + .byte4 $$248730 .4byte 0x000007DB - .4byte 0x8055849C - .4byte 0x805584E8 + .byte4 $$248727 + .byte4 $$248744 .4byte 0x00000001 - .4byte 0x80460CF8 + .byte4 $$248731 .4byte 0x000007DC - .4byte 0x8055849C - .4byte 0x805584EC + .byte4 $$248727 + .byte4 $$248745 .4byte 0 - .4byte 0x80460CDC + .byte4 $$248726 .global $$248900 $$248900: .asciz "DotKirby" diff --git a/asm/src/CinemaScope.s b/asm/src/CinemaScope.s index e636633a..ff2bad0f 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: - .4byte 0x804608E8 + .byte4 $$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: - .4byte 0x80492C10 - .4byte 0x80492C28 + .byte4 $$251630 + .byte4 $$251631 diff --git a/asm/src/Color.s b/asm/src/Color.s index bdc02053..410c0d39 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 - .4byte 0x8019D88C ;# ptr + .byte4 __sinit_$$3Color_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global BLACK__Q33hel6common5Color diff --git a/asm/src/Commander.s b/asm/src/Commander.s index d18d8e0c..5cd56432 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 - .4byte 0x801EC444 ;# ptr - .4byte 0x80203844 ;# ptr + .byte4 __sinit_$$3Commander_cpp + .byte4 __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 e2edb05a..ca17968d 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: - .4byte 0x804857A0 + .byte4 $$248726 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804857C0 + .byte4 $$248727 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804857F0 + .byte4 $$248728 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485810 + .byte4 $$248729 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485834 + .byte4 $$248730 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485854 + .byte4 $$248731 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485878 + .byte4 $$248732 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485898 + .byte4 $$248733 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804858BC + .byte4 $$248734 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804858E0 + .byte4 $$248735 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485900 + .byte4 $$248736 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485924 + .byte4 $$248737 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485948 + .byte4 $$248738 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048596C + .byte4 $$248739 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485990 + .byte4 $$248740 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804859B4 + .byte4 $$248741 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804859D4 + .byte4 $$248742 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804859FC + .byte4 $$248743 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485A28 + .byte4 $$248744 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485A48 + .byte4 $$248745 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485A6C + .byte4 $$248746 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485A94 + .byte4 $$248747 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485AB4 + .byte4 $$248748 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485AD4 + .byte4 $$248749 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485AF4 + .byte4 $$248750 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485B14 + .byte4 $$248751 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485B3C + .byte4 $$248752 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485B60 + .byte4 $$248753 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485B80 + .byte4 $$248754 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485BA4 + .byte4 $$248755 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485BD0 + .byte4 $$248756 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485BF8 + .byte4 $$248757 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485C24 + .byte4 $$248758 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485C48 + .byte4 $$248759 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485C70 + .byte4 $$248760 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485C98 + .byte4 $$248761 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485CC8 + .byte4 $$248762 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485CF0 + .byte4 $$248763 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485D18 + .byte4 $$248764 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485D40 + .byte4 $$248765 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485D68 + .byte4 $$248766 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485D90 + .byte4 $$248767 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485DB4 + .byte4 $$248768 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485DD4 + .byte4 $$248769 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485DF4 + .byte4 $$248770 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485E18 + .byte4 $$248771 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485E3C + .byte4 $$248772 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485E60 + .byte4 $$248773 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485E80 + .byte4 $$248774 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485EA4 + .byte4 $$248775 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485EC4 + .byte4 $$248776 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485EE8 + .byte4 $$248777 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485F0C + .byte4 $$248778 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485F30 + .byte4 $$248779 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485F58 + .byte4 $$248780 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485F7C + .byte4 $$248781 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485FA8 + .byte4 $$248782 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485FD4 + .byte4 $$248783 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80485FFC + .byte4 $$248784 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486024 + .byte4 $$248785 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486048 + .byte4 $$248786 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048606C + .byte4 $$248787 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486090 + .byte4 $$248788 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804860B8 + .byte4 $$248789 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804860DC + .byte4 $$248790 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486104 + .byte4 $$248791 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486130 + .byte4 $$248792 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486154 + .byte4 $$248793 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486180 + .byte4 $$248794 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804861B0 + .byte4 $$248795 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804861E0 + .byte4 $$248796 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486204 + .byte4 $$248797 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048622C + .byte4 $$248798 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486260 + .byte4 $$248799 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486280 + .byte4 $$248800 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804862A4 + .byte4 $$248801 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804862D0 + .byte4 $$248802 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486308 + .byte4 $$248803 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048632C + .byte4 $$248804 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486358 + .byte4 $$248805 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486390 + .byte4 $$248806 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804863C0 + .byte4 $$248807 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804863F0 + .byte4 $$248808 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048641C + .byte4 $$248809 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486448 + .byte4 $$248810 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486478 + .byte4 $$248811 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804864A4 + .byte4 $$248812 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804864D4 + .byte4 $$248813 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048650C + .byte4 $$248814 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048653C + .byte4 $$248815 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486578 + .byte4 $$248816 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804865A8 + .byte4 $$248817 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804865E0 + .byte4 $$248818 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486610 + .byte4 $$248819 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486648 + .byte4 $$248820 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486678 + .byte4 $$248821 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804866A4 + .byte4 $$248822 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804866D0 + .byte4 $$248823 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804866F8 + .byte4 $$248824 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486724 + .byte4 $$248825 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486750 + .byte4 $$248826 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486778 + .byte4 $$248827 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804867A0 + .byte4 $$248828 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804867C8 + .byte4 $$248829 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804867F0 + .byte4 $$248830 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486814 + .byte4 $$248831 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486844 + .byte4 $$248832 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486870 + .byte4 $$248833 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486894 + .byte4 $$248834 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804868BC + .byte4 $$248835 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804868E4 + .byte4 $$248836 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048690C + .byte4 $$248837 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486938 + .byte4 $$248838 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486968 + .byte4 $$248839 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486998 + .byte4 $$248840 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804869C0 + .byte4 $$248841 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804869E4 + .byte4 $$248842 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486A08 + .byte4 $$248843 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486A30 + .byte4 $$248844 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486A5C + .byte4 $$248845 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486A84 + .byte4 $$248846 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486AA4 + .byte4 $$248847 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486AC8 + .byte4 $$248848 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486AE8 + .byte4 $$248849 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486B08 + .byte4 $$248850 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486B2C + .byte4 $$248851 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486B58 + .byte4 $$248852 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486B7C + .byte4 $$248853 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486BA8 + .byte4 $$248854 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486BD0 + .byte4 $$248855 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486BF0 + .byte4 $$248856 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486C14 + .byte4 $$248857 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486C34 + .byte4 $$248858 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486C5C + .byte4 $$248859 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486C7C + .byte4 $$248860 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486CA0 + .byte4 $$248861 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486CC4 + .byte4 $$248862 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486CE4 + .byte4 $$248863 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486D08 + .byte4 $$248864 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486D28 + .byte4 $$248865 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486D50 + .byte4 $$248866 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486D74 + .byte4 $$248867 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486D98 + .byte4 $$248868 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486DBC + .byte4 $$248869 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486DE4 + .byte4 $$248870 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486E0C + .byte4 $$248871 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486E38 + .byte4 $$248872 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486E64 + .byte4 $$248873 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486E90 + .byte4 $$248874 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486EB0 + .byte4 $$248875 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486ED0 + .byte4 $$248876 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486EF4 + .byte4 $$248877 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486F1C + .byte4 $$248878 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486F40 + .byte4 $$248879 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486F60 + .byte4 $$248880 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486F84 + .byte4 $$248881 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486FA4 + .byte4 $$248882 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486FC4 + .byte4 $$248883 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486FE0 + .byte4 $$248884 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80486FFC + .byte4 $$248885 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487020 + .byte4 $$248886 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487040 + .byte4 $$248887 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487060 + .byte4 $$248888 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487080 + .byte4 $$248889 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048709C + .byte4 $$248890 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804870C0 + .byte4 $$248891 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804870DC + .byte4 $$248892 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804870FC + .byte4 $$248893 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048711C + .byte4 $$248894 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487140 + .byte4 $$248895 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487160 + .byte4 $$248896 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487184 + .byte4 $$248897 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804871AC + .byte4 $$248898 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804871D0 + .byte4 $$248899 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804871F4 + .byte4 $$248900 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487220 + .byte4 $$248901 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487240 + .byte4 $$248902 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487260 + .byte4 $$248903 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487280 + .byte4 $$248904 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804872A0 + .byte4 $$248905 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804872C4 + .byte4 $$248906 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804872E8 + .byte4 $$248907 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487310 + .byte4 $$248908 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487334 + .byte4 $$248909 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487360 + .byte4 $$248910 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487380 + .byte4 $$248911 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804873A0 + .byte4 $$248912 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804873C0 + .byte4 $$248913 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804873E0 + .byte4 $$248914 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487404 + .byte4 $$248915 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487428 + .byte4 $$248916 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487450 + .byte4 $$248917 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487474 + .byte4 $$248918 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487498 + .byte4 $$248919 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804874C0 + .byte4 $$248920 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804874E4 + .byte4 $$248921 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048750C + .byte4 $$248922 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487534 + .byte4 $$248923 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487558 + .byte4 $$248924 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048757C + .byte4 $$248925 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804875A0 + .byte4 $$248926 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804875C4 + .byte4 $$248927 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804875E0 + .byte4 $$248928 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487600 + .byte4 $$248929 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487620 + .byte4 $$248930 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487644 + .byte4 $$248931 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487668 + .byte4 $$248932 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487688 + .byte4 $$248933 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804876AC + .byte4 $$248934 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804876D0 + .byte4 $$248935 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804876F0 + .byte4 $$248936 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487718 + .byte4 $$248937 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487738 + .byte4 $$248938 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487760 + .byte4 $$248939 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487780 + .byte4 $$248940 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804877A0 + .byte4 $$248941 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804877C0 + .byte4 $$248942 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804877E4 + .byte4 $$248943 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487808 + .byte4 $$248944 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487830 + .byte4 $$248945 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487854 + .byte4 $$248946 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048787C + .byte4 $$248947 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048789C + .byte4 $$248948 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804878C4 + .byte4 $$248949 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804878EC + .byte4 $$248950 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048790C + .byte4 $$248951 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487930 + .byte4 $$248952 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487954 + .byte4 $$248953 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487978 + .byte4 $$248954 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487994 + .byte4 $$248955 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804879B4 + .byte4 $$248956 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804879D8 + .byte4 $$248957 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487A04 + .byte4 $$248958 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487A28 + .byte4 $$248959 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487A54 + .byte4 $$248960 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487A74 + .byte4 $$248961 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487A98 + .byte4 $$248962 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487AC0 + .byte4 $$248963 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487AEC + .byte4 $$248964 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487B08 + .byte4 $$248965 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487B2C + .byte4 $$248966 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487B54 + .byte4 $$248967 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487B7C + .byte4 $$248968 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487BA8 + .byte4 $$248969 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487BCC + .byte4 $$248970 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487BF0 + .byte4 $$248971 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487C10 + .byte4 $$248972 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487C38 + .byte4 $$248973 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487C5C + .byte4 $$248974 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487C80 + .byte4 $$248975 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487CA8 + .byte4 $$248976 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487CD0 + .byte4 $$248977 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487CF0 + .byte4 $$248978 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487D14 + .byte4 $$248979 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487D3C + .byte4 $$248980 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487D60 + .byte4 $$248981 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487D80 + .byte4 $$248982 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487DA4 + .byte4 $$248983 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487DC8 + .byte4 $$248984 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487DEC + .byte4 $$248985 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487E14 + .byte4 $$248986 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487E40 + .byte4 $$248987 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487E60 + .byte4 $$248988 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487E88 + .byte4 $$248989 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487EB0 + .byte4 $$248990 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487ED0 + .byte4 $$248991 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487EF8 + .byte4 $$248992 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487F20 + .byte4 $$248993 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487F48 + .byte4 $$248994 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487F74 + .byte4 $$248995 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487F9C + .byte4 $$248996 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487FC0 + .byte4 $$248997 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80487FE8 + .byte4 $$248998 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488010 + .byte4 $$248999 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488038 + .byte4 $$249000 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488060 + .byte4 $$249001 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488080 + .byte4 $$249002 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804880A0 + .byte4 $$249003 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804880C0 + .byte4 $$249004 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804880E0 + .byte4 $$249005 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488108 + .byte4 $$249006 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488128 + .byte4 $$249007 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488148 + .byte4 $$249008 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488170 + .byte4 $$249009 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488198 + .byte4 $$249010 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804881BC + .byte4 $$249011 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804881E8 + .byte4 $$249012 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488208 + .byte4 $$249013 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488228 + .byte4 $$249014 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488248 + .byte4 $$249015 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488264 + .byte4 $$249016 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488288 + .byte4 $$249017 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804882A4 + .byte4 $$249018 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804882C8 + .byte4 $$249019 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804882EC + .byte4 $$249020 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048830C + .byte4 $$249021 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488330 + .byte4 $$249022 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488350 + .byte4 $$249023 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488370 + .byte4 $$249024 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488394 + .byte4 $$249025 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804883B8 + .byte4 $$249026 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804883E0 + .byte4 $$249027 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488404 + .byte4 $$249028 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048842C + .byte4 $$249029 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048844C + .byte4 $$249030 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488474 + .byte4 $$249031 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048849C + .byte4 $$249032 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804884BC + .byte4 $$249033 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804884E0 + .byte4 $$249034 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488508 + .byte4 $$249035 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488530 + .byte4 $$249036 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048854C + .byte4 $$249037 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488568 + .byte4 $$249038 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488584 + .byte4 $$249039 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804885A8 + .byte4 $$249040 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804885C4 + .byte4 $$249041 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804885E8 + .byte4 $$249042 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488608 + .byte4 $$249043 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488624 + .byte4 $$249044 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488648 + .byte4 $$249045 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048866C + .byte4 $$249046 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048868C + .byte4 $$249047 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804886B0 + .byte4 $$249048 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804886D0 + .byte4 $$249049 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804886EC + .byte4 $$249050 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048870C + .byte4 $$249051 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488728 + .byte4 $$249052 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048874C + .byte4 $$249053 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488774 + .byte4 $$249054 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048879C + .byte4 $$249055 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804887C4 + .byte4 $$249056 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804887E8 + .byte4 $$249057 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488810 + .byte4 $$249058 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488838 + .byte4 $$249059 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488864 + .byte4 $$249060 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488888 + .byte4 $$249061 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804888AC + .byte4 $$249062 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804888D0 + .byte4 $$249063 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804888F4 + .byte4 $$249064 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488918 + .byte4 $$249065 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048893C + .byte4 $$249066 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488964 + .byte4 $$249067 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488990 + .byte4 $$249068 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804889C0 + .byte4 $$249069 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804889E0 + .byte4 $$249070 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488A08 + .byte4 $$249071 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488A30 + .byte4 $$249072 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488A58 + .byte4 $$249073 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488A84 + .byte4 $$249074 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488AB0 + .byte4 $$249075 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488ADC + .byte4 $$249076 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488B08 + .byte4 $$249077 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488B30 + .byte4 $$249078 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488B60 + .byte4 $$249079 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488B94 + .byte4 $$249080 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488BCC + .byte4 $$249081 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488BF8 + .byte4 $$249082 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488C28 + .byte4 $$249083 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488C58 + .byte4 $$249084 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488C8C + .byte4 $$249085 .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/Constant.s b/asm/src/Constant.s index 35bb7153..01b3b9c6 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: - .4byte 0x8045D470 - .4byte 0x8045D484 - .4byte 0x8045D484 - .4byte 0x8045D484 - .4byte 0x8045D484 + .byte4 $$248724 + .byte4 $$248725 + .byte4 $$248725 + .byte4 $$248725 + .byte4 $$248725 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/src/ControlIcon.s b/asm/src/ControlIcon.s index f998c76d..031fec60 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: - .4byte 0x80557930 - .4byte 0x80557938 - .4byte 0x80557940 - .4byte 0x8045DB88 + .byte4 $$251817 + .byte4 $$251818 + .byte4 $$251819 + .byte4 $$251820 .global $$252408 $$252408: .asciz "history/Detail" diff --git a/asm/src/Cursor.s b/asm/src/Cursor.s index ca7a6070..ec4ebc0a 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: - .4byte 0x80557A28 - .4byte 0x80557A30 - .4byte 0x80557A38 - .4byte 0x80557A40 - .4byte 0x8045DF4C - .4byte 0x8045DF4C - .4byte 0x80557A48 - .4byte 0x80557A50 - .4byte 0x80557A58 + .byte4 $$251578 + .byte4 $$251579 + .byte4 $$251580 + .byte4 $$251581 + .byte4 $$251582 + .byte4 $$251582 + .byte4 $$251583 + .byte4 $$251584 + .byte4 $$251585 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -419,7 +419,7 @@ $$251582: __vt__Q33scn19challengefileselect6Cursor: .4byte 0 .4byte 0 - .4byte 0x801E3004 ;# ptr + .byte4 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: - .4byte 0x804618A0 - .4byte 0x804618B0 - .4byte 0x804618C0 - .4byte 0x804618CC - .4byte 0x804618DC - .4byte 0x804618DC - .4byte 0x804618DC - .4byte 0x804618F0 - .4byte 0x80461900 - .4byte 0x80461910 - .4byte 0x80461920 + .byte4 $$251547 + .byte4 $$251548 + .byte4 $$251549 + .byte4 $$251550 + .byte4 $$251551 + .byte4 $$251551 + .byte4 $$251551 + .byte4 $$251552 + .byte4 $$251553 + .byte4 $$251554 + .byte4 $$251555 .global TABLE_2__Q43scn7history6detail20$$2unnamed$$2Cursor_cpp$$2 TABLE_2__Q43scn7history6detail20$$2unnamed$$2Cursor_cpp$$2: - .4byte 0x804618A0 - .4byte 0x80461920 - .4byte 0x804618B0 - .4byte 0x804618C0 - .4byte 0x804618DC - .4byte 0x804618DC - .4byte 0x804618DC - .4byte 0x80461920 - .4byte 0x804618F0 - .4byte 0x804618F0 - .4byte 0x804618F0 + .byte4 $$251547 + .byte4 $$251555 + .byte4 $$251548 + .byte4 $$251549 + .byte4 $$251551 + .byte4 $$251551 + .byte4 $$251551 + .byte4 $$251555 + .byte4 $$251552 + .byte4 $$251552 + .byte4 $$251552 .global TABLE_3__Q43scn7history6detail20$$2unnamed$$2Cursor_cpp$$2 TABLE_3__Q43scn7history6detail20$$2unnamed$$2Cursor_cpp$$2: - .4byte 0x804618A0 - .4byte 0x80461920 - .4byte 0x804618B0 - .4byte 0x804618C0 - .4byte 0x804618DC - .4byte 0x804618DC - .4byte 0x804618DC - .4byte 0x80461920 - .4byte 0x80461900 - .4byte 0x80461900 - .4byte 0x80461900 + .byte4 $$251547 + .byte4 $$251555 + .byte4 $$251548 + .byte4 $$251549 + .byte4 $$251551 + .byte4 $$251551 + .byte4 $$251551 + .byte4 $$251555 + .byte4 $$251553 + .byte4 $$251553 + .byte4 $$251553 .global $$252454 $$252454: .asciz "history/Detail" diff --git a/asm/src/Custom.s b/asm/src/Custom.s index 711d641a..91788d64 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 - .4byte 0x80237C04 ;# ptr - .4byte 0x80237B68 ;# ptr + .byte4 __dt__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss7bonkers8NodeKind$$1Fv + .byte4 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 - .4byte 0x80237C00 ;# ptr - .4byte 0x80237B88 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 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 - .4byte 0x80237B64 ;# ptr - .4byte 0x80237BA4 ;# ptr - .4byte 0x802373E0 ;# ptr - .4byte 0x80237740 ;# ptr - .4byte 0x802377FC ;# ptr - .4byte 0x80237888 ;# ptr - .4byte 0x802378B8 ;# ptr - .4byte 0x8022E5D8 ;# ptr - .4byte 0x8022E5DC ;# ptr - .4byte 0x8022E5E0 ;# ptr - .4byte 0x8022E5E4 ;# ptr - .4byte 0x8022E5E8 ;# ptr - .4byte 0x8022E5EC ;# ptr - .4byte 0x80237950 ;# ptr - .4byte 0x8022E5F4 ;# ptr - .4byte 0x80237954 ;# ptr - .4byte 0x8022E5FC ;# ptr - .4byte 0x8022E600 ;# ptr - .4byte 0x8022E604 ;# ptr + .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 .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 - .4byte 0x8023C438 ;# ptr - .4byte 0x8023C33C ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSCHide$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSCHide$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateStartWait$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateStartWait$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8023C434 ;# ptr - .4byte 0x8023C358 ;# ptr + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateStartWait$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 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 - .4byte 0x8023C338 ;# ptr - .4byte 0x8023C374 ;# ptr - .4byte 0x8023BCB0 ;# ptr - .4byte 0x8023BECC ;# ptr - .4byte 0x8023BED0 ;# ptr - .4byte 0x8023BED4 ;# ptr - .4byte 0x8023BED8 ;# ptr - .4byte 0x8022E5D8 ;# ptr - .4byte 0x8022E5DC ;# ptr - .4byte 0x8022E5E0 ;# ptr - .4byte 0x8022E5E4 ;# ptr - .4byte 0x8022E5E8 ;# ptr - .4byte 0x8022E5EC ;# ptr - .4byte 0x8023BEDC ;# ptr - .4byte 0x8023BF2C ;# ptr - .4byte 0x8023BF74 ;# ptr - .4byte 0x8022E5FC ;# ptr - .4byte 0x8022E600 ;# ptr - .4byte 0x8022E604 ;# ptr + .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 .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 - .4byte 0x80247C54 ;# ptr - .4byte 0x80247C34 ;# ptr + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede9StateHide$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede9StateHide$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss12creditdedede6Custom __vt__Q53scn4step4boss12creditdedede6Custom: .4byte 0 .4byte 0 - .4byte 0x80247C30 ;# ptr - .4byte 0x80247C50 ;# ptr - .4byte 0x80247B48 ;# ptr - .4byte 0x8022E5C8 ;# ptr - .4byte 0x80247C18 ;# ptr - .4byte 0x80247C1C ;# ptr - .4byte 0x80247C20 ;# ptr - .4byte 0x8022E5D8 ;# ptr - .4byte 0x8022E5DC ;# ptr - .4byte 0x8022E5E0 ;# ptr - .4byte 0x8022E5E4 ;# ptr - .4byte 0x8022E5E8 ;# ptr - .4byte 0x8022E5EC ;# ptr - .4byte 0x80247C24 ;# ptr - .4byte 0x80247C28 ;# ptr - .4byte 0x80247C2C ;# ptr - .4byte 0x8022E5FC ;# ptr - .4byte 0x8022E600 ;# ptr - .4byte 0x8022E604 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22214,31 +22214,31 @@ __vt__Q53scn4step4boss12creditdedede6Custom: __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StateHide$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x802486A4 ;# ptr - .4byte 0x80248684 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StateHide$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StateHide$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9creditdee6Custom __vt__Q53scn4step4boss9creditdee6Custom: .4byte 0 .4byte 0 - .4byte 0x80248680 ;# ptr - .4byte 0x802486A0 ;# ptr - .4byte 0x80248598 ;# ptr - .4byte 0x8022E5C8 ;# ptr - .4byte 0x80248668 ;# ptr - .4byte 0x8024866C ;# ptr - .4byte 0x80248670 ;# ptr - .4byte 0x8022E5D8 ;# ptr - .4byte 0x8022E5DC ;# ptr - .4byte 0x8022E5E0 ;# ptr - .4byte 0x8022E5E4 ;# ptr - .4byte 0x8022E5E8 ;# ptr - .4byte 0x8022E5EC ;# ptr - .4byte 0x80248674 ;# ptr - .4byte 0x80248678 ;# ptr - .4byte 0x8024867C ;# ptr - .4byte 0x8022E5FC ;# ptr - .4byte 0x8022E600 ;# ptr - .4byte 0x8022E604 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22246,31 +22246,31 @@ __vt__Q53scn4step4boss9creditdee6Custom: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta9StateHide$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x80249D40 ;# ptr - .4byte 0x80249D20 ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta9StateHide$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta9StateHide$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss10creditmeta6Custom __vt__Q53scn4step4boss10creditmeta6Custom: .4byte 0 .4byte 0 - .4byte 0x80249D1C ;# ptr - .4byte 0x80249D3C ;# ptr - .4byte 0x80249C34 ;# ptr - .4byte 0x8022E5C8 ;# ptr - .4byte 0x80249D04 ;# ptr - .4byte 0x80249D08 ;# ptr - .4byte 0x80249D0C ;# ptr - .4byte 0x8022E5D8 ;# ptr - .4byte 0x8022E5DC ;# ptr - .4byte 0x8022E5E0 ;# ptr - .4byte 0x8022E5E4 ;# ptr - .4byte 0x8022E5E8 ;# ptr - .4byte 0x8022E5EC ;# ptr - .4byte 0x80249D10 ;# ptr - .4byte 0x80249D14 ;# ptr - .4byte 0x80249D18 ;# ptr - .4byte 0x8022E5FC ;# ptr - .4byte 0x8022E600 ;# ptr - .4byte 0x8022E604 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22278,31 +22278,31 @@ __vt__Q53scn4step4boss10creditmeta6Custom: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah9StateHide$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8024B6D0 ;# ptr - .4byte 0x8024B6B0 ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah9StateHide$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah9StateHide$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss10creditroah6Custom __vt__Q53scn4step4boss10creditroah6Custom: .4byte 0 .4byte 0 - .4byte 0x8024B6AC ;# ptr - .4byte 0x8024B6CC ;# ptr - .4byte 0x8024B3E8 ;# ptr - .4byte 0x8022E5C8 ;# ptr - .4byte 0x8024B4F0 ;# ptr - .4byte 0x8024B4F4 ;# ptr - .4byte 0x8024B4F8 ;# ptr - .4byte 0x8022E5D8 ;# ptr - .4byte 0x8022E5DC ;# ptr - .4byte 0x8022E5E0 ;# ptr - .4byte 0x8022E5E4 ;# ptr - .4byte 0x8022E5E8 ;# ptr - .4byte 0x8022E5EC ;# ptr - .4byte 0x8024B4FC ;# ptr - .4byte 0x8024B500 ;# ptr - .4byte 0x8024B504 ;# ptr - .4byte 0x8022E5FC ;# ptr - .4byte 0x8022E600 ;# ptr - .4byte 0x8022E604 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22332,14 +22332,14 @@ $$258564: __vt__Q24util122StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6dubior8NodeKind$$1: .4byte 0 .4byte 0 - .4byte 0x8024D418 ;# ptr - .4byte 0x8024D388 ;# ptr + .byte4 __dt__Q24util122StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6dubior8NodeKind$$1Fv + .byte4 create__Q24util122StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6dubior8NodeKind$$1Fv .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateWait$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateWait$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8024D414 ;# ptr - .4byte 0x8024D38C ;# ptr + .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateWait$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 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 - .4byte 0x8024D384 ;# ptr - .4byte 0x8024D3A8 ;# ptr - .4byte 0x8024CB14 ;# ptr - .4byte 0x8024CDA4 ;# ptr - .4byte 0x8024CDD0 ;# ptr - .4byte 0x8024CE5C ;# ptr - .4byte 0x8024CE60 ;# ptr - .4byte 0x8022E5D8 ;# ptr - .4byte 0x8022E5DC ;# ptr - .4byte 0x8022E5E0 ;# ptr - .4byte 0x8022E5E4 ;# ptr - .4byte 0x8022E5E8 ;# ptr - .4byte 0x8022E5EC ;# ptr - .4byte 0x8024CEF8 ;# ptr - .4byte 0x8022E5F4 ;# ptr - .4byte 0x8024CEFC ;# ptr - .4byte 0x8022E5FC ;# ptr - .4byte 0x8022E600 ;# ptr - .4byte 0x8024CF00 ;# ptr + .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 .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 - .4byte 0x802522B4 ;# ptr - .4byte 0x802522AC ;# ptr + .byte4 __dt__Q24util127StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss10gigantedge8NodeKind$$1Fv + .byte4 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 - .4byte 0x802522A8 ;# ptr - .4byte 0x802522B0 ;# ptr - .4byte 0x80251B80 ;# ptr - .4byte 0x80251E30 ;# ptr - .4byte 0x80251E34 ;# ptr - .4byte 0x80251E38 ;# ptr - .4byte 0x80251E3C ;# ptr - .4byte 0x8022E5D8 ;# ptr - .4byte 0x8022E5DC ;# ptr - .4byte 0x8022E5E0 ;# ptr - .4byte 0x8022E5E4 ;# ptr - .4byte 0x8022E5E8 ;# ptr - .4byte 0x8022E5EC ;# ptr - .4byte 0x80251ED4 ;# ptr - .4byte 0x8022E5F4 ;# ptr - .4byte 0x80251ED8 ;# ptr - .4byte 0x8022E5FC ;# ptr - .4byte 0x8022E600 ;# ptr - .4byte 0x8022E604 ;# ptr + .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 .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 - .4byte 0x80253888 ;# ptr - .4byte 0x80253880 ;# ptr + .byte4 __dt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss8kingsdoo8NodeKind$$1Fv + .byte4 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 - .4byte 0x8025387C ;# ptr - .4byte 0x80253884 ;# ptr - .4byte 0x80253520 ;# ptr - .4byte 0x802537D0 ;# ptr - .4byte 0x802537D4 ;# ptr - .4byte 0x802537D8 ;# ptr - .4byte 0x802537DC ;# ptr - .4byte 0x8022E5D8 ;# ptr - .4byte 0x8022E5DC ;# ptr - .4byte 0x8022E5E0 ;# ptr - .4byte 0x8022E5E4 ;# ptr - .4byte 0x8022E5E8 ;# ptr - .4byte 0x8022E5EC ;# ptr - .4byte 0x80253874 ;# ptr - .4byte 0x8022E5F4 ;# ptr - .4byte 0x80253878 ;# ptr - .4byte 0x8022E5FC ;# ptr - .4byte 0x8022E600 ;# ptr - .4byte 0x8022E604 ;# ptr + .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 .asciz "no name class" .balign 4 .4byte 0 @@ -22549,8 +22549,8 @@ $$257225: __vt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8NodeKind$$1: .4byte 0 .4byte 0 - .4byte 0x80255AC4 ;# ptr - .4byte 0x80255ABC ;# ptr + .byte4 __dt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8NodeKind$$1Fv + .byte4 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 - .4byte 0x80255AB8 ;# ptr - .4byte 0x80255AC0 ;# ptr - .4byte 0x80255678 ;# ptr - .4byte 0x80255908 ;# ptr - .4byte 0x8025590C ;# ptr - .4byte 0x80255910 ;# ptr - .4byte 0x80255914 ;# ptr - .4byte 0x8022E5D8 ;# ptr - .4byte 0x8022E5DC ;# ptr - .4byte 0x8022E5E0 ;# ptr - .4byte 0x8022E5E4 ;# ptr - .4byte 0x8022E5E8 ;# ptr - .4byte 0x8022E5EC ;# ptr - .4byte 0x802559AC ;# ptr - .4byte 0x8022E5F4 ;# ptr - .4byte 0x802559B0 ;# ptr - .4byte 0x8022E5FC ;# ptr - .4byte 0x8022E600 ;# ptr - .4byte 0x8022E604 ;# ptr + .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 .asciz "no name class" .balign 4 .4byte 0 @@ -22619,8 +22619,8 @@ $$256478: __vt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros8NodeKind$$1: .4byte 0 .4byte 0 - .4byte 0x80259DE0 ;# ptr - .4byte 0x80259D64 ;# ptr + .byte4 __dt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros8NodeKind$$1Fv + .byte4 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 - .4byte 0x80259D60 ;# ptr - .4byte 0x80259D68 ;# ptr - .4byte 0x802599BC ;# ptr - .4byte 0x80259C84 ;# ptr - .4byte 0x80259C88 ;# ptr - .4byte 0x80259C8C ;# ptr - .4byte 0x80259C90 ;# ptr - .4byte 0x8022E5D8 ;# ptr - .4byte 0x8022E5DC ;# ptr - .4byte 0x8022E5E0 ;# ptr - .4byte 0x8022E5E4 ;# ptr - .4byte 0x8022E5E8 ;# ptr - .4byte 0x8022E5EC ;# ptr - .4byte 0x80259D4C ;# ptr - .4byte 0x8022E5F4 ;# ptr - .4byte 0x80259D54 ;# ptr - .4byte 0x8022E5FC ;# ptr - .4byte 0x8022E600 ;# ptr - .4byte 0x8022E604 ;# ptr + .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 .asciz "no name class" .balign 4 .4byte 0 @@ -22681,20 +22681,20 @@ $$257038: __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateDamageL$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8025C168 ;# ptr - .4byte 0x8025C07C ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateDamageL$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateDamageL$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateDead$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateDead$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8025C164 ;# ptr - .4byte 0x8025C098 ;# ptr + .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateDead$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateDead$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateFirst$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateFirst$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8025C160 ;# ptr - .4byte 0x8025C0B4 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateFirst$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 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 - .4byte 0x8025C078 ;# ptr - .4byte 0x8025C0D0 ;# ptr - .4byte 0x8025BBFC ;# ptr - .4byte 0x8025BE28 ;# ptr - .4byte 0x8025BE2C ;# ptr - .4byte 0x8025BE30 ;# ptr - .4byte 0x8025BEEC ;# ptr - .4byte 0x8022E5D8 ;# ptr - .4byte 0x8025BF70 ;# ptr - .4byte 0x8022E5E0 ;# ptr - .4byte 0x8022E5E4 ;# ptr - .4byte 0x8022E5E8 ;# ptr - .4byte 0x8022E5EC ;# ptr - .4byte 0x8025BF78 ;# ptr - .4byte 0x8022E5F4 ;# ptr - .4byte 0x8025BFB0 ;# ptr - .4byte 0x8022E5FC ;# ptr - .4byte 0x8022E600 ;# ptr - .4byte 0x8022E604 ;# ptr + .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 .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 - .4byte 0x8026080C ;# ptr - .4byte 0x8026079C ;# ptr + .byte4 __dt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble8NodeKind$$1Fv + .byte4 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 - .4byte 0x80260798 ;# ptr - .4byte 0x802607A0 ;# ptr - .4byte 0x8026043C ;# ptr - .4byte 0x802606EC ;# ptr - .4byte 0x802606F0 ;# ptr - .4byte 0x802606F4 ;# ptr - .4byte 0x802606F8 ;# ptr - .4byte 0x8022E5D8 ;# ptr - .4byte 0x8022E5DC ;# ptr - .4byte 0x8022E5E0 ;# ptr - .4byte 0x8022E5E4 ;# ptr - .4byte 0x8022E5E8 ;# ptr - .4byte 0x8022E5EC ;# ptr - .4byte 0x80260790 ;# ptr - .4byte 0x8022E5F4 ;# ptr - .4byte 0x80260794 ;# ptr - .4byte 0x8022E5FC ;# ptr - .4byte 0x8022E600 ;# ptr - .4byte 0x8022E604 ;# ptr + .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 .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 - .4byte 0x802965CC ;# ptr - .4byte 0x802965D0 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x802964B8 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22831,21 +22831,21 @@ __vt__Q53scn4step5enemy8armordee6Custom: __vt__Q53scn4step5enemy11bladeknight6Custom: .4byte 0 .4byte 0 - .4byte 0x802971BC ;# ptr - .4byte 0x802971C0 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22853,21 +22853,21 @@ __vt__Q53scn4step5enemy11bladeknight6Custom: __vt__Q53scn4step5enemy7blipper6Custom: .4byte 0 .4byte 0 - .4byte 0x80299390 ;# ptr - .4byte 0x80299394 ;# ptr - .4byte 0x80298F50 ;# ptr - .4byte 0x802992BC ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80299064 ;# ptr - .4byte 0x802991B4 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80299348 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22875,27 +22875,27 @@ __vt__Q53scn4step5enemy7blipper6Custom: __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x8029C0DC ;# ptr - .4byte 0x8029C0BC ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11bonkersbomb6Custom __vt__Q53scn4step5enemy11bonkersbomb6Custom: .4byte 0 .4byte 0 - .4byte 0x8029C0B8 ;# ptr - .4byte 0x8029C0D8 ;# ptr - .4byte 0x8029BCB8 ;# ptr - .4byte 0x8029BE98 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x8029BE28 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x8029BEA8 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22903,21 +22903,21 @@ __vt__Q53scn4step5enemy11bonkersbomb6Custom: __vt__Q53scn4step5enemy6bouncy6Custom: .4byte 0 .4byte 0 - .4byte 0x8029D1CC ;# ptr - .4byte 0x8029D1D0 ;# ptr - .4byte 0x8029D154 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22925,21 +22925,21 @@ __vt__Q53scn4step5enemy6bouncy6Custom: __vt__Q53scn4step5enemy5bowby6Custom: .4byte 0 .4byte 0 - .4byte 0x8029E780 ;# ptr - .4byte 0x8029E784 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x8029E4B4 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x8029E548 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22947,27 +22947,27 @@ __vt__Q53scn4step5enemy5bowby6Custom: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateSkinned$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802A2DA0 ;# ptr - .4byte 0x802A2D80 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateSkinned$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateSkinned$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5cappy6Custom __vt__Q53scn4step5enemy5cappy6Custom: .4byte 0 .4byte 0 - .4byte 0x802A2D7C ;# ptr - .4byte 0x802A2D9C ;# ptr - .4byte 0x802A28BC ;# ptr - .4byte 0x802A2C24 ;# ptr - .4byte 0x802A29C4 ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802A2C50 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x802A2C60 ;# ptr - .4byte 0x802A2C54 ;# ptr - .4byte 0x802A2914 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22975,21 +22975,21 @@ __vt__Q53scn4step5enemy5cappy6Custom: __vt__Q53scn4step5enemy8cappyhat6Custom: .4byte 0 .4byte 0 - .4byte 0x802A3D0C ;# ptr - .4byte 0x802A3D10 ;# ptr - .4byte 0x802A3A04 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x802A3A34 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -22997,21 +22997,21 @@ __vt__Q53scn4step5enemy8cappyhat6Custom: __vt__Q53scn4step5enemy6chilly6Custom: .4byte 0 .4byte 0 - .4byte 0x802A62DC ;# ptr - .4byte 0x802A62E0 ;# ptr - .4byte 0x802A62A8 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23019,21 +23019,21 @@ __vt__Q53scn4step5enemy6chilly6Custom: __vt__Q53scn4step5enemy4como6Custom: .4byte 0 .4byte 0 - .4byte 0x802A7400 ;# ptr - .4byte 0x802A7404 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x802A73C8 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x802A73F0 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x802A73F8 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23041,21 +23041,21 @@ __vt__Q53scn4step5enemy4como6Custom: __vt__Q53scn4step5enemy6degout6Custom: .4byte 0 .4byte 0 - .4byte 0x802AD33C ;# ptr - .4byte 0x802AD340 ;# ptr - .4byte 0x802AD2E8 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802AD2EC ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23063,21 +23063,21 @@ __vt__Q53scn4step5enemy6degout6Custom: __vt__Q53scn4step5enemy8dubiorjr6Custom: .4byte 0 .4byte 0 - .4byte 0x802AE18C ;# ptr - .4byte 0x802AE190 ;# ptr - .4byte 0x802AE0B0 ;# ptr - .4byte 0x802AE108 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802AE104 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x802AE10C ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23085,27 +23085,27 @@ __vt__Q53scn4step5enemy8dubiorjr6Custom: __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11dubiorspark9StateShot$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802AEE7C ;# ptr - .4byte 0x802AEE5C ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11dubiorspark9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11dubiorspark9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11dubiorspark6Custom __vt__Q53scn4step5enemy11dubiorspark6Custom: .4byte 0 .4byte 0 - .4byte 0x802AEE58 ;# ptr - .4byte 0x802AEE78 ;# ptr - .4byte 0x802AED14 ;# ptr - .4byte 0x802AEDD4 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802AEDAC ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x802AEDD8 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23113,21 +23113,21 @@ __vt__Q53scn4step5enemy11dubiorspark6Custom: __vt__Q53scn4step5enemy4elec6Custom: .4byte 0 .4byte 0 - .4byte 0x802AFC38 ;# ptr - .4byte 0x802AFC3C ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x802AFAF0 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23135,21 +23135,21 @@ __vt__Q53scn4step5enemy4elec6Custom: __vt__Q53scn4step5enemy6flamer6Custom: .4byte 0 .4byte 0 - .4byte 0x802B22D0 ;# ptr - .4byte 0x802B22D4 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23157,21 +23157,21 @@ __vt__Q53scn4step5enemy6flamer6Custom: __vt__Q53scn4step5enemy5foley6Custom: .4byte 0 .4byte 0 - .4byte 0x802B49C0 ;# ptr - .4byte 0x802B49C4 ;# ptr - .4byte 0x802B4568 ;# ptr - .4byte 0x802B4854 ;# ptr - .4byte 0x802B4688 ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802B4734 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23179,21 +23179,21 @@ __vt__Q53scn4step5enemy5foley6Custom: __vt__Q53scn4step5enemy5gemra6Custom: .4byte 0 .4byte 0 - .4byte 0x802B61A4 ;# ptr - .4byte 0x802B61A8 ;# ptr - .4byte 0x802B59EC ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x802B59F0 ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802B59F4 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23201,21 +23201,21 @@ __vt__Q53scn4step5enemy5gemra6Custom: __vt__Q53scn4step5enemy7gigatzo6Custom: .4byte 0 .4byte 0 - .4byte 0x802B76B0 ;# ptr - .4byte 0x802B76B4 ;# ptr - .4byte 0x802B6C60 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x802B707C ;# ptr - .4byte 0x802B70AC ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x802B6EE0 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23223,21 +23223,21 @@ __vt__Q53scn4step5enemy7gigatzo6Custom: __vt__Q53scn4step5enemy5gordo6Custom: .4byte 0 .4byte 0 - .4byte 0x802B9050 ;# ptr - .4byte 0x802B9054 ;# ptr - .4byte 0x802B8E24 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x802B8EB0 ;# ptr - .4byte 0x802B8EB4 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x802B8EB8 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23245,21 +23245,21 @@ __vt__Q53scn4step5enemy5gordo6Custom: __vt__Q53scn4step5enemy7hothead6Custom: .4byte 0 .4byte 0 - .4byte 0x802BA664 ;# ptr - .4byte 0x802BA668 ;# ptr - .4byte 0x802BA324 ;# ptr - .4byte 0x802BA37C ;# ptr - .4byte 0x802BA3AC ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802BA3B0 ;# ptr - .4byte 0x802BA3B4 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x802BA44C ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23279,21 +23279,21 @@ $$255360: __vt__Q53scn4step5enemy6juckle6Custom: .4byte 0 .4byte 0 - .4byte 0x802BB798 ;# ptr - .4byte 0x802BB79C ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x802BB454 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x802BB4F8 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23301,21 +23301,21 @@ __vt__Q53scn4step5enemy6juckle6Custom: __vt__Q53scn4step5enemy4kabu6Custom: .4byte 0 .4byte 0 - .4byte 0x802BCDC0 ;# ptr - .4byte 0x802BCDC4 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x802BCCB0 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23323,21 +23323,21 @@ __vt__Q53scn4step5enemy4kabu6Custom: __vt__Q53scn4step5enemy10knucklejoe6Custom: .4byte 0 .4byte 0 - .4byte 0x802BF8B8 ;# ptr - .4byte 0x802BF8BC ;# ptr - .4byte 0x802BF42C ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802BF440 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23345,21 +23345,21 @@ __vt__Q53scn4step5enemy10knucklejoe6Custom: __vt__Q53scn4step5enemy6lanzer6Custom: .4byte 0 .4byte 0 - .4byte 0x802C2180 ;# ptr - .4byte 0x802C2184 ;# ptr - .4byte 0x802C208C ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802C2100 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23367,27 +23367,27 @@ __vt__Q53scn4step5enemy6lanzer6Custom: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9mbossdead9StateMain$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C4694 ;# ptr - .4byte 0x802C460C ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9mbossdead9StateMain$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9mbossdead9StateMain$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9mbossdead6Custom __vt__Q53scn4step5enemy9mbossdead6Custom: .4byte 0 .4byte 0 - .4byte 0x802C4608 ;# ptr - .4byte 0x802C4628 ;# ptr - .4byte 0x802C4284 ;# ptr - .4byte 0x802C445C ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802C4458 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x802C4408 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x802C44CC ;# ptr - .4byte 0x802C4560 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23395,27 +23395,27 @@ __vt__Q53scn4step5enemy9mbossdead6Custom: __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies11StateEndure$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C4FFC ;# ptr - .4byte 0x802C4FDC ;# ptr + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies11StateEndure$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies11StateEndure$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy7mumbies6Custom __vt__Q53scn4step5enemy7mumbies6Custom: .4byte 0 .4byte 0 - .4byte 0x802C4FD8 ;# ptr - .4byte 0x802C4FF8 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x802C4FA8 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x802C4E90 ;# ptr - .4byte 0x802C4FB8 ;# ptr - .4byte 0x802C4F2C ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x802C4FC8 ;# ptr - .4byte 0x802C4FBC ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23423,21 +23423,21 @@ __vt__Q53scn4step5enemy7mumbies6Custom: __vt__Q53scn4step5enemy8needlous6Custom: .4byte 0 .4byte 0 - .4byte 0x802C6194 ;# ptr - .4byte 0x802C6198 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x802C6080 ;# ptr - .4byte 0x802C6088 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23445,21 +23445,21 @@ __vt__Q53scn4step5enemy8needlous6Custom: __vt__Q53scn4step5enemy5nruff6Custom: .4byte 0 .4byte 0 - .4byte 0x802C7DFC ;# ptr - .4byte 0x802C7B34 ;# ptr - .4byte 0x802C7B38 ;# ptr - .4byte 0x802C7BC4 ;# ptr - .4byte 0x802C7BC8 ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802C7BD0 ;# ptr - .4byte 0x802C7BDC ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x802C7BD8 ;# ptr - .4byte 0x802C7BD4 ;# ptr - .4byte 0x802C7BCC ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23467,21 +23467,21 @@ __vt__Q53scn4step5enemy5nruff6Custom: __vt__Q53scn4step5enemy6owgulf6Custom: .4byte 0 .4byte 0 - .4byte 0x802C9F10 ;# ptr - .4byte 0x802C9F14 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23489,21 +23489,21 @@ __vt__Q53scn4step5enemy6owgulf6Custom: __vt__Q53scn4step5enemy7parasol6Custom: .4byte 0 .4byte 0 - .4byte 0x802CB100 ;# ptr - .4byte 0x802CABF8 ;# ptr - .4byte 0x802CAC84 ;# ptr - .4byte 0x802CAD2C ;# ptr - .4byte 0x802CAED4 ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802CAD70 ;# ptr - .4byte 0x802CADB4 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x802CAE40 ;# ptr - .4byte 0x802CAE94 ;# ptr - .4byte 0x802CAEF8 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23511,77 +23511,77 @@ __vt__Q53scn4step5enemy7parasol6Custom: __vt__Q53scn4step5enemy10parasoldee6Custom: .4byte 0 .4byte 0 - .4byte 0x802CC538 ;# ptr - .4byte 0x802CBB70 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x802CBE4C ;# ptr - .4byte 0x802CBDD8 ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802CBE70 ;# ptr - .4byte 0x802CBD54 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x802CBEF8 ;# ptr - .4byte 0x802CBE74 ;# ptr - .4byte 0x802CBC00 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .4byte 0 - .4byte 0x802CC54C ;# ptr - .4byte 0x802CC544 ;# ptr - .4byte 0x802CC53C ;# ptr - .4byte 0x802CC134 ;# ptr - .4byte 0x802CC250 ;# ptr + .byte4 $$28$$2__dt__Q53scn4step5enemy10parasoldee6CustomFv + .byte4 $$28$$2onParasolRelease__Q53scn4step5enemy10parasoldee6CustomFRQ53scn4step5enemy7parasol6Custom + .byte4 $$28$$2onParasolRequireUnsetReceiver__Q53scn4step5enemy10parasoldee6CustomFRQ53scn4step5enemy7parasol6Custom + .byte4 onParasolRelease__Q53scn4step5enemy10parasoldee6CustomFRQ53scn4step5enemy7parasol6Custom + .byte4 onParasolRequireUnsetReceiver__Q53scn4step5enemy10parasoldee6CustomFRQ53scn4step5enemy7parasol6Custom .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo6Custom __vt__Q53scn4step5enemy10parasoldoo6Custom: .4byte 0 .4byte 0 - .4byte 0x802CE460 ;# ptr - .4byte 0x802CDC9C ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x802CDF78 ;# ptr - .4byte 0x802CDF04 ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802CDF9C ;# ptr - .4byte 0x802CDE80 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x802CDFA4 ;# ptr - .4byte 0x802CDFA0 ;# ptr - .4byte 0x802CDD2C ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .4byte 0 - .4byte 0x802CE474 ;# ptr - .4byte 0x802CE46C ;# ptr - .4byte 0x802CE464 ;# ptr - .4byte 0x802CE10C ;# ptr - .4byte 0x802CE220 ;# ptr + .byte4 $$28$$2__dt__Q53scn4step5enemy10parasoldoo6CustomFv + .byte4 $$28$$2onParasolRelease__Q53scn4step5enemy10parasoldoo6CustomFRQ53scn4step5enemy7parasol6Custom + .byte4 $$28$$2onParasolRequireUnsetReceiver__Q53scn4step5enemy10parasoldoo6CustomFRQ53scn4step5enemy7parasol6Custom + .byte4 onParasolRelease__Q53scn4step5enemy10parasoldoo6CustomFRQ53scn4step5enemy7parasol6Custom + .byte4 onParasolRequireUnsetReceiver__Q53scn4step5enemy10parasoldoo6CustomFRQ53scn4step5enemy7parasol6Custom .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6pierce6Custom __vt__Q53scn4step5enemy6pierce6Custom: .4byte 0 .4byte 0 - .4byte 0x802CFB34 ;# ptr - .4byte 0x802CFB38 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23589,27 +23589,27 @@ __vt__Q53scn4step5enemy6pierce6Custom: __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802D1D24 ;# ptr - .4byte 0x802D1C9C ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10poppybrojr6Custom __vt__Q53scn4step5enemy10poppybrojr6Custom: .4byte 0 .4byte 0 - .4byte 0x802D1C98 ;# ptr - .4byte 0x802D1CB8 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802D1780 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x802D17C4 ;# ptr - .4byte 0x802D1804 ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23617,21 +23617,21 @@ __vt__Q53scn4step5enemy10poppybrojr6Custom: __vt__Q53scn4step5enemy14poppybrojrbomb6Custom: .4byte 0 .4byte 0 - .4byte 0x802D2C04 ;# ptr - .4byte 0x802D2C08 ;# ptr - .4byte 0x802D2924 ;# ptr - .4byte 0x802D2B50 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802D2928 ;# ptr - .4byte 0x802D2B54 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23639,21 +23639,21 @@ __vt__Q53scn4step5enemy14poppybrojrbomb6Custom: __vt__Q53scn4step5enemy9puppetdee6Custom: .4byte 0 .4byte 0 - .4byte 0x802D3310 ;# ptr - .4byte 0x802D3314 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x802D32C0 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23661,21 +23661,21 @@ __vt__Q53scn4step5enemy9puppetdee6Custom: __vt__Q53scn4step5enemy5rocky6Custom: .4byte 0 .4byte 0 - .4byte 0x802D3A80 ;# ptr - .4byte 0x802D3A84 ;# ptr - .4byte 0x802D39F4 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23683,21 +23683,21 @@ __vt__Q53scn4step5enemy5rocky6Custom: __vt__Q53scn4step5enemy8rollball6Custom: .4byte 0 .4byte 0 - .4byte 0x802D6624 ;# ptr - .4byte 0x802D6628 ;# ptr - .4byte 0x802D62A0 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x802D645C ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23705,21 +23705,21 @@ __vt__Q53scn4step5enemy8rollball6Custom: __vt__Q53scn4step5enemy7sandbag6Custom: .4byte 0 .4byte 0 - .4byte 0x802D9180 ;# ptr - .4byte 0x802D9184 ;# ptr - .4byte 0x802D88D0 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x802D8E28 ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802D8E2C ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x802D8E60 ;# ptr - .4byte 0x802D8EB8 ;# ptr - .4byte 0x802D8BB8 ;# ptr - .4byte 0x802D893C ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23727,21 +23727,21 @@ __vt__Q53scn4step5enemy7sandbag6Custom: __vt__Q53scn4step5enemy6scarfy6Custom: .4byte 0 .4byte 0 - .4byte 0x802D9D50 ;# ptr - .4byte 0x802D9D54 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x802D9C70 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x802D9C74 ;# ptr - .4byte 0x802D9C6C ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23749,21 +23749,21 @@ __vt__Q53scn4step5enemy6scarfy6Custom: __vt__Q53scn4step5enemy8searches6Custom: .4byte 0 .4byte 0 - .4byte 0x802DBDE8 ;# ptr - .4byte 0x802DBDEC ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x802DBDE4 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802DBDE0 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23771,27 +23771,27 @@ __vt__Q53scn4step5enemy8searches6Custom: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802DD8F4 ;# ptr - .4byte 0x802DD8D4 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5sheld6Custom __vt__Q53scn4step5enemy5sheld6Custom: .4byte 0 .4byte 0 - .4byte 0x802DD8D0 ;# ptr - .4byte 0x802DD8F0 ;# ptr - .4byte 0x802DCF68 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x802DD0A4 ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802DD284 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23799,21 +23799,21 @@ __vt__Q53scn4step5enemy5sheld6Custom: __vt__Q53scn4step5enemy6shotzo6Custom: .4byte 0 .4byte 0 - .4byte 0x802E0738 ;# ptr - .4byte 0x802E073C ;# ptr - .4byte 0x802E02E4 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x802E0384 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23821,21 +23821,21 @@ __vt__Q53scn4step5enemy6shotzo6Custom: __vt__Q53scn4step5enemy9sirkibble6Custom: .4byte 0 .4byte 0 - .4byte 0x802E16DC ;# ptr - .4byte 0x802E16E0 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802E1404 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x802E1428 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23843,21 +23843,21 @@ __vt__Q53scn4step5enemy9sirkibble6Custom: __vt__Q53scn4step5enemy11sisterbound6Custom: .4byte 0 .4byte 0 - .4byte 0x802E2AEC ;# ptr - .4byte 0x802E2AF0 ;# ptr - .4byte 0x802E296C ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802E29FC ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23865,21 +23865,21 @@ __vt__Q53scn4step5enemy11sisterbound6Custom: __vt__Q53scn4step5enemy5snowl6Custom: .4byte 0 .4byte 0 - .4byte 0x802E3838 ;# ptr - .4byte 0x802E383C ;# ptr - .4byte 0x802E3768 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23887,21 +23887,21 @@ __vt__Q53scn4step5enemy5snowl6Custom: __vt__Q53scn4step5enemy6sodory6Custom: .4byte 0 .4byte 0 - .4byte 0x802E53C8 ;# ptr - .4byte 0x802E53CC ;# ptr - .4byte 0x802E4DCC ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802E4E44 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23909,21 +23909,21 @@ __vt__Q53scn4step5enemy6sodory6Custom: __vt__Q53scn4step5enemy6sparky6Custom: .4byte 0 .4byte 0 - .4byte 0x802E6E70 ;# ptr - .4byte 0x802E6E74 ;# ptr - .4byte 0x802E6D84 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23931,21 +23931,21 @@ __vt__Q53scn4step5enemy6sparky6Custom: __vt__Q53scn4step5enemy10stareffect6Custom: .4byte 0 .4byte 0 - .4byte 0x802E7E7C ;# ptr - .4byte 0x802E7E80 ;# ptr - .4byte 0x802E7AC4 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23953,21 +23953,21 @@ __vt__Q53scn4step5enemy10stareffect6Custom: __vt__Q53scn4step5enemy3sun6Custom: .4byte 0 .4byte 0 - .4byte 0x802E8C3C ;# ptr - .4byte 0x802E8C40 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x802E8C08 ;# ptr - .4byte 0x802E8C0C ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23975,21 +23975,21 @@ __vt__Q53scn4step5enemy3sun6Custom: __vt__Q53scn4step5enemy9tsukikage6Custom: .4byte 0 .4byte 0 - .4byte 0x802EAFF4 ;# ptr - .4byte 0x802EAFF8 ;# ptr - .4byte 0x802EA810 ;# ptr - .4byte 0x802EA984 ;# ptr - .4byte 0x802EA934 ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x802EA8C4 ;# ptr - .4byte 0x802EA988 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -23997,21 +23997,21 @@ __vt__Q53scn4step5enemy9tsukikage6Custom: __vt__Q53scn4step5enemy9waddledoo6Custom: .4byte 0 .4byte 0 - .4byte 0x802EFB2C ;# ptr - .4byte 0x802EFB30 ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -24019,27 +24019,27 @@ __vt__Q53scn4step5enemy9waddledoo6Custom: __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802F10A4 ;# ptr - .4byte 0x802F1084 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11whispyapple6Custom __vt__Q53scn4step5enemy11whispyapple6Custom: .4byte 0 .4byte 0 - .4byte 0x802F1080 ;# ptr - .4byte 0x802F10A0 ;# ptr - .4byte 0x802F0D94 ;# ptr - .4byte 0x802F0E5C ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x802F0F34 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x802F107C ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -24047,21 +24047,21 @@ __vt__Q53scn4step5enemy11whispyapple6Custom: __vt__Q53scn4step5enemy15zankibblecutter6Custom: .4byte 0 .4byte 0 - .4byte 0x802F2568 ;# ptr - .4byte 0x802F256C ;# ptr - .4byte 0x802F23D8 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x802F2538 ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x802F24B4 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -24069,53 +24069,53 @@ __vt__Q53scn4step5enemy15zankibblecutter6Custom: __vt__Q53scn4step4hero5spark6Custom: .4byte 0 .4byte 0 - .4byte 0x8038CD9C - .4byte 0x8038CD30 + .byte4 GetRuntimeTypeInfo__Q53scn4step4hero5spark6CustomCFv + .byte4 __dt__Q53scn4step4hero5spark6CustomFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7parasol6Custom __vt__Q53scn4step4hero7parasol6Custom: .4byte 0 .4byte 0 - .4byte 0x80392554 - .4byte 0x803924E8 + .byte4 GetRuntimeTypeInfo__Q53scn4step4hero7parasol6CustomCFv + .byte4 __dt__Q53scn4step4hero7parasol6CustomFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter6Custom __vt__Q53scn4step4hero7fighter6Custom: .4byte 0 .4byte 0 - .4byte 0x8039B4C0 - .4byte 0x8039B454 + .byte4 GetRuntimeTypeInfo__Q53scn4step4hero7fighter6CustomCFv + .byte4 __dt__Q53scn4step4hero7fighter6CustomFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803DC22C - .4byte 0x803DC164 + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803DC228 - .4byte 0x803DC180 + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803DC224 - .4byte 0x803DC19C + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon11starshotlv16Custom __vt__Q53scn4step6weapon11starshotlv16Custom: .4byte 0 .4byte 0 - .4byte 0x803DC160 - .4byte 0x803DC1B8 - .4byte 0x803DBD40 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q53scn4step6weapon11starshotlv16CustomCFv + .byte4 __dt__Q53scn4step6weapon11starshotlv16CustomFv + .byte4 onInit__Q53scn4step6weapon11starshotlv16CustomFv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 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 - .4byte 0x803DEB3C - .4byte 0x803DEB1C + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7rollexp9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7rollexp9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon7rollexp6Custom __vt__Q53scn4step6weapon7rollexp6Custom: .4byte 0 .4byte 0 - .4byte 0x803DEB18 - .4byte 0x803DEB38 - .4byte 0x803DEA94 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q53scn4step6weapon7rollexp6CustomCFv + .byte4 __dt__Q53scn4step6weapon7rollexp6CustomFv + .byte4 onInit__Q53scn4step6weapon7rollexp6CustomFv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 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 - .4byte 0x803E02B4 - .4byte 0x803E0294 + .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13gigatzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13gigatzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon13gigatzobullet6Custom __vt__Q53scn4step6weapon13gigatzobullet6Custom: .4byte 0 .4byte 0 - .4byte 0x803E0290 - .4byte 0x803E02B0 - .4byte 0x803E020C - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q53scn4step6weapon13gigatzobullet6CustomCFv + .byte4 __dt__Q53scn4step6weapon13gigatzobullet6CustomFv + .byte4 onInit__Q53scn4step6weapon13gigatzobullet6CustomFv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 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 - .4byte 0x803E2274 - .4byte 0x803E21EC + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10comothread9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10comothread9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon10comothread6Custom __vt__Q53scn4step6weapon10comothread6Custom: .4byte 0 .4byte 0 - .4byte 0x803E21E8 - .4byte 0x803E2208 - .4byte 0x803E1FA0 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q53scn4step6weapon10comothread6CustomCFv + .byte4 __dt__Q53scn4step6weapon10comothread6CustomFv + .byte4 onInit__Q53scn4step6weapon10comothread6CustomFv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 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 - .4byte 0x803E6C4C - .4byte 0x803E6C28 + .byte4 __dt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot9StateMain$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1Fv + .byte4 create__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot9StateMain$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1Fv .global __vt__Q53scn4step6weapon16fighterhadoushot6Custom __vt__Q53scn4step6weapon16fighterhadoushot6Custom: .4byte 0 .4byte 0 - .4byte 0x803E6C24 - .4byte 0x803E6C48 - .4byte 0x803E6AF0 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q53scn4step6weapon16fighterhadoushot6CustomCFv + .byte4 __dt__Q53scn4step6weapon16fighterhadoushot6CustomFv + .byte4 onInit__Q53scn4step6weapon16fighterhadoushot6CustomFv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -24209,17 +24209,17 @@ $$256603: __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803EE564 - .4byte 0x803EE4DC + .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon13vacuumedblock6Custom __vt__Q53scn4step6weapon13vacuumedblock6Custom: .4byte 0 .4byte 0 - .4byte 0x803EE4D8 - .4byte 0x803EE4F8 - .4byte 0x803EE2F0 - .4byte 0x803EE3FC - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q53scn4step6weapon13vacuumedblock6CustomCFv + .byte4 __dt__Q53scn4step6weapon13vacuumedblock6CustomFv + .byte4 onInit__Q53scn4step6weapon13vacuumedblock6CustomFv + .byte4 onDead__Q53scn4step6weapon13vacuumedblock6CustomFv + .byte4 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 - .4byte 0x803EFA78 - .4byte 0x803EFA58 + .byte4 __dt__Q24util116StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon26challengemastersummonlight9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util116StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon26challengemastersummonlight9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon26challengemastersummonlight6Custom __vt__Q53scn4step6weapon26challengemastersummonlight6Custom: .4byte 0 .4byte 0 - .4byte 0x803EFA54 - .4byte 0x803EFA74 - .4byte 0x803EF9D0 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q53scn4step6weapon26challengemastersummonlight6CustomCFv + .byte4 __dt__Q53scn4step6weapon26challengemastersummonlight6CustomFv + .byte4 onInit__Q53scn4step6weapon26challengemastersummonlight6CustomFv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 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 - .4byte 0x803F04D8 - .4byte 0x803F0498 + .byte4 __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot10StateReady$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot10StateReady$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateWait$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateWait$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803F04D4 - .4byte 0x803F04B4 + .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateWait$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateWait$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon19challengemastershot6Custom __vt__Q53scn4step6weapon19challengemastershot6Custom: .4byte 0 .4byte 0 - .4byte 0x803F0494 - .4byte 0x803F04D0 - .4byte 0x803F0280 - .4byte 0x803D3768 - .4byte 0x803F02FC + .byte4 GetRuntimeTypeInfo__Q53scn4step6weapon19challengemastershot6CustomCFv + .byte4 __dt__Q53scn4step6weapon19challengemastershot6CustomFv + .byte4 onInit__Q53scn4step6weapon19challengemastershot6CustomFv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q53scn4step6weapon19challengemastershot6CustomFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/CustomBase.s b/asm/src/CustomBase.s index 0a83f8ed..09682d0b 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 - .4byte 0x8022E6A0 ;# ptr - .4byte 0x8022E618 ;# ptr + .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 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 - .4byte 0x8022E614 ;# ptr - .4byte 0x8022E634 ;# ptr - .4byte 0x8022E554 ;# ptr - .4byte 0x8022E5C8 ;# ptr - .4byte 0x8022E5CC ;# ptr - .4byte 0x8022E5D0 ;# ptr - .4byte 0x8022E5D4 ;# ptr - .4byte 0x8022E5D8 ;# ptr - .4byte 0x8022E5DC ;# ptr - .4byte 0x8022E5E0 ;# ptr - .4byte 0x8022E5E4 ;# ptr - .4byte 0x8022E5E8 ;# ptr - .4byte 0x8022E5EC ;# ptr - .4byte 0x8022E5F0 ;# ptr - .4byte 0x8022E5F4 ;# ptr - .4byte 0x8022E5F8 ;# ptr - .4byte 0x8022E5FC ;# ptr - .4byte 0x8022E600 ;# ptr - .4byte 0x8022E604 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -468,27 +468,27 @@ __vt__Q43scn4step4boss10CustomBase: __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadInWater$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80281FB8 ;# ptr - .4byte 0x80281F30 ;# ptr + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadInWater$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadInWater$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q43scn4step5enemy10CustomBase __vt__Q43scn4step5enemy10CustomBase: .4byte 0 .4byte 0 - .4byte 0x80281F2C ;# ptr - .4byte 0x80281F4C ;# ptr - .4byte 0x80281E84 ;# ptr - .4byte 0x80281E88 ;# ptr - .4byte 0x80281E8C ;# ptr - .4byte 0x80281E90 ;# ptr - .4byte 0x80281E94 ;# ptr - .4byte 0x80281E98 ;# ptr - .4byte 0x80281F10 ;# ptr - .4byte 0x80281F14 ;# ptr - .4byte 0x80281F18 ;# ptr - .4byte 0x80281F1C ;# ptr - .4byte 0x80281F20 ;# ptr - .4byte 0x80281F24 ;# ptr - .4byte 0x80281F28 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -496,11 +496,11 @@ __vt__Q43scn4step5enemy10CustomBase: __vt__Q43scn4step6weapon10CustomBase: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D3774 - .4byte 0x803D3764 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon10CustomBaseFv + .byte4 onInit__Q43scn4step6weapon10CustomBaseFv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/CustomFactory.s b/asm/src/CustomFactory.s index bb387435..25f6f13c 100644 --- a/asm/src/CustomFactory.s +++ b/asm/src/CustomFactory.s @@ -6259,632 +6259,632 @@ $$264044: __vt__Q43scn4step6weapon50CustomSimple$$0Q53scn4step6weapon7airball9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5B20 - .4byte 0x803D59A8 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon50CustomSimple$$0Q53scn4step6weapon7airball9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon50CustomSimple$$0Q53scn4step6weapon7airball9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11waterpistol9StateMain$$1 __vt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11waterpistol9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5B1C - .4byte 0x803D592C - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11waterpistol9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11waterpistol9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9swordbeam9StateMain$$1 __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9swordbeam9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5B18 - .4byte 0x803D58B0 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9swordbeam9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9swordbeam9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15cutterfinalwave9StateMain$$1 __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15cutterfinalwave9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5B14 - .4byte 0x803D5834 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15cutterfinalwave9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15cutterfinalwave9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17fireburningbullet9StateMain$$1 __vt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17fireburningbullet9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5B10 - .4byte 0x803D57B8 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17fireburningbullet9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17fireburningbullet9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispyairball9StateMain$$1 __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispyairball9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5B0C - .4byte 0x803D573C - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispyairball9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispyairball9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15sirkibblecutter9StateMain$$1 __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15sirkibblecutter9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5B08 - .4byte 0x803D56C0 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15sirkibblecutter9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15sirkibblecutter9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12shotzobullet9StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12shotzobullet9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5B04 - .4byte 0x803D5644 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12shotzobullet9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12shotzobullet9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12leafanpollen9StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12leafanpollen9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5B00 - .4byte 0x803D55C8 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12leafanpollen9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12leafanpollen9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv19StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv19StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AFC - .4byte 0x803D554C - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv19StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv19StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv29StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv29StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AF8 - .4byte 0x803D54D0 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv29StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv29StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv39StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv39StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AF4 - .4byte 0x803D5454 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv39StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12sparkshotlv39StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18watergalboroswater9StateMain$$1 __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18watergalboroswater9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AF0 - .4byte 0x803D53D8 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18watergalboroswater9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18watergalboroswater9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10spearspear9StateMain$$1 __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10spearspear9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AEC - .4byte 0x803D535C - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10spearspear9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10spearspear9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12hammerhammer9StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12hammerhammer9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AE8 - .4byte 0x803D52E0 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12hammerhammer9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12hammerhammer9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8wingshot9StateMain$$1 __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8wingshot9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AE4 - .4byte 0x803D5264 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8wingshot9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8wingshot9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13wingshockwave9StateMain$$1 __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13wingshockwave9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AE0 - .4byte 0x803D51E8 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13wingshockwave9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13wingshockwave9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16fightersmashshot9StateMain$$1 __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16fightersmashshot9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5ADC - .4byte 0x803D516C - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16fightersmashshot9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16fightersmashshot9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15fighterkickshot9StateMain$$1 __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15fighterkickshot9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AD8 - .4byte 0x803D50F0 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15fighterkickshot9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15fighterkickshot9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon58CustomSimple$$0Q53scn4step6weapon14gigantedgeshot9StateMain$$1 __vt__Q43scn4step6weapon58CustomSimple$$0Q53scn4step6weapon14gigantedgeshot9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AD4 - .4byte 0x803D5074 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon58CustomSimple$$0Q53scn4step6weapon14gigantedgeshot9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon58CustomSimple$$0Q53scn4step6weapon14gigantedgeshot9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16enemywaterbullet9StateMain$$1 __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16enemywaterbullet9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AD0 - .4byte 0x803D4FF8 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16enemywaterbullet9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16enemywaterbullet9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon64CustomSimple$$0Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$1 __vt__Q43scn4step6weapon64CustomSimple$$0Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5ACC - .4byte 0x803D4F7C - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon64CustomSimple$$0Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon64CustomSimple$$0Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16kingsdoowaveshot9StateMain$$1 __vt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16kingsdoowaveshot9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AC8 - .4byte 0x803D4F00 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16kingsdoowaveshot9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon60CustomSimple$$0Q53scn4step6weapon16kingsdoowaveshot9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13owgulffeather9StateMain$$1 __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13owgulffeather9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AC4 - .4byte 0x803D4E84 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13owgulffeather9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13owgulffeather9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9foleyleaf9StateMain$$1 __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9foleyleaf9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AC0 - .4byte 0x803D4E08 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9foleyleaf9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9foleyleaf9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10bowbyarrow9StateMain$$1 __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10bowbyarrow9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5ABC - .4byte 0x803D4D8C - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10bowbyarrow9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10bowbyarrow9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12jucklecutter9StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12jucklecutter9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AB8 - .4byte 0x803D4D10 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12jucklecutter9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12jucklecutter9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17tsukikageshuriken9StateMain$$1 __vt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17tsukikageshuriken9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AB4 - .4byte 0x803D4C94 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17tsukikageshuriken9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon61CustomSimple$$0Q53scn4step6weapon17tsukikageshuriken9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15knucklejoehadou9StateMain$$1 __vt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15knucklejoehadou9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AB0 - .4byte 0x803D4C18 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15knucklejoehadou9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon59CustomSimple$$0Q53scn4step6weapon15knucklejoehadou9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9snowlball9StateMain$$1 __vt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9snowlball9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AAC - .4byte 0x803D4B9C - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9snowlball9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon52CustomSimple$$0Q53scn4step6weapon9snowlball9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10floweffect9StateMain$$1 __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10floweffect9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AA8 - .4byte 0x803D4B20 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10floweffect9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10floweffect9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispytornado9StateMain$$1 __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispytornado9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AA4 - .4byte 0x803D4AA4 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispytornado9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13whispytornado9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10whispyroot9StateMain$$1 __vt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10whispyroot9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5AA0 - .4byte 0x803D4A28 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10whispyroot9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon54CustomSimple$$0Q53scn4step6weapon10whispyroot9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationairball9StateMain$$1 __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationairball9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5A9C - .4byte 0x803D49AC - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationairball9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationairball9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon63CustomSimple$$0Q53scn4step6weapon19combinationmetabeam9StateMain$$1 __vt__Q43scn4step6weapon63CustomSimple$$0Q53scn4step6weapon19combinationmetabeam9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5A98 - .4byte 0x803D4930 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon63CustomSimple$$0Q53scn4step6weapon19combinationmetabeam9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon63CustomSimple$$0Q53scn4step6weapon19combinationmetabeam9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon67CustomSimple$$0Q53scn4step6weapon23combinationdededebomber9StateMain$$1 __vt__Q43scn4step6weapon67CustomSimple$$0Q53scn4step6weapon23combinationdededebomber9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5A94 - .4byte 0x803D48B4 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon67CustomSimple$$0Q53scn4step6weapon23combinationdededebomber9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon67CustomSimple$$0Q53scn4step6weapon23combinationdededebomber9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationdeeshot9StateMain$$1 __vt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationdeeshot9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5A90 - .4byte 0x803D4838 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationdeeshot9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon62CustomSimple$$0Q53scn4step6weapon18combinationdeeshot9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8metabeam9StateMain$$1 __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8metabeam9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5A8C - .4byte 0x803D47BC - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8metabeam9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8metabeam9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13metashockwave9StateMain$$1 __vt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13metashockwave9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5A88 - .4byte 0x803D4740 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13metashockwave9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon57CustomSimple$$0Q53scn4step6weapon13metashockwave9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12dededehammer9StateMain$$1 __vt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12dededehammer9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5A84 - .4byte 0x803D46C4 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12dededehammer9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon56CustomSimple$$0Q53scn4step6weapon12dededehammer9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8deespear9StateMain$$1 __vt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8deespear9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5A80 - .4byte 0x803D4648 - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8deespear9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon51CustomSimple$$0Q53scn4step6weapon8deespear9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11hotheadfire9StateMain$$1 __vt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11hotheadfire9StateMain$$1: .4byte 0 .4byte 0 - .4byte 0x803D3770 - .4byte 0x803D5A24 - .4byte 0x803D45CC - .4byte 0x803D3768 - .4byte 0x803D376C + .byte4 GetRuntimeTypeInfo__Q43scn4step6weapon10CustomBaseCFv + .byte4 __dt__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11hotheadfire9StateMain$$1Fv + .byte4 onInit__Q43scn4step6weapon55CustomSimple$$0Q53scn4step6weapon11hotheadfire9StateMain$$1Fv + .byte4 onDead__Q43scn4step6weapon10CustomBaseFv + .byte4 reqCustomDeadEffect__Q43scn4step6weapon10CustomBaseFv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11hotheadfire9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11hotheadfire9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6060 - .4byte 0x803D5B24 + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11hotheadfire9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11hotheadfire9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D605C - .4byte 0x803D5B40 + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6058 - .4byte 0x803D5B5C + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13metashockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13metashockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6054 - .4byte 0x803D5B78 + .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13metashockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13metashockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8metabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8metabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6050 - .4byte 0x803D5B94 + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8metabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8metabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationdeeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationdeeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D604C - .4byte 0x803D5BB0 + .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationdeeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationdeeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util113StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util113StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6048 - .4byte 0x803D5BCC + .byte4 __dt__Q24util113StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util113StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19combinationmetabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19combinationmetabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6044 - .4byte 0x803D5BE8 + .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19combinationmetabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19combinationmetabeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6040 - .4byte 0x803D5C04 + .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18combinationairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10whispyroot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10whispyroot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D603C - .4byte 0x803D5C20 + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10whispyroot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10whispyroot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispytornado9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispytornado9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6038 - .4byte 0x803D5C3C + .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispytornado9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispytornado9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10floweffect9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10floweffect9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6034 - .4byte 0x803D5C58 + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10floweffect9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10floweffect9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9snowlball9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9snowlball9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6030 - .4byte 0x803D5C74 + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9snowlball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9snowlball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15knucklejoehadou9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15knucklejoehadou9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D602C - .4byte 0x803D5C90 + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15knucklejoehadou9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15knucklejoehadou9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17tsukikageshuriken9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17tsukikageshuriken9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6028 - .4byte 0x803D5CAC + .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17tsukikageshuriken9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17tsukikageshuriken9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12jucklecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12jucklecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6024 - .4byte 0x803D5CC8 + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12jucklecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12jucklecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10bowbyarrow9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10bowbyarrow9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6020 - .4byte 0x803D5CE4 + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10bowbyarrow9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10bowbyarrow9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9foleyleaf9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9foleyleaf9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D601C - .4byte 0x803D5D00 + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9foleyleaf9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9foleyleaf9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13owgulffeather9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13owgulffeather9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6018 - .4byte 0x803D5D1C + .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13owgulffeather9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13owgulffeather9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16kingsdoowaveshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16kingsdoowaveshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6014 - .4byte 0x803D5D38 + .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16kingsdoowaveshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16kingsdoowaveshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6010 - .4byte 0x803D5D54 + .byte4 __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon20enemywaterbulletwarp9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16enemywaterbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16enemywaterbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D600C - .4byte 0x803D5D70 + .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16enemywaterbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16enemywaterbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon14gigantedgeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon14gigantedgeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6008 - .4byte 0x803D5D8C + .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon14gigantedgeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon14gigantedgeshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6004 - .4byte 0x803D5DA8 + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D6000 - .4byte 0x803D5DC4 + .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13wingshockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13wingshockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FFC - .4byte 0x803D5DE0 + .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13wingshockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13wingshockwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8wingshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8wingshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FF8 - .4byte 0x803D5DFC + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8wingshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8wingshot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FF4 - .4byte 0x803D5E18 + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FF0 - .4byte 0x803D5E34 + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18watergalboroswater9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18watergalboroswater9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FEC - .4byte 0x803D5E50 + .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18watergalboroswater9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon18watergalboroswater9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FE8 - .4byte 0x803D5E6C + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv39StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FE4 - .4byte 0x803D5E88 + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv29StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FE0 - .4byte 0x803D5EA4 + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12sparkshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12leafanpollen9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12leafanpollen9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FDC - .4byte 0x803D5EC0 + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12leafanpollen9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12leafanpollen9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12shotzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12shotzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FD8 - .4byte 0x803D5EDC + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12shotzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12shotzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15sirkibblecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15sirkibblecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FD4 - .4byte 0x803D5EF8 + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15sirkibblecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15sirkibblecutter9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispyairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispyairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FD0 - .4byte 0x803D5F14 + .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispyairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13whispyairball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17fireburningbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17fireburningbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FCC - .4byte 0x803D5F30 + .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17fireburningbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon17fireburningbullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15cutterfinalwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15cutterfinalwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FC8 - .4byte 0x803D5F4C + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15cutterfinalwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15cutterfinalwave9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9swordbeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9swordbeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FC4 - .4byte 0x803D5F68 + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9swordbeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon9swordbeam9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11waterpistol9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11waterpistol9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FC0 - .4byte 0x803D5F84 + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11waterpistol9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11waterpistol9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7airball9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7airball9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803D5FBC - .4byte 0x803D5FA0 + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7airball9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 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 633c89c7..9a313be1 100644 --- a/asm/src/CutRopeStep.s +++ b/asm/src/CutRopeStep.s @@ -2033,28 +2033,28 @@ $$259480: .4byte 0 .global $$256446 $$256446: - .4byte 0x80481270 + .byte4 $$256444 .global lbl_80562834 lbl_80562834: - .4byte 0x8048128C + .byte4 $$256445 .global $$256458 $$256458: - .4byte 0x8055A6A0 + .byte4 $$256456 .global lbl_8056283C lbl_8056283C: - .4byte 0x8055A6A8 + .byte4 $$256457 .global $$256474 $$256474: - .4byte 0x8055A6B0 + .byte4 $$256472 .global lbl_80562844 lbl_80562844: - .4byte 0x8055A6B8 + .byte4 $$256473 .global $$256486 $$256486: - .4byte 0x8055A6C0 + .byte4 $$256484 .global lbl_8056284C lbl_8056284C: - .4byte 0x8055A6C8 + .byte4 $$256485 .global $$259707 $$259707: .4byte 0x3F000000 diff --git a/asm/src/DamageFieldReact.s b/asm/src/DamageFieldReact.s index 633e46d6..650330ab 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 - .4byte 0x80335074 - .4byte 0x80335038 + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage14StateFireBlock$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage14StateFireBlock$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateSpine$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateSpine$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80335070 - .4byte 0x80335054 + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateSpine$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 ee014125..c9398a8e 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 - .4byte 0x803356E0 - .4byte 0x803356A0 + .byte4 __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$4f$$1Fv + .byte4 create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$4f$$1Fv .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x803356DC - .4byte 0x803356C0 + .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$1Fv diff --git a/asm/src/Dedede.s b/asm/src/Dedede.s index 3458681c..b409056a 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: - .4byte 0x8055AA50 + .byte4 $$248727 .4byte 0x0000000D - .4byte 0x8055AA58 + .byte4 $$248728 .4byte 0x0000000D - .4byte 0x8055AA60 + .byte4 $$248729 .4byte 0x0000000D - .4byte 0x8055AA68 + .byte4 $$248730 .4byte 0x0000000D - .4byte 0x8055AA70 + .byte4 $$248731 .4byte 0x0000000D - .4byte 0x8055AA78 + .byte4 $$248732 .4byte 0x0000000D - .4byte 0x8055AA80 + .byte4 $$248733 .4byte 0x0000000D - .4byte 0x80488CF8 + .byte4 $$248734 .4byte 0x0000000D - .4byte 0x8055AA88 + .byte4 $$248735 .4byte 0x0000000D - .4byte 0x8055AA90 + .byte4 $$248736 .4byte 0x0000000D - .4byte 0x8055AA98 + .byte4 $$248737 .4byte 0x0000000D - .4byte 0x80488D04 + .byte4 $$248738 .4byte 0x0000000D - .4byte 0x8055AAA0 + .byte4 $$248739 .4byte 0x0000000D - .4byte 0x80488D10 + .byte4 $$248740 .4byte 0x0000000D - .4byte 0x80488D1C + .byte4 $$248741 .4byte 0x0000000D - .4byte 0x8055AAA8 + .byte4 $$248742 .4byte 0x0000000D - .4byte 0x80488D2C + .byte4 $$248743 .4byte 0x0000000D - .4byte 0x80488D38 + .byte4 $$248744 .4byte 0x0000000D - .4byte 0x80488D44 + .byte4 $$248745 .4byte 0x0000000D - .4byte 0x8055AAB0 + .byte4 $$248746 .4byte 0x0000000D - .4byte 0x80488D50 + .byte4 $$248747 .4byte 0x0000000D - .4byte 0x80488D5C + .byte4 $$248748 .4byte 0x0000000D - .4byte 0x80488D6C + .byte4 $$248749 .4byte 0x0000000D - .4byte 0x8055AAB8 + .byte4 $$248750 .4byte 0x0000000D .4byte 0 .4byte 0 @@ -144,15 +144,15 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055AAC0 + .byte4 $$248751 .4byte 0x0000000D - .4byte 0x80488D7C + .byte4 $$248752 .4byte 0x0000000D - .4byte 0x8055AAC8 + .byte4 $$248753 .4byte 0x0000000D - .4byte 0x80488D88 + .byte4 $$248754 .4byte 0x0000000D - .4byte 0x8055AAD0 + .byte4 $$248755 .4byte 0x0000000D .4byte 0 .4byte 0 @@ -174,7 +174,7 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055AAC0 + .byte4 $$248751 .4byte 0x0000000D .4byte 0 .4byte 0 @@ -186,21 +186,21 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488D94 + .byte4 $$248756 .4byte 0x0000000D - .4byte 0x80488DA4 + .byte4 $$248757 .4byte 0x0000000D - .4byte 0x80488DB0 + .byte4 $$248758 .4byte 0x0000000D - .4byte 0x80488DC0 + .byte4 $$248759 .4byte 0x0000000D - .4byte 0x80488DD0 + .byte4 $$248760 .4byte 0x0000000D - .4byte 0x80488DDC + .byte4 $$248761 .4byte 0x0000000D - .4byte 0x80488D7C + .byte4 $$248752 .4byte 0x0000000D - .4byte 0x80488DE8 + .byte4 $$248762 .4byte 0x0000000D .4byte 0 .4byte 0 @@ -224,25 +224,25 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055AAD4 + .byte4 $$248763 .4byte 0x0000000D - .4byte 0x80488DF4 + .byte4 $$248764 .4byte 0x0000000D - .4byte 0x8055AAD4 + .byte4 $$248763 .4byte 0x0000000D - .4byte 0x80488DF4 + .byte4 $$248764 .4byte 0x0000000D - .4byte 0x80488E00 + .byte4 $$248765 .4byte 0x0000000D - .4byte 0x8055AADC + .byte4 $$248766 .4byte 0x0000000D - .4byte 0x80488E0C + .byte4 $$248767 .4byte 0x0000000D - .4byte 0x8055AAE4 + .byte4 $$248768 .4byte 0x0000000D - .4byte 0x80488E18 + .byte4 $$248769 .4byte 0x0000000D - .4byte 0x80488E30 + .byte4 $$248770 .4byte 0x0000000D .4byte 0 .4byte 0 @@ -256,115 +256,115 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055AAE8 + .byte4 $$248771 .4byte 0x0000000D - .4byte 0x8055AAF0 + .byte4 $$248772 .4byte 0x0000000D - .4byte 0x8055AAF8 + .byte4 $$248773 .4byte 0x0000000D - .4byte 0x8055AB00 + .byte4 $$248774 .4byte 0x0000000D - .4byte 0x80488E44 + .byte4 $$248775 .4byte 0x0000000D - .4byte 0x80488E50 + .byte4 $$248776 .4byte 0x0000000D - .4byte 0x8055AB08 + .byte4 $$248777 .4byte 0x0000000D - .4byte 0x8055AB10 + .byte4 $$248778 .4byte 0x0000000D - .4byte 0x8055AB18 + .byte4 $$248779 .4byte 0x0000000D - .4byte 0x8055AB20 + .byte4 $$248780 .4byte 0x0000000D - .4byte 0x8055AB28 + .byte4 $$248781 .4byte 0x0000000D - .4byte 0x8055AB30 + .byte4 $$248782 .4byte 0x0000000D - .4byte 0x8055AB38 + .byte4 $$248783 .4byte 0x0000000D - .4byte 0x8055AB40 + .byte4 $$248784 .4byte 0x0000000D .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055AA50 + .byte4 $$248727 .4byte 0x0000000D - .4byte 0x8055AA78 + .byte4 $$248732 .4byte 0x0000000D - .4byte 0x8055AB48 + .byte4 $$248785 .4byte 0x0000000D .4byte 0 .4byte 0 - .4byte 0x8055AB50 + .byte4 $$248786 .4byte 0x0000000D .4byte 0 .4byte 0 - .4byte 0x8055AB58 + .byte4 $$248787 .4byte 0x0000000D - .4byte 0x8055AB60 + .byte4 $$248788 .4byte 0x0000000D .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488E5C + .byte4 $$248789 .4byte 0x0000000D - .4byte 0x80488E68 + .byte4 $$248790 .4byte 0x0000000D - .4byte 0x80488E74 + .byte4 $$248791 .4byte 0x0000000D - .4byte 0x8055AA88 + .byte4 $$248735 .4byte 0x0000000D - .4byte 0x8055AB68 + .byte4 $$248792 .4byte 0x0000000D - .4byte 0x80488E80 + .byte4 $$248793 .4byte 0x0000000D - .4byte 0x80488E8C + .byte4 $$248794 .4byte 0x0000000D - .4byte 0x80488EA0 + .byte4 $$248795 .4byte 0x0000000D - .4byte 0x80488EB0 + .byte4 $$248796 .4byte 0x0000000D - .4byte 0x80488EBC + .byte4 $$248797 .4byte 0x0000000D - .4byte 0x80488ECC + .byte4 $$248798 .4byte 0x0000000D - .4byte 0x8055AB70 + .byte4 $$248799 .4byte 0x0000000D - .4byte 0x80488EDC + .byte4 $$248800 .4byte 0x0000000D - .4byte 0x80488EE8 + .byte4 $$248801 .4byte 0x0000000D - .4byte 0x80488EF8 + .byte4 $$248802 .4byte 0x0000000D - .4byte 0x80488F04 + .byte4 $$248803 .4byte 0x0000000D - .4byte 0x80488F10 + .byte4 $$248804 .4byte 0x0000000D - .4byte 0x8055AB78 + .byte4 $$248805 .4byte 0x0000000D - .4byte 0x8055AA50 + .byte4 $$248727 .4byte 0x0000000D - .4byte 0x80488F20 + .byte4 $$248806 .4byte 0x0000000D - .4byte 0x80488F2C + .byte4 $$248807 .4byte 0x0000000D - .4byte 0x80488F38 + .byte4 $$248808 .4byte 0x0000000D - .4byte 0x80488F48 + .byte4 $$248809 .4byte 0x0000000D - .4byte 0x80488F58 + .byte4 $$248810 .4byte 0x0000000D - .4byte 0x80488F70 + .byte4 $$248811 .4byte 0x0000000D - .4byte 0x80488F80 + .byte4 $$248812 .4byte 0x0000000D - .4byte 0x80488F98 + .byte4 $$248813 .4byte 0x0000000D - .4byte 0x8055AB80 + .byte4 $$248814 .4byte 0x0000000D - .4byte 0x80488FA4 + .byte4 $$248815 .4byte 0x0000000D .4byte 0 .4byte 0 @@ -804,59 +804,59 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80488FB0 + .byte4 $$248816 .4byte 0x0000000D - .4byte 0x80488FC8 + .byte4 $$248817 .4byte 0x0000000D - .4byte 0x80488FDC + .byte4 $$248818 .4byte 0x0000000D - .4byte 0x80488FF0 + .byte4 $$248819 .4byte 0x0000000D - .4byte 0x80489000 + .byte4 $$248820 .4byte 0x0000000D - .4byte 0x80489014 + .byte4 $$248821 .4byte 0x0000000D - .4byte 0x80489028 + .byte4 $$248822 .4byte 0x0000000D - .4byte 0x8048903C + .byte4 $$248823 .4byte 0x0000000D - .4byte 0x80489050 + .byte4 $$248824 .4byte 0x0000000D - .4byte 0x80489068 + .byte4 $$248825 .4byte 0x0000000D - .4byte 0x80489078 + .byte4 $$248826 .4byte 0x0000000D - .4byte 0x80489088 + .byte4 $$248827 .4byte 0x0000000D - .4byte 0x80489098 + .byte4 $$248828 .4byte 0x0000000D - .4byte 0x804890A4 + .byte4 $$248829 .4byte 0x0000000D - .4byte 0x804890B0 + .byte4 $$248830 .4byte 0x0000000D - .4byte 0x804890C0 + .byte4 $$248831 .4byte 0x0000000D - .4byte 0x804890CC + .byte4 $$248832 .4byte 0x0000000D - .4byte 0x804890E0 + .byte4 $$248833 .4byte 0x0000000D - .4byte 0x804890F0 + .byte4 $$248834 .4byte 0x0000000D - .4byte 0x80489100 + .byte4 $$248835 .4byte 0x0000000D - .4byte 0x80489110 + .byte4 $$248836 .4byte 0x0000000D - .4byte 0x80489128 + .byte4 $$248837 .4byte 0x0000000D - .4byte 0x8048913C + .byte4 $$248838 .4byte 0x0000000D - .4byte 0x8048914C + .byte4 $$248839 .4byte 0x0000000D - .4byte 0x80489160 + .byte4 $$248840 .4byte 0x0000000D - .4byte 0x80489170 + .byte4 $$248841 .4byte 0x0000000D - .4byte 0x80489180 + .byte4 $$248842 .4byte 0x0000000D .4byte 0 .4byte 0 @@ -938,39 +938,39 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80489194 + .byte4 $$248843 .4byte 0x0000000D - .4byte 0x804891A0 + .byte4 $$248844 .4byte 0x0000000D - .4byte 0x804891AC + .byte4 $$248845 .4byte 0x0000000D - .4byte 0x804891B8 + .byte4 $$248846 .4byte 0x0000000D - .4byte 0x8055AB88 + .byte4 $$248847 .4byte 0x0000000D - .4byte 0x804891C4 + .byte4 $$248848 .4byte 0x0000000D - .4byte 0x8055AA50 + .byte4 $$248727 .4byte 0x0000000D - .4byte 0x8055AA50 + .byte4 $$248727 .4byte 0x0000000D - .4byte 0x8055AA50 + .byte4 $$248727 .4byte 0x0000000D - .4byte 0x8055AA50 + .byte4 $$248727 .4byte 0x0000000D - .4byte 0x8055AA50 + .byte4 $$248727 .4byte 0x0000000D - .4byte 0x8055AA50 + .byte4 $$248727 .4byte 0x0000000D - .4byte 0x8055AB90 + .byte4 $$248849 .4byte 0x0000000D - .4byte 0x8055AB98 + .byte4 $$248850 .4byte 0x0000000D - .4byte 0x804891D0 + .byte4 $$248851 .4byte 0x0000000D - .4byte 0x8055ABA0 + .byte4 $$248852 .4byte 0x0000000D - .4byte 0x804891DC + .byte4 $$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: - .4byte 0x8055ABA8 - .4byte 0x804891E8 - .4byte 0x804891F4 - .4byte 0x80489200 - .4byte 0x8055ABB0 - .4byte 0x8048920C - .4byte 0x80489200 - .4byte 0x80489200 - .4byte 0x8055ABB8 - .4byte 0x8055ABC0 - .4byte 0x80489218 - .4byte 0x804891E8 - .4byte 0x8055ABC8 - .4byte 0x80489224 - .4byte 0x804891F4 - .4byte 0x80489230 - .4byte 0x804891E8 - .4byte 0x8055ABD0 - .4byte 0x8048923C - .4byte 0x80489248 - .4byte 0x8055ABD8 - .4byte 0x8055ABE0 - .4byte 0x80489254 - .4byte 0x8055ABA8 - .4byte 0x8055ABE8 - .4byte 0x8055ABE8 - .4byte 0x8055ABE8 - .4byte 0x8055ABE8 - .4byte 0x8055ABE8 - .4byte 0x8055ABE8 + .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 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248727 diff --git a/asm/src/Dee.s b/asm/src/Dee.s index 7d339376..80599aac 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: - .4byte 0x8055ABF8 + .byte4 $$249527 .4byte 0x0000000E - .4byte 0x8055AC00 + .byte4 $$249528 .4byte 0x0000000E - .4byte 0x8055AC08 + .byte4 $$249529 .4byte 0x0000000E - .4byte 0x8055AC10 + .byte4 $$249530 .4byte 0x0000000E - .4byte 0x8055AC18 + .byte4 $$249531 .4byte 0x0000000E - .4byte 0x8055AC20 + .byte4 $$249532 .4byte 0x0000000E - .4byte 0x8055AC28 + .byte4 $$249533 .4byte 0x0000000E - .4byte 0x804892F0 + .byte4 $$249534 .4byte 0x0000000E - .4byte 0x8055AC30 + .byte4 $$249535 .4byte 0x0000000E - .4byte 0x8055AC38 + .byte4 $$249536 .4byte 0x0000000E - .4byte 0x8055AC40 + .byte4 $$249537 .4byte 0x0000000E - .4byte 0x804892FC + .byte4 $$249538 .4byte 0x0000000E - .4byte 0x8055AC48 + .byte4 $$249539 .4byte 0x0000000E - .4byte 0x80489308 + .byte4 $$249540 .4byte 0x0000000E - .4byte 0x80489314 + .byte4 $$249541 .4byte 0x0000000E - .4byte 0x8055AC50 + .byte4 $$249542 .4byte 0x0000000E - .4byte 0x80489324 + .byte4 $$249543 .4byte 0x0000000E - .4byte 0x80489330 + .byte4 $$249544 .4byte 0x0000000E .4byte 0 .4byte 0 @@ -364,15 +364,15 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055AC58 + .byte4 $$249545 .4byte 0x0000000E - .4byte 0x8048933C + .byte4 $$249546 .4byte 0x0000000E - .4byte 0x80489348 + .byte4 $$249547 .4byte 0x0000000E - .4byte 0x80489354 + .byte4 $$249548 .4byte 0x0000000E - .4byte 0x8055AC60 + .byte4 $$249549 .4byte 0x0000000E .4byte 0 .4byte 0 @@ -406,21 +406,21 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80489360 + .byte4 $$249550 .4byte 0x0000000E - .4byte 0x80489370 + .byte4 $$249551 .4byte 0x0000000E - .4byte 0x80489380 + .byte4 $$249552 .4byte 0x0000000E - .4byte 0x80489390 + .byte4 $$249553 .4byte 0x0000000E - .4byte 0x804893A0 + .byte4 $$249554 .4byte 0x0000000E - .4byte 0x804893AC + .byte4 $$249555 .4byte 0x0000000E - .4byte 0x804893B8 + .byte4 $$249556 .4byte 0x0000000E - .4byte 0x804893C4 + .byte4 $$249557 .4byte 0x0000000E .4byte 0 .4byte 0 @@ -444,25 +444,25 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055AC64 + .byte4 $$249558 .4byte 0x0000000E - .4byte 0x804893D0 + .byte4 $$249559 .4byte 0x0000000E - .4byte 0x8055AC6C + .byte4 $$249560 .4byte 0x0000000E - .4byte 0x804893DC + .byte4 $$249561 .4byte 0x0000000E - .4byte 0x804893E8 + .byte4 $$249562 .4byte 0x0000000E - .4byte 0x8055AC74 + .byte4 $$249563 .4byte 0x0000000E - .4byte 0x804893F4 + .byte4 $$249564 .4byte 0x0000000E - .4byte 0x8055AC7C + .byte4 $$249565 .4byte 0x0000000E - .4byte 0x80489400 + .byte4 $$249566 .4byte 0x0000000E - .4byte 0x80489418 + .byte4 $$249567 .4byte 0x0000000E .4byte 0 .4byte 0 @@ -476,115 +476,115 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055AC80 + .byte4 $$249568 .4byte 0x0000000E - .4byte 0x8055AC88 + .byte4 $$249569 .4byte 0x0000000E - .4byte 0x8055AC90 + .byte4 $$249570 .4byte 0x0000000E - .4byte 0x8055AC98 + .byte4 $$249571 .4byte 0x0000000E - .4byte 0x8048942C + .byte4 $$249572 .4byte 0x0000000E - .4byte 0x80489438 + .byte4 $$249573 .4byte 0x0000000E - .4byte 0x8055ACA0 + .byte4 $$249574 .4byte 0x0000000E - .4byte 0x8055ACA8 + .byte4 $$249575 .4byte 0x0000000E - .4byte 0x8055ACB0 + .byte4 $$249576 .4byte 0x0000000E - .4byte 0x8055ACB8 + .byte4 $$249577 .4byte 0x0000000E - .4byte 0x8055ACC0 + .byte4 $$249578 .4byte 0x0000000E - .4byte 0x8055ACC8 + .byte4 $$249579 .4byte 0x0000000E - .4byte 0x8055ACD0 + .byte4 $$249580 .4byte 0x0000000E - .4byte 0x8055ACD8 + .byte4 $$249581 .4byte 0x0000000E .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055ABF8 + .byte4 $$249527 .4byte 0x0000000E - .4byte 0x8055AC20 + .byte4 $$249532 .4byte 0x0000000E - .4byte 0x8055ACE0 + .byte4 $$249582 .4byte 0x0000000E .4byte 0 .4byte 0 - .4byte 0x8055ACE8 + .byte4 $$249583 .4byte 0x0000000E .4byte 0 .4byte 0 - .4byte 0x8055ACF0 + .byte4 $$249584 .4byte 0x0000000E - .4byte 0x8055ACF8 + .byte4 $$249585 .4byte 0x0000000E .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80489444 + .byte4 $$249586 .4byte 0x0000000E - .4byte 0x80489450 + .byte4 $$249587 .4byte 0x0000000E - .4byte 0x8048945C + .byte4 $$249588 .4byte 0x0000000E - .4byte 0x8055AC30 + .byte4 $$249535 .4byte 0x0000000E - .4byte 0x8055AD00 + .byte4 $$249589 .4byte 0x0000000E - .4byte 0x80489468 + .byte4 $$249590 .4byte 0x0000000E - .4byte 0x80489474 + .byte4 $$249591 .4byte 0x0000000E - .4byte 0x80489488 + .byte4 $$249592 .4byte 0x0000000E - .4byte 0x80489498 + .byte4 $$249593 .4byte 0x0000000E - .4byte 0x804894A4 + .byte4 $$249594 .4byte 0x0000000E - .4byte 0x804894B4 + .byte4 $$249595 .4byte 0x0000000E - .4byte 0x8055AD08 + .byte4 $$249596 .4byte 0x0000000E - .4byte 0x8055AD08 + .byte4 $$249596 .4byte 0x0000000E - .4byte 0x8055AD08 + .byte4 $$249596 .4byte 0x0000000E - .4byte 0x804894C4 + .byte4 $$249597 .4byte 0x0000000E - .4byte 0x804894D0 + .byte4 $$249598 .4byte 0x0000000E - .4byte 0x804894E0 + .byte4 $$249599 .4byte 0x0000000E .4byte 0 .4byte 0 - .4byte 0x8055ABF8 + .byte4 $$249527 .4byte 0x0000000E - .4byte 0x804894F0 + .byte4 $$249600 .4byte 0x0000000E - .4byte 0x80489348 + .byte4 $$249547 .4byte 0x0000000E - .4byte 0x8055ABF8 + .byte4 $$249527 .4byte 0x0000000E - .4byte 0x804894FC + .byte4 $$249601 .4byte 0x0000000E - .4byte 0x8048950C + .byte4 $$249602 .4byte 0x0000000E - .4byte 0x80489520 + .byte4 $$249603 .4byte 0x0000000E - .4byte 0x80489530 + .byte4 $$249604 .4byte 0x0000000E - .4byte 0x80489548 + .byte4 $$249605 .4byte 0x0000000E - .4byte 0x8055AD10 + .byte4 $$249606 .4byte 0x0000000E - .4byte 0x80489554 + .byte4 $$249607 .4byte 0x0000000E .4byte 0 .4byte 0 @@ -1078,119 +1078,119 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80489560 + .byte4 $$249608 .4byte 0x0000000E - .4byte 0x80489574 + .byte4 $$249609 .4byte 0x0000000E - .4byte 0x80489588 + .byte4 $$249610 .4byte 0x0000000E - .4byte 0x80489598 + .byte4 $$249611 .4byte 0x0000000E - .4byte 0x804895AC + .byte4 $$249612 .4byte 0x0000000E - .4byte 0x804895C0 + .byte4 $$249613 .4byte 0x0000000E - .4byte 0x804895D4 + .byte4 $$249614 .4byte 0x0000000E - .4byte 0x804895E8 + .byte4 $$249615 .4byte 0x0000000E - .4byte 0x804895F8 + .byte4 $$249616 .4byte 0x0000000E - .4byte 0x8048960C + .byte4 $$249617 .4byte 0x0000000E - .4byte 0x80489620 + .byte4 $$249618 .4byte 0x0000000E - .4byte 0x80489634 + .byte4 $$249619 .4byte 0x0000000E - .4byte 0x8048964C + .byte4 $$249620 .4byte 0x0000000E - .4byte 0x80489664 + .byte4 $$249621 .4byte 0x0000000E - .4byte 0x80489678 + .byte4 $$249622 .4byte 0x0000000E - .4byte 0x80489690 + .byte4 $$249623 .4byte 0x0000000E - .4byte 0x804896A4 + .byte4 $$249624 .4byte 0x0000000E - .4byte 0x804896B8 + .byte4 $$249625 .4byte 0x0000000E - .4byte 0x804896D0 + .byte4 $$249626 .4byte 0x0000000E - .4byte 0x804896E4 + .byte4 $$249627 .4byte 0x0000000E - .4byte 0x804896F8 + .byte4 $$249628 .4byte 0x0000000E - .4byte 0x80489708 + .byte4 $$249629 .4byte 0x0000000E - .4byte 0x80489718 + .byte4 $$249630 .4byte 0x0000000E - .4byte 0x80489730 + .byte4 $$249631 .4byte 0x0000000E - .4byte 0x8048974C + .byte4 $$249632 .4byte 0x0000000E - .4byte 0x8048976C + .byte4 $$249633 .4byte 0x0000000E - .4byte 0x80489788 + .byte4 $$249634 .4byte 0x0000000E - .4byte 0x804897A0 + .byte4 $$249635 .4byte 0x0000000E - .4byte 0x8055AD18 + .byte4 $$249636 .4byte 0x0000000E - .4byte 0x804897BC + .byte4 $$249637 .4byte 0x0000000E - .4byte 0x804897D0 + .byte4 $$249638 .4byte 0x0000000E - .4byte 0x804897E0 + .byte4 $$249639 .4byte 0x0000000E - .4byte 0x804897F0 + .byte4 $$249640 .4byte 0x0000000E - .4byte 0x80489800 + .byte4 $$249641 .4byte 0x0000000E - .4byte 0x80489818 + .byte4 $$249642 .4byte 0x0000000E - .4byte 0x8048982C + .byte4 $$249643 .4byte 0x0000000E - .4byte 0x8048983C + .byte4 $$249644 .4byte 0x0000000E - .4byte 0x80489850 + .byte4 $$249645 .4byte 0x0000000E - .4byte 0x80489860 + .byte4 $$249646 .4byte 0x0000000E - .4byte 0x80489870 + .byte4 $$249647 .4byte 0x0000000E - .4byte 0x80489884 + .byte4 $$249648 .4byte 0x0000000E - .4byte 0x80489890 + .byte4 $$249649 .4byte 0x0000000E - .4byte 0x8048989C + .byte4 $$249650 .4byte 0x0000000E - .4byte 0x804898A8 + .byte4 $$249651 .4byte 0x0000000E - .4byte 0x8055AD20 + .byte4 $$249652 .4byte 0x0000000E - .4byte 0x804898B4 + .byte4 $$249653 .4byte 0x0000000E - .4byte 0x8055ABF8 + .byte4 $$249527 .4byte 0x0000000E - .4byte 0x8055ABF8 + .byte4 $$249527 .4byte 0x0000000E - .4byte 0x8055ABF8 + .byte4 $$249527 .4byte 0x0000000E - .4byte 0x8055ABF8 + .byte4 $$249527 .4byte 0x0000000E - .4byte 0x8055ABF8 + .byte4 $$249527 .4byte 0x0000000E - .4byte 0x8055ABF8 + .byte4 $$249527 .4byte 0x0000000E - .4byte 0x8055AD28 + .byte4 $$249654 .4byte 0x0000000E - .4byte 0x8055AD30 + .byte4 $$249655 .4byte 0x0000000E - .4byte 0x804898C0 + .byte4 $$249656 .4byte 0x0000000E - .4byte 0x8055AD38 + .byte4 $$249657 .4byte 0x0000000E - .4byte 0x804898CC + .byte4 $$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: - .4byte 0x8055AD40 - .4byte 0x804898D8 - .4byte 0x804898E4 - .4byte 0x8055AD48 - .4byte 0x8055AD50 - .4byte 0x8055AD58 - .4byte 0x804898F0 - .4byte 0x804898F0 - .4byte 0x804898FC - .4byte 0x8048990C - .4byte 0x804898F0 - .4byte 0x804898D8 - .4byte 0x8055AD60 - .4byte 0x8055AD68 - .4byte 0x8055AD70 - .4byte 0x804898F0 - .4byte 0x804898F0 - .4byte 0x8055AD78 - .4byte 0x8055AD80 - .4byte 0x8055AD50 - .4byte 0x8055AD88 - .4byte 0x8055AD40 - .4byte 0x8055AD40 - .4byte 0x8055AD90 - .4byte 0x8055AD98 - .4byte 0x8055AD98 - .4byte 0x8055AD98 - .4byte 0x8055AD98 - .4byte 0x8055AD98 - .4byte 0x8055AD98 + .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 .global $$250026 $$250026: .asciz "Ribbon1DJ" diff --git a/asm/src/Delete.s b/asm/src/Delete.s index 139094b5..9450b284 100644 --- a/asm/src/Delete.s +++ b/asm/src/Delete.s @@ -139,15 +139,15 @@ $$252004: __vt__Q33scn19challengefileselect6Delete: .4byte 0 .4byte 0 - .4byte 0x801E32FC ;# ptr - .4byte 0x801E32A8 ;# ptr - .4byte 0x801E32AC ;# ptr - .4byte 0x801E32BC ;# ptr - .4byte 0x801E32C8 ;# ptr - .4byte 0x801E32D4 ;# ptr - .4byte 0x801E32E0 ;# ptr - .4byte 0x801E32E8 ;# ptr - .4byte 0x801E32F0 ;# ptr + .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 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251964 diff --git a/asm/src/Demo.s b/asm/src/Demo.s index ddb05f0a..cd8a0093 100644 --- a/asm/src/Demo.s +++ b/asm/src/Demo.s @@ -132,14 +132,14 @@ unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv: __vt__Q53scn4step7gimmick11areamapdemo4Demo: .4byte 0 .4byte 0 - .4byte 0x802FAD8C - .4byte 0x802FAE04 - .4byte 0x802FAE08 + .byte4 __dt__Q53scn4step7gimmick11areamapdemo4DemoFv + .byte4 registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root + .byte4 procAnim__Q53scn4step7gimmick11areamapdemo4DemoFv .4byte 0 .4byte 0 - .4byte 0x802F9A60 - .4byte 0x802F9A94 - .4byte 0x802FAE90 + .byte4 startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo4DemoFv + .byte4 isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo4DemoCFv + .byte4 unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252595 diff --git a/asm/src/DemoAllStageClear.s b/asm/src/DemoAllStageClear.s index 46d6d31f..2b8301b0 100644 --- a/asm/src/DemoAllStageClear.s +++ b/asm/src/DemoAllStageClear.s @@ -272,14 +272,14 @@ $$257907: __vt__Q53scn4step7gimmick11areamapdemo17DemoAllStageClear: .4byte 0 .4byte 0 - .4byte 0x802FAFA0 - .4byte 0x802FAE04 - .4byte 0x802FAE08 - .4byte 0x802FB00C - .4byte 0x802FB09C - .4byte 0x802F9A60 - .4byte 0x802F9A94 - .4byte 0x802FAE90 + .byte4 __dt__Q53scn4step7gimmick11areamapdemo17DemoAllStageClearFv + .byte4 registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root + .byte4 procAnim__Q53scn4step7gimmick11areamapdemo4DemoFv + .byte4 start__Q53scn4step7gimmick11areamapdemo17DemoAllStageClearFv + .byte4 end__Q53scn4step7gimmick11areamapdemo17DemoAllStageClearFv + .byte4 startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo4DemoFv + .byte4 isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo4DemoCFv + .byte4 unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257905 diff --git a/asm/src/DemoAppearWarpStar.s b/asm/src/DemoAppearWarpStar.s index f6528a71..a1442d2f 100644 --- a/asm/src/DemoAppearWarpStar.s +++ b/asm/src/DemoAppearWarpStar.s @@ -288,14 +288,14 @@ $$256147: __vt__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStar: .4byte 0 .4byte 0 - .4byte 0x802FB2AC - .4byte 0x802FAE04 - .4byte 0x802FB308 - .4byte 0x802FB3B0 - .4byte 0x802FB3C0 - .4byte 0x802FB3EC - .4byte 0x802FB3FC - .4byte 0x802FAE90 + .byte4 __dt__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFv + .byte4 registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root + .byte4 procAnim__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFv + .byte4 start__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFv + .byte4 end__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFv + .byte4 startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFv + .byte4 isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarCFv + .byte4 unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256125 diff --git a/asm/src/DemoChangeGrade.s b/asm/src/DemoChangeGrade.s index aeaf8302..d82b7e16 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: - .4byte 0x8055A4F8 - .4byte 0x8047F600 - .4byte 0x8047F624 - .4byte 0x8047F648 - .4byte 0x8047F668 - .4byte 0x8047F68C + .byte4 $$257293 + .byte4 $$257294 + .byte4 $$257295 + .byte4 $$257296 + .byte4 $$257297 + .byte4 $$257298 .global $$258717 $$258717: .asciz "challengefileselect/Trophyanime" @@ -720,14 +720,14 @@ $$258879: __vt__Q53scn4step7gimmick11areamapdemo15DemoChangeGrade: .4byte 0 .4byte 0 - .4byte 0x802FB848 - .4byte 0x802FB8CC - .4byte 0x802FB904 - .4byte 0x802FB9F4 - .4byte 0x802FBA84 - .4byte 0x802F9A60 - .4byte 0x802F9A94 - .4byte 0x802FAE90 + .byte4 __dt__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFv + .byte4 registerToRoot__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFRQ23g3d4Root + .byte4 procAnim__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFv + .byte4 start__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFv + .byte4 end__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFv + .byte4 startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo4DemoFv + .byte4 isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo4DemoCFv + .byte4 unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257293 diff --git a/asm/src/DemoFirstLvIn.s b/asm/src/DemoFirstLvIn.s index 8cf4e088..ca2bba94 100644 --- a/asm/src/DemoFirstLvIn.s +++ b/asm/src/DemoFirstLvIn.s @@ -337,14 +337,14 @@ $$255389: __vt__Q53scn4step7gimmick11areamapdemo13DemoFirstLvIn: .4byte 0 .4byte 0 - .4byte 0x802FC004 - .4byte 0x802FAE04 - .4byte 0x802FC070 - .4byte 0x802FC100 - .4byte 0x802FC180 - .4byte 0x802FC1B0 - .4byte 0x802FC21C - .4byte 0x802FC2A0 + .byte4 __dt__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv + .byte4 registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root + .byte4 procAnim__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv + .byte4 start__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv + .byte4 end__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv + .byte4 startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv + .byte4 isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInCFv + .byte4 unsetZoomAll__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255356 diff --git a/asm/src/DemoFirstPlay.s b/asm/src/DemoFirstPlay.s index 4195e240..e972714f 100644 --- a/asm/src/DemoFirstPlay.s +++ b/asm/src/DemoFirstPlay.s @@ -328,14 +328,14 @@ $$255320: __vt__Q53scn4step7gimmick11areamapdemo13DemoFirstPlay: .4byte 0 .4byte 0 - .4byte 0x802FC464 - .4byte 0x802FAE04 - .4byte 0x802FAE08 - .4byte 0x802FC4D0 - .4byte 0x802FC560 - .4byte 0x802FC5A4 - .4byte 0x802FC664 - .4byte 0x802FAE90 + .byte4 __dt__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayFv + .byte4 registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root + .byte4 procAnim__Q53scn4step7gimmick11areamapdemo4DemoFv + .byte4 start__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayFv + .byte4 end__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayFv + .byte4 startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayFv + .byte4 isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayCFv + .byte4 unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255319 diff --git a/asm/src/DemoUnlockMaster.s b/asm/src/DemoUnlockMaster.s index 007d370e..972e35cc 100644 --- a/asm/src/DemoUnlockMaster.s +++ b/asm/src/DemoUnlockMaster.s @@ -313,14 +313,14 @@ $$255141: __vt__Q53scn4step7gimmick11areamapdemo16DemoUnlockMaster: .4byte 0 .4byte 0 - .4byte 0x802FC8D8 - .4byte 0x802FAE04 - .4byte 0x802FAE08 - .4byte 0x802FC944 - .4byte 0x802FC954 - .4byte 0x802FC958 - .4byte 0x802FC96C - .4byte 0x802FC9A0 + .byte4 __dt__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFv + .byte4 registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root + .byte4 procAnim__Q53scn4step7gimmick11areamapdemo4DemoFv + .byte4 start__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFv + .byte4 end__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFv + .byte4 startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFv + .byte4 isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterCFv + .byte4 unsetZoomAll__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255199 diff --git a/asm/src/DemoUnlockMasterEx.s b/asm/src/DemoUnlockMasterEx.s index c4c15da8..3280c878 100644 --- a/asm/src/DemoUnlockMasterEx.s +++ b/asm/src/DemoUnlockMasterEx.s @@ -142,14 +142,14 @@ $$254711: __vt__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterEx: .4byte 0 .4byte 0 - .4byte 0x802FCCB8 - .4byte 0x802FAE04 - .4byte 0x802FAE08 - .4byte 0x802FCCBC - .4byte 0x802FCCCC - .4byte 0x802FCCD0 - .4byte 0x802FCCD4 - .4byte 0x802FAE90 + .byte4 __dt__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExFv + .byte4 registerToRoot__Q53scn4step7gimmick11areamapdemo4DemoFRQ23g3d4Root + .byte4 procAnim__Q53scn4step7gimmick11areamapdemo4DemoFv + .byte4 start__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExFv + .byte4 end__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExFv + .byte4 startDoorUnlockDemo__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExFv + .byte4 isDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExCFv + .byte4 unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254729 diff --git a/asm/src/Detail.s b/asm/src/Detail.s index fd032e27..5a168a3e 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: - .4byte 0x80461A20 - .4byte 0x80461A2C - .4byte 0x80461A38 + .byte4 $$252849 + .byte4 $$252850 + .byte4 $$252851 .global $$252854 $$252854: .4byte 0x00000008 @@ -3870,10 +3870,10 @@ $$259188: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252847 $$252847: - .4byte 0x80461A08 + .byte4 $$252845 .global lbl_80560174 lbl_80560174: - .4byte 0x80461A14 + .byte4 $$252846 .global $$252906 $$252906: .4byte 0xFFFFFFFF diff --git a/asm/src/Direction3.s b/asm/src/Direction3.s index 0a628864..795239f6 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 - .4byte 0x8019E454 ;# ptr + .byte4 __sinit_$$3Direction3_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255184 diff --git a/asm/src/DisableIcon.s b/asm/src/DisableIcon.s index 320c4ebb..e047582b 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 - .4byte 0x8019C354 ;# ptr + .byte4 __sinit_$$3DisableIcon_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250030 diff --git a/asm/src/DvdControl.s b/asm/src/DvdControl.s index f9fa0698..bf0dbd1b 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 - .4byte 0x801CE598 ;# ptr + .byte4 __sinit_$$3DvdControl_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249342 @@ -504,13 +504,13 @@ $$249343: .balign 4 .global dvdControlBlock dvdControlBlock: - .4byte 0x801CE11C ;# ptr - .4byte 0x801CE588 ;# ptr - .4byte 0x801CE280 ;# ptr - .4byte 0x801CE590 ;# ptr - .4byte 0x801CE44C ;# ptr - .4byte 0x801CE454 ;# ptr - .4byte 0x801CE2F0 ;# ptr + .byte4 Open__FPvPCv + .byte4 GetStatus__FPvPv + .byte4 Close__FPvPv + .byte4 GetSize__FPvPv + .byte4 Tell__FPvPv + .byte4 Seek__FPvPvUl + .byte4 Read__FPvPvPUcUl .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/DvdWatch_ENG.s b/asm/src/DvdWatch_ENG.s index 5fea8b8a..5899ce6a 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: - .4byte 0x80556B78 - .4byte 0x80452BC0 - .4byte 0x80452BC0 - .4byte 0x80452C04 - .4byte 0x80452C50 + .byte4 $$248836 + .byte4 $$248837 + .byte4 $$248837 + .byte4 $$248838 + .byte4 $$248839 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/src/EasyRender3D.s b/asm/src/EasyRender3D.s index 35c0f250..a8c05eaf 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 - .4byte 0x80195848 ;# ptr + .byte4 __sinit_$$3EasyRender3D_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251446 diff --git a/asm/src/EffectLocatorModelDesc.s b/asm/src/EffectLocatorModelDesc.s index d3dd55aa..a3a94e3e 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: - .4byte 0x8055C038 + .byte4 $$250122 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/Enemy.s b/asm/src/Enemy.s index 1cda36c8..91e0a35c 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 - .4byte 0x80288210 ;# ptr - .4byte 0x802881B4 ;# ptr + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common21StateMasterSummonWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common21StateMasterSummonWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x8028820C ;# ptr - .4byte 0x802881D0 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common22StateRoomGuarderAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common22StateRoomGuarderAppear$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80288208 ;# ptr - .4byte 0x802881EC ;# ptr + .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common22StateRoomGuarderAppear$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common22StateRoomGuarderAppear$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util42StateChanger$$0Q43scn4step5enemy6IState$$4256$$1 __vt__Q24util42StateChanger$$0Q43scn4step5enemy6IState$$4256$$1: .4byte 0 .4byte 0 - .4byte 0x80286DF4 ;# ptr + .byte4 __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 1ac21fda..aacb751f 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 - .4byte 0x80260CFC ;# ptr - .4byte 0x80260C78 ;# ptr + .byte4 __dt__Q24util133StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter13StateStraight$$4PQ43scn4step5enemy5Enemy$$4Q43scn4step4boss8Accessor$$1Fv + .byte4 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 - .4byte 0x80260CF8 ;# ptr - .4byte 0x80260C98 ;# ptr + .byte4 __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter11StateCircle$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv + .byte4 create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter11StateCircle$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter15StateBackCircle$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter15StateBackCircle$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80260CF4 ;# ptr - .4byte 0x80260CB8 ;# ptr + .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter15StateBackCircle$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter15StateBackCircle$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter10StateSlant$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter10StateSlant$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80260CF0 ;# ptr - .4byte 0x80260CD4 ;# ptr + .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter10StateSlant$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 a3018880..61a2921e 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 - .4byte 0x8023D5B0 ;# ptr - .4byte 0x8023D594 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateMasterSummon$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 bd674eec..13877043 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: - .4byte 0x80453990 - .4byte 0x804539A0 - .4byte 0x80556D38 - .4byte 0x80556D3C - .4byte 0x804539B0 - .4byte 0x804539C4 - .4byte 0x80556D40 - .4byte 0x804539D0 - .4byte 0x804539E0 - .4byte 0x804539EC - .4byte 0x80556D48 - .4byte 0x804539F8 - .4byte 0x80453A0C - .4byte 0x80453A18 - .4byte 0x80453A2C - .4byte 0x80453A40 - .4byte 0x804539D0 + .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 .global $$249260 $$249260: .asciz "******** EXCEPTION OCCURRED! ********\n" diff --git a/asm/src/ExplainButton.s b/asm/src/ExplainButton.s index 855d8ce1..a315a63a 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: - .4byte 0x804911C0 - .4byte 0x804911D0 - .4byte 0x804911E4 - .4byte 0x804911F4 - .4byte 0x80491204 - .4byte 0x80491218 - .4byte 0x80491230 - .4byte 0x80491244 - .4byte 0x80491258 - .4byte 0x8049126C - .4byte 0x80491284 - .4byte 0x8049129C + .byte4 $$251576 + .byte4 $$251577 + .byte4 $$251578 + .byte4 $$251579 + .byte4 $$251580 + .byte4 $$251581 + .byte4 $$251582 + .byte4 $$251583 + .byte4 $$251584 + .byte4 $$251585 + .byte4 $$251586 + .byte4 $$251587 .global $$251590 $$251590: .asciz "ParasolN" @@ -404,14 +404,14 @@ ButtonIconTbl__Q53scn4step4info5lvmap27$$2unnamed$$2ExplainButton_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055BAD8 - .4byte 0x804912E0 - .4byte 0x8055BAE0 - .4byte 0x8055BAE8 - .4byte 0x8055BAF0 - .4byte 0x804912EC - .4byte 0x8055BAF8 - .4byte 0x8055BB00 + .byte4 $$251589 + .byte4 $$251590 + .byte4 $$251591 + .byte4 $$251592 + .byte4 $$251593 + .byte4 $$251594 + .byte4 $$251595 + .byte4 $$251596 .global $$252410 $$252410: .asciz "ButtonActionBase" diff --git a/asm/src/ExplainConsole.s b/asm/src/ExplainConsole.s index 130ec454..6fbd3e8d 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: - .4byte 0x804913A8 + .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x804913A8 + .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x804913A8 + .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x8055BB38 + .byte4 bIdMaster__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000002 - .4byte 0x804913A8 + .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x804913A8 + .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x804913A8 + .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x8055BB38 + .byte4 bIdMaster__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000002 - .4byte 0x804913A8 + .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x804913A8 + .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x8055BB38 + .byte4 bIdMaster__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000002 - .4byte 0x8055BB38 + .byte4 bIdMaster__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000002 - .4byte 0x804913A8 + .byte4 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x804913D4 + .byte4 bIdTraining1__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x804913E0 + .byte4 bIdTraining2__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x8055BB40 + .byte4 bIdTraining3__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000002 .global cdDataTblG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 cdDataTblG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: - .4byte 0x804913B8 + .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .4byte 0x804913B8 + .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .4byte 0x804913B8 + .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .4byte 0x804913C8 + .byte4 bIdMasterG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x804913B8 + .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .4byte 0x804913B8 + .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .4byte 0x804913B8 + .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .4byte 0x804913C8 + .byte4 bIdMasterG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x804913B8 + .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .4byte 0x804913B8 + .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .4byte 0x804913C8 + .byte4 bIdMasterG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x804913C8 + .byte4 bIdMasterG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x804913B8 + .byte4 bIdChallengeG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000004 - .4byte 0x804913D4 + .byte4 bIdTraining1__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x804913E0 + .byte4 bIdTraining2__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 .4byte 0x00000003 - .4byte 0x8055BB40 + .byte4 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 538efa6a..fc69e8f6 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: - .4byte 0x804914A0 - .4byte 0x804914AC - .4byte 0x804914B8 - .4byte 0x8055BB70 - .4byte 0x8055BB70 - .4byte 0x804914C4 - .4byte 0x804914D4 - .4byte 0x804914E0 - .4byte 0x8055BB78 - .4byte 0x8055BB78 - .4byte 0x804914EC - .4byte 0x804914F8 - .4byte 0x80491504 - .4byte 0x8055BB80 - .4byte 0x8055BB80 - .4byte 0x80491510 - .4byte 0x80491520 - .4byte 0x8049152C - .4byte 0x8055BB88 - .4byte 0x8055BB88 - .4byte 0x80491538 - .4byte 0x80491544 - .4byte 0x80491550 - .4byte 0x8055BB90 - .4byte 0x8055BB90 - .4byte 0x8049155C - .4byte 0x8049156C - .4byte 0x80491578 - .4byte 0x8055BB98 - .4byte 0x8055BB98 - .4byte 0x80491584 - .4byte 0x80491590 - .4byte 0x8049159C - .4byte 0x8055BBA0 - .4byte 0x8055BBA0 - .4byte 0x80491510 - .4byte 0x80491520 - .4byte 0x804915A8 - .4byte 0x8055BBA8 - .4byte 0x8055BBA8 - .4byte 0x804915B4 - .4byte 0x804915C0 - .4byte 0x804915CC - .4byte 0x8055BBB0 - .4byte 0x8055BBB0 - .4byte 0x804915D8 - .4byte 0x804915E8 - .4byte 0x804915F4 - .4byte 0x8055BBB8 - .4byte 0x8055BBB8 - .4byte 0x80491510 - .4byte 0x80491520 - .4byte 0x80491600 - .4byte 0x8055BBC0 - .4byte 0x8055BBC0 - .4byte 0x80491510 - .4byte 0x80491520 - .4byte 0x8049160C - .4byte 0x8055BBC0 - .4byte 0x8055BBC8 - .4byte 0x804915B4 - .4byte 0x804915C0 - .4byte 0x804915CC - .4byte 0x8055BBB0 - .4byte 0x8055BBD0 - .4byte 0x80491618 - .4byte 0x80491628 - .4byte 0x80491638 - .4byte 0x80491648 - .4byte 0x80491648 - .4byte 0x80491618 - .4byte 0x80491628 - .4byte 0x80491654 - .4byte 0x80491664 - .4byte 0x80491664 - .4byte 0x80491618 - .4byte 0x80491628 - .4byte 0x80491670 - .4byte 0x80491680 - .4byte 0x80491680 + .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 .global explainPathTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2 explainPathTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2: - .4byte 0x8055BBD8 - .4byte 0x8055BBD8 - .4byte 0x8055BBD8 - .4byte 0x8055BBD8 - .4byte 0x8055BBD8 - .4byte 0x8055BBD8 - .4byte 0x8055BBDC - .4byte 0x8055BBD8 - .4byte 0x8055BBE4 - .4byte 0x8055BBE4 - .4byte 0x8055BBE4 - .4byte 0x8055BBE4 - .4byte 0x8055BBE4 - .4byte 0x8055BBE4 - .4byte 0x8055BBDC - .4byte 0x8055BBE4 - .4byte 0x8055BBE8 - .4byte 0x8055BBE8 - .4byte 0x8055BBE8 - .4byte 0x8055BBE8 - .4byte 0x8055BBDC - .4byte 0x8055BBE8 - .4byte 0x8055BBDC - .4byte 0x8055BBE8 - .4byte 0x8055BBE8 - .4byte 0x8055BBE8 - .4byte 0x8055BBDC - .4byte 0x8055BBD8 - .4byte 0x8055BBDC - .4byte 0x8055BBE4 - .4byte 0x8055BBDC - .4byte 0x8055BBE8 + .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 .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: - .4byte 0x804916A8 - .4byte 0x804916A8 - .4byte 0x804916B8 - .4byte 0x804916C8 - .4byte 0x804916D4 + .byte4 $$248808 + .byte4 $$248808 + .byte4 $$248809 + .byte4 $$248810 + .byte4 $$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: - .4byte 0x80491690 + .byte4 $$248807 diff --git a/asm/src/Explanation.s b/asm/src/Explanation.s index 07aeb27d..b8ca79ad 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 - .4byte 0x804957B0 + .byte4 $$251882 .4byte 0 .4byte 0x00000001 .4byte 0x0000000F - .4byte 0x804957C8 + .byte4 $$251883 .4byte 0 .4byte 0x00000002 .4byte 0x0000000F - .4byte 0x804957D8 + .byte4 $$251884 .4byte 0x00000001 .4byte 0x00000003 .4byte 0x0000000F - .4byte 0x8055C4F0 + .byte4 $$251885 .4byte 0x00000001 .4byte 0x00000003 .4byte 0x0000000F - .4byte 0x8055C4F8 + .byte4 $$251886 .4byte 0x00000001 .4byte 0x00000005 .4byte 0x0000000F - .4byte 0x8055C500 + .byte4 $$251887 .4byte 0x00000001 .4byte 0x00000004 .4byte 0x0000000F - .4byte 0x804957EC + .byte4 $$251888 .4byte 0x00000001 .4byte 0x00000005 .4byte 0x0000000F - .4byte 0x804957FC + .byte4 $$251889 .4byte 0x00000001 .4byte 0x00000006 .4byte 0x0000000F - .4byte 0x8055C508 + .byte4 $$251890 .global $$252218 $$252218: - .4byte 0x80495844 - .4byte 0x80495850 - .4byte 0x8049585C - .4byte 0x80495868 - .4byte 0x80495874 - .4byte 0x80495880 - .4byte 0x80495890 + .byte4 $$252211 + .byte4 $$252212 + .byte4 $$252213 + .byte4 $$252214 + .byte4 $$252215 + .byte4 $$252216 + .byte4 $$252217 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/src/FDGManager.s b/asm/src/FDGManager.s index 6cb8f613..feb00cbe 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: - .4byte 0x804537E0 + .byte4 $$249254 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/Fighter.s b/asm/src/Fighter.s index 845cef54..dace94da 100644 --- a/asm/src/Fighter.s +++ b/asm/src/Fighter.s @@ -515,27 +515,27 @@ $$256344: __vt__Q53scn4step4hero7fighter7Fighter: .4byte 0 .4byte 0 - .4byte 0x8039B508 - .4byte 0x8039B594 - .4byte 0x8032B7A0 - .4byte 0x8032B7A4 - .4byte 0x8032B7A8 - .4byte 0x8039B698 - .4byte 0x8032B7B0 - .4byte 0x8032B7B4 - .4byte 0x8032B7B8 - .4byte 0x8032B7BC - .4byte 0x8032B7C0 - .4byte 0x8032B7C4 - .4byte 0x8032B7C8 - .4byte 0x8032B7CC - .4byte 0x8032B7D0 - .4byte 0x8032B7D4 - .4byte 0x8032B7D8 - .4byte 0x8039B744 - .4byte 0x8032B7E0 - .4byte 0x8032B7E4 - .4byte 0x8032B7E8 + .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 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 @@ -548,8 +548,8 @@ $$249542: .asciz "HatBigM" .global $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc7FighterFv$$2names$$21 $$2LOCAL$$2HatModel__Q53scn4step4hero9modeldesc7FighterFv$$2names$$21: - .4byte 0x8055ADA8 - .4byte 0x8055ADB0 + .byte4 $$249541 + .byte4 $$249542 .global $$249857 $$249857: .asciz "LBand1S" diff --git a/asm/src/File.s b/asm/src/File.s index dbc514f5..f9647ed6 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: - .4byte 0x80557B00 - .4byte 0x80557B08 - .4byte 0x80557B10 - .4byte 0x80557B18 - .4byte 0x80557B20 - .4byte 0x80557B20 + .byte4 $$252042 + .byte4 $$252043 + .byte4 $$252044 + .byte4 $$252045 + .byte4 $$252046 + .byte4 $$252046 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252743 @@ -620,15 +620,15 @@ $$252898: __vt__Q33scn19challengefileselect4File: .4byte 0 .4byte 0 - .4byte 0x801E412C ;# ptr - .4byte 0x801E3D1C ;# ptr - .4byte 0x801E3D54 ;# ptr - .4byte 0x801E3D64 ;# ptr - .4byte 0x801E3D70 ;# ptr - .4byte 0x801E3D7C ;# ptr - .4byte 0x801E3D88 ;# ptr - .4byte 0x801E3D90 ;# ptr - .4byte 0x801E3E00 ;# ptr + .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 0 .4byte 0 .4byte 0 diff --git a/asm/src/FontKindUtil.s b/asm/src/FontKindUtil.s index 62ed2df0..caf3a4fb 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: - .4byte 0x80556D28 - .4byte 0x804537F0 - .4byte 0x80556D28 - .4byte 0x80453800 - .4byte 0x80556D28 - .4byte 0x80453814 - .4byte 0x80556D28 - .4byte 0x80453828 - .4byte 0x80556D28 - .4byte 0x80453840 - .4byte 0x80556D28 - .4byte 0x8045384C - .4byte 0x80556D28 - .4byte 0x80453860 - .4byte 0x80556D28 - .4byte 0x80453874 - .4byte 0x80556D28 - .4byte 0x80453888 + .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 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$248724 diff --git a/asm/src/FoodTableKindUtil.s b/asm/src/FoodTableKindUtil.s index c65568d6..9b5c268f 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 - .4byte 0x80420128 + .byte4 T_TABLE_STANDARD__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 .4byte 0x00000005 - .4byte 0x8042013C + .byte4 T_TABLE_LV1__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 .4byte 0x00000005 - .4byte 0x80420150 + .byte4 T_TABLE_LV2__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 .4byte 0x00000005 - .4byte 0x80420164 + .byte4 T_TABLE_LV3__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 .4byte 0x00000005 - .4byte 0x80420178 + .byte4 T_TABLE_LV4__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 .4byte 0x00000005 - .4byte 0x8042018C + .byte4 T_TABLE_LV5__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 .4byte 0x00000005 - .4byte 0x804201A0 + .byte4 T_TABLE_LV6__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 .4byte 0x00000005 - .4byte 0x804201B4 + .byte4 T_TABLE_LV7__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 diff --git a/asm/src/FramePanel.s b/asm/src/FramePanel.s index 99a99cb0..b67ed8f4 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: - .4byte 0x805576A0 + .byte4 $$251724 .global T_FIX_NODE__Q25pause24$$2unnamed$$2FramePanel_cpp$$2 T_FIX_NODE__Q25pause24$$2unnamed$$2FramePanel_cpp$$2: - .4byte 0x8045D4A8 + .byte4 $$251725 diff --git a/asm/src/G3DAutoReqAnimCallback.s b/asm/src/G3DAutoReqAnimCallback.s index fbc92a00..bb96076f 100644 --- a/asm/src/G3DAutoReqAnimCallback.s +++ b/asm/src/G3DAutoReqAnimCallback.s @@ -90,5 +90,5 @@ request__Q36effect6detail22G3DAutoReqAnimCallbackFRCQ23g3d18AutoReqAnimReqInfo: __vt__Q36effect6detail22G3DAutoReqAnimCallback: .4byte 0 .4byte 0 - .4byte 0x8017E9D0 ;# ptr - .4byte 0x801813B4 ;# ptr + .byte4 __dt__Q36effect6detail22G3DAutoReqAnimCallbackFv + .byte4 request__Q36effect6detail22G3DAutoReqAnimCallbackFRCQ23g3d18AutoReqAnimReqInfo diff --git a/asm/src/GearModel.s b/asm/src/GearModel.s index 7008e9f1..e42ab722 100644 --- a/asm/src/GearModel.s +++ b/asm/src/GearModel.s @@ -201,5 +201,5 @@ lbl_8019A88C: __vt__Q24gobj9GearModel: .4byte 0 .4byte 0 - .4byte 0x8019A750 ;# ptr - .4byte 0x8019A7C8 ;# ptr + .byte4 __dt__Q24gobj9GearModelFv + .byte4 g3dModel__Q24gobj9GearModelFv diff --git a/asm/src/GenerateFromObj.s b/asm/src/GenerateFromObj.s index da1ea57a..e29592c0 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 - .4byte 0x80420208 + .byte4 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 - .4byte 0x8042024C + .byte4 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 - .4byte 0x80420280 + .byte4 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 b8bbeb66..523a30f8 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 - .4byte 0x8030FB84 + .byte4 __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 af1bcb4a..aa335d10 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 - .4byte 0x8019F46C ;# ptr + .byte4 toVector3XOY__Q33hel4math7Vector2CFv .global $$254109 $$254109: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8019F45C ;# ptr + .byte4 toVector3__Q33hel4math7Vector2CFv .global $$254114 $$254114: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C1BB4 ;# ptr + .byte4 __dv__Q33hel4math7Vector2CFf .global $$254145 $$254145: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8019F3B4 ;# ptr + .byte4 __ml__Q33hel4math7Vector2CFf .global $$254153 $$254153: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801A01FC ;# ptr + .byte4 __mi__Q33hel4math7Vector2CFRCQ33hel4math7Vector2 .global $$254175 $$254175: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801A0590 ;# ptr + .byte4 __pl__Q33hel4math7Vector2CFRCQ33hel4math7Vector2 .global $$254187 $$254187: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8019F0F8 ;# ptr + .byte4 __adv__Q33hel4math7Vector2Ff .global $$254195 $$254195: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8019F000 ;# ptr + .byte4 __amu__Q33hel4math7Vector2Ff .global $$254200 $$254200: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8019F48C ;# ptr + .byte4 __ami__Q33hel4math7Vector2FRCQ33hel4math7Vector2 .global $$254208 $$254208: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8019F438 ;# ptr + .byte4 __apl__Q33hel4math7Vector2FRCQ33hel4math7Vector2 .global $$254213 $$254213: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801B8E30 ;# ptr + .byte4 isZero__Q33hel4math7Vector2CFv .global $$254239 $$254239: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801A08C0 ;# ptr + .byte4 isZeroStrict__Q33hel4math7Vector2CFv .global $$254244 $$254244: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801B58AC ;# ptr + .byte4 isZeroLoose__Q33hel4math7Vector2CFf .global $$254265 $$254265: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8019F3A8 ;# ptr + .byte4 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 38a7b1cf..2341a573 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 - .4byte 0x801C2990 ;# ptr + .byte4 getZY__Q33hel4math7Vector3CFv .global $$254702 $$254702: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C2A7C ;# ptr + .byte4 getZX__Q33hel4math7Vector3CFv .global $$254710 $$254710: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C2AD0 ;# ptr + .byte4 getYZ__Q33hel4math7Vector3CFv .global $$254718 $$254718: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C2B24 ;# ptr + .byte4 getYX__Q33hel4math7Vector3CFv .global $$254726 $$254726: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C2B78 ;# ptr + .byte4 getXZ__Q33hel4math7Vector3CFv .global $$254734 $$254734: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C2BCC ;# ptr + .byte4 getXY__Q33hel4math7Vector3CFv .global $$254742 $$254742: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C2C20 ;# ptr + .byte4 __dv__Q33hel4math7Vector3CFf .global $$254772 $$254772: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8017C568 ;# ptr + .byte4 __ml__Q33hel4math7Vector3CFf .global $$254782 $$254782: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8017C84C ;# ptr + .byte4 __mi__Q33hel4math7Vector3CFRCQ33hel4math7Vector3 .global $$254806 $$254806: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801954E0 ;# ptr + .byte4 __pl__Q33hel4math7Vector3CFRCQ33hel4math7Vector3 .global $$254820 $$254820: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8019F724 ;# ptr + .byte4 __adv__Q33hel4math7Vector3Ff .global $$254828 $$254828: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8019F730 ;# ptr + .byte4 __amu__Q33hel4math7Vector3Ff .global $$254833 $$254833: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8019FC88 ;# ptr + .byte4 __ami__Q33hel4math7Vector3FRCQ33hel4math7Vector3 .global $$254841 $$254841: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801829AC ;# ptr + .byte4 __apl__Q33hel4math7Vector3FRCQ33hel4math7Vector3 .global $$254846 $$254846: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8019E1BC ;# ptr + .byte4 isZero__Q33hel4math7Vector3CFv .global $$254875 $$254875: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8019F888 ;# ptr + .byte4 isZeroStrict__Q33hel4math7Vector3CFv .global $$254880 $$254880: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C326C ;# ptr + .byte4 isZeroLoose__Q33hel4math7Vector3CFf .global $$254904 $$254904: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C33B4 ;# ptr + .byte4 set__Q33hel4math7Vector3Ffff .asciz "Assertion failed.\n" .balign 4 .asciz "MintFuncProxy.hpp" diff --git a/asm/src/HIDErrorMenu.s b/asm/src/HIDErrorMenu.s index a9478e36..aade390a 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: - .4byte 0x80452D18 - .4byte 0x80452D18 - .4byte 0x80452D18 + .byte4 $$252181 + .byte4 $$252181 + .byte4 $$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: - .4byte 0x80452D18 - .4byte 0x80452D34 - .4byte 0x80452D54 + .byte4 $$252181 + .byte4 $$252182 + .byte4 $$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: - .4byte 0x80452D7C - .4byte 0x80452D7C - .4byte 0x80452D90 + .byte4 $$252184 + .byte4 $$252184 + .byte4 $$252185 .global $$254504 $$254504: .asciz "ErrorMenu" diff --git a/asm/src/HIDManager.s b/asm/src/HIDManager.s index c8a74bcd..091d8d35 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 - .4byte 0x801A3808 ;# ptr + .byte4 __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 2cf11e1e..a0b080ae 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: - .4byte 0x8055ADE0 + .byte4 $$248744 .4byte 0 - .4byte 0x80489A28 + .byte4 $$248745 .4byte 0 - .4byte 0x80489A40 + .byte4 $$248746 .4byte 0 - .4byte 0x80489A54 + .byte4 $$248747 .4byte 0 - .4byte 0x80489A68 + .byte4 $$248748 .4byte 0 - .4byte 0x80489A78 + .byte4 $$248749 .4byte 0 - .4byte 0x80489A8C + .byte4 $$248750 .4byte 0 - .4byte 0x80489AA0 + .byte4 $$248751 .4byte 0 - .4byte 0x80489AB4 + .byte4 $$248752 .4byte 0 - .4byte 0x80489AC8 + .byte4 $$248753 .4byte 0 - .4byte 0x80489AE0 + .byte4 $$248754 .4byte 0 - .4byte 0x80489AF0 + .byte4 $$248755 .4byte 0 - .4byte 0x80489AFC + .byte4 $$248756 .4byte 0 - .4byte 0x80489B08 + .byte4 $$248757 .4byte 0 - .4byte 0x80489B20 + .byte4 $$248758 .4byte 0 - .4byte 0x80489B30 + .byte4 $$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: - .4byte 0x8055ADD0 - .4byte 0x8055ADD8 - .4byte 0x80489A0C + .byte4 $$248735 + .byte4 $$248736 + .byte4 $$248737 .4byte 0 .global $$248745 $$248745: diff --git a/asm/src/HeapCompaction.s b/asm/src/HeapCompaction.s index af138d39..685ddf64 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 - .4byte 0x801BD720 ;# ptr - .4byte 0x801BDC58 ;# ptr - .4byte 0x801BDC60 ;# ptr - .4byte 0x801BDC64 ;# ptr - .4byte 0x801BDCB4 ;# ptr - .4byte 0x801BDCB8 ;# ptr - .4byte 0x801BDCBC ;# ptr - .4byte 0x801BDCC4 ;# ptr - .4byte 0x801BDCCC ;# ptr - .4byte 0x801BDD44 ;# ptr + .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 0 .4byte 0 - .4byte 0x801BE1F0 ;# ptr - .4byte 0x801BE1E8 ;# ptr - .4byte 0x801BE1E0 ;# ptr - .4byte 0x801BDD48 ;# ptr - .4byte 0x801BDD88 ;# ptr + .byte4 $$24$$2__dt__Q23mem14HeapCompactionFv + .byte4 $$24$$2allocatorAlloc__Q23mem14HeapCompactionFUll + .byte4 $$24$$2allocatorFree__Q23mem14HeapCompactionFPv + .byte4 allocatorAlloc__Q23mem14HeapCompactionFUll + .byte4 allocatorFree__Q23mem14HeapCompactionFPv .global __vt__Q33mem14HeapCompaction22AllocFromTailAllocator __vt__Q33mem14HeapCompaction22AllocFromTailAllocator: .4byte 0 .4byte 0 - .4byte 0x801BD6C4 ;# ptr - .4byte 0x801BE188 ;# ptr - .4byte 0x801BE1CC ;# ptr + .byte4 __dt__Q33mem14HeapCompaction22AllocFromTailAllocatorFv + .byte4 allocatorAlloc__Q33mem14HeapCompaction22AllocFromTailAllocatorFUll + .byte4 allocatorFree__Q33mem14HeapCompaction22AllocFromTailAllocatorFPv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249358 diff --git a/asm/src/HeapExp.s b/asm/src/HeapExp.s index aa3ee816..0a52487d 100644 --- a/asm/src/HeapExp.s +++ b/asm/src/HeapExp.s @@ -298,17 +298,17 @@ allocatorFree__Q33mem7HeapExp22AllocFromTailAllocatorFPv: __vt__Q23mem7HeapExp: .4byte 0 .4byte 0 - .4byte 0x801BE458 ;# ptr - .4byte 0x801BE5B4 ;# ptr - .4byte 0x801BE5B8 ;# ptr - .4byte 0x801BE5BC ;# ptr - .4byte 0x801BE5C0 ;# ptr - .4byte 0x801BE5D0 ;# ptr - .4byte 0x801BE5D4 ;# ptr + .byte4 __dt__Q23mem7HeapExpFv + .byte4 allocatorAlloc__Q23mem7HeapExpFUll + .byte4 allocatorFree__Q23mem7HeapExpFPv + .byte4 heapName__Q23mem7HeapExpCFv + .byte4 heapMemBlock__Q23mem7HeapExpCFv + .byte4 heapUsingBlockCount__Q23mem7HeapExpCFv + .byte4 heapDump__Q23mem7HeapExpCFv .global __vt__Q33mem7HeapExp22AllocFromTailAllocator __vt__Q33mem7HeapExp22AllocFromTailAllocator: .4byte 0 .4byte 0 - .4byte 0x801BE3A4 ;# ptr - .4byte 0x801BE62C ;# ptr - .4byte 0x801BE638 ;# ptr + .byte4 __dt__Q33mem7HeapExp22AllocFromTailAllocatorFv + .byte4 allocatorAlloc__Q33mem7HeapExp22AllocFromTailAllocatorFUll + .byte4 allocatorFree__Q33mem7HeapExp22AllocFromTailAllocatorFPv diff --git a/asm/src/HeapMapUserRepos.s b/asm/src/HeapMapUserRepos.s index d2d945e8..b9b9be61 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 - .4byte 0x801BEE48 ;# ptr + .byte4 __sinit_$$3HeapMapUserRepos_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$248741 diff --git a/asm/src/HeapUnit.s b/asm/src/HeapUnit.s index da8187fd..12e94479 100644 --- a/asm/src/HeapUnit.s +++ b/asm/src/HeapUnit.s @@ -246,11 +246,11 @@ heapDump__Q23mem8HeapUnitCFv: __vt__Q23mem8HeapUnit: .4byte 0 .4byte 0 - .4byte 0x801BF06C ;# ptr - .4byte 0x801BF190 ;# ptr - .4byte 0x801BF194 ;# ptr - .4byte 0x801BF198 ;# ptr - .4byte 0x801BF19C ;# ptr - .4byte 0x801BF1AC ;# ptr - .4byte 0x801BF1B0 ;# ptr + .byte4 __dt__Q23mem8HeapUnitFv + .byte4 allocatorAlloc__Q23mem8HeapUnitFUll + .byte4 allocatorFree__Q23mem8HeapUnitFPv + .byte4 heapName__Q23mem8HeapUnitCFv + .byte4 heapMemBlock__Q23mem8HeapUnitCFv + .byte4 heapUsingBlockCount__Q23mem8HeapUnitCFv + .byte4 heapDump__Q23mem8HeapUnitCFv .4byte 0 diff --git a/asm/src/Hero.s b/asm/src/Hero.s index 388ff969..f844d157 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 - .4byte 0x80340868 - .4byte 0x80340594 + .byte4 __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StatePiggyback$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .byte4 create__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StatePiggyback$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateAnyWhereIn$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateAnyWhereIn$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80340864 - .4byte 0x8034070C + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateAnyWhereIn$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 - .4byte 0x80340860 - .4byte 0x8034050C + .byte4 __dt__Q24util99StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick13StateWarpStar$$4PQ43scn4step4hero4Hero$$4b$$4i$$1Fv + .byte4 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 - .4byte 0x8034085C - .4byte 0x803405B4 + .byte4 __dt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick15StateWarpStarIn$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1Fv + .byte4 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 - .4byte 0x80340858 - .4byte 0x80340530 + .byte4 __dt__Q24util125StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateReturnWarpLowper$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4b$$1Fv + .byte4 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 - .4byte 0x80340854 - .4byte 0x80340614 + .byte4 __dt__Q24util121StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick19StateLeaveLvMapDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv + .byte4 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 - .4byte 0x80340850 - .4byte 0x80340670 + .byte4 __dt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateLeaveChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv + .byte4 create__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateLeaveChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChallengeIn$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChallengeIn$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8034084C - .4byte 0x80340728 + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChallengeIn$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChallengeIn$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateShipRepairDemo$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateShipRepairDemo$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80340848 - .4byte 0x80340744 + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateShipRepairDemo$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateShipRepairDemo$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common25StateShipRepairDemoFollow$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common25StateShipRepairDemoFollow$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80340844 - .4byte 0x80340760 + .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common25StateShipRepairDemoFollow$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common25StateShipRepairDemoFollow$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common24StateShipRepairDemoAfter$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common24StateShipRepairDemoAfter$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80340840 - .4byte 0x8034077C + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common24StateShipRepairDemoAfter$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common24StateShipRepairDemoAfter$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common30StateShipRepairDemoAfterFollow$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common30StateShipRepairDemoAfterFollow$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8034083C - .4byte 0x80340798 + .byte4 __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common30StateShipRepairDemoAfterFollow$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 - .4byte 0x80340838 - .4byte 0x80340690 + .byte4 __dt__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateLeaveSubgameDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv + .byte4 create__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateLeaveSubgameDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateFirstDemo$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateFirstDemo$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80340834 - .4byte 0x803407B4 + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateFirstDemo$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateFirstDemo$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateInit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateInit$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80340830 - .4byte 0x803407D0 + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateInit$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateInit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8034082C - .4byte 0x803407EC + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80340828 - .4byte 0x80340808 + .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 - .4byte 0x80340824 - .4byte 0x803406EC + .byte4 __dt__Q24util112StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv + .byte4 create__Q24util112StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv .global __vt__Q24util41StateChanger$$0Q43scn4step4hero6IState$$4256$$1 __vt__Q24util41StateChanger$$0Q43scn4step4hero6IState$$4256$$1: .4byte 0 .4byte 0 - .4byte 0x8033C7C8 + .byte4 __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 c1e7965b..5bc3b12f 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 - .4byte 0x803A9310 + .byte4 __sinit_$$3HeroPanelController_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252387 diff --git a/asm/src/HeroStatusIcon.s b/asm/src/HeroStatusIcon.s index 062ff545..30a9087c 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 - .4byte 0x8048F8D8 - .4byte 0x8048F8F8 - .4byte 0x8048F918 - .4byte 0x8048F934 - .4byte 0x8048F950 - .4byte 0x8048F96C - .4byte 0x8048F98C - .4byte 0x8048F9A8 - .4byte 0x8048F9C8 - .4byte 0x8048F9E8 - .4byte 0x8048FA08 - .4byte 0x8048FA28 - .4byte 0x8048FA48 - .4byte 0x8048FA68 - .4byte 0x8048FA88 - .4byte 0x8048FAA4 - .4byte 0x8048FAC4 - .4byte 0x8048FAE4 - .4byte 0x8048FB00 - .4byte 0x8048FB1C - .4byte 0x8048FB3C + .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 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: - .4byte 0x8048F8C8 + .byte4 $$251660 .global $$253023 $$253023: .asciz "IconN" diff --git a/asm/src/HidKindUtil.s b/asm/src/HidKindUtil.s index e7aa8b6a..a5e7366f 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 - .4byte 0x80484148 - .4byte 0x80484174 - .4byte 0x804841A0 - .4byte 0x804841CC - .4byte 0x804841F8 - .4byte 0x80484224 - .4byte 0x80484254 - .4byte 0x80484284 - .4byte 0x804842B4 - .4byte 0x804842E4 - .4byte 0x80484314 - .4byte 0x80484344 - .4byte 0x80484370 - .4byte 0x8048439C - .4byte 0x804843C8 - .4byte 0x804843F4 - .4byte 0x80484420 - .4byte 0x8048444C - .4byte 0x80484478 - .4byte 0x804844A4 - .4byte 0x804844D0 - .4byte 0x804844FC - .4byte 0x80484528 - .4byte 0x80484554 - .4byte 0x80484584 - .4byte 0x804845B0 - .4byte 0x804845DC - .4byte 0x80484608 - .4byte 0x80484634 - .4byte 0x80484660 - .4byte 0x8048468C - .4byte 0x804846B8 - .4byte 0x804846E4 - .4byte 0x80484710 - .4byte 0x8048473C - .4byte 0x80484768 - .4byte 0x80484794 - .4byte 0x804847C4 - .4byte 0x804847F4 - .4byte 0x80484824 - .4byte 0x80484854 - .4byte 0x80484884 - .4byte 0x804848B4 - .4byte 0x804848E4 - .4byte 0x80484914 - .4byte 0x80484944 - .4byte 0x80484974 - .4byte 0x804849A4 - .4byte 0x804849D4 - .4byte 0x80484A04 - .4byte 0x80484A34 - .4byte 0x80484A64 - .4byte 0x80484A94 - .4byte 0x80484AC4 - .4byte 0x80484AF4 - .4byte 0x80484B24 - .4byte 0x80484B54 + .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 diff --git a/asm/src/Hit.s b/asm/src/Hit.s index f24cae24..cb2fcb6b 100644 --- a/asm/src/Hit.s +++ b/asm/src/Hit.s @@ -712,5 +712,5 @@ sortResult__Q25ocoll3HitFv: __vt__Q25ocoll3Hit: .4byte 0 .4byte 0 - .4byte 0x801D6230 ;# ptr + .byte4 __dt__Q25ocoll3HitFv .4byte 0 diff --git a/asm/src/HitStopCallback.s b/asm/src/HitStopCallback.s index aaa41fd4..0a00914d 100644 --- a/asm/src/HitStopCallback.s +++ b/asm/src/HitStopCallback.s @@ -262,9 +262,9 @@ onEnd__Q43scn4step6weapon15HitStopCallbackFv: __vt__Q43scn4step4boss15HitStopCallback: .4byte 0 .4byte 0 - .4byte 0x80230AA8 ;# ptr - .4byte 0x80230B04 ;# ptr - .4byte 0x80230B74 ;# ptr + .byte4 __dt__Q43scn4step4boss15HitStopCallbackFv + .byte4 onStart__Q43scn4step4boss15HitStopCallbackFv + .byte4 onEnd__Q43scn4step4boss15HitStopCallbackFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -272,9 +272,9 @@ __vt__Q43scn4step4boss15HitStopCallback: __vt__Q43scn4step5enemy15HitStopCallback: .4byte 0 .4byte 0 - .4byte 0x80288A34 ;# ptr - .4byte 0x80288A38 ;# ptr - .4byte 0x80288A78 ;# ptr + .byte4 __dt__Q43scn4step5enemy15HitStopCallbackFv + .byte4 onStart__Q43scn4step5enemy15HitStopCallbackFv + .byte4 onEnd__Q43scn4step5enemy15HitStopCallbackFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -282,9 +282,9 @@ __vt__Q43scn4step5enemy15HitStopCallback: __vt__Q43scn4step4hero15HitStopCallback: .4byte 0 .4byte 0 - .4byte 0x80340EE4 - .4byte 0x80340EE8 - .4byte 0x80340F34 + .byte4 __dt__Q43scn4step4hero15HitStopCallbackFv + .byte4 onStart__Q43scn4step4hero15HitStopCallbackFv + .byte4 onEnd__Q43scn4step4hero15HitStopCallbackFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -292,7 +292,7 @@ __vt__Q43scn4step4hero15HitStopCallback: __vt__Q43scn4step6weapon15HitStopCallback: .4byte 0 .4byte 0 - .4byte 0x803D64E0 - .4byte 0x803D64E4 - .4byte 0x803D6524 + .byte4 __dt__Q43scn4step6weapon15HitStopCallbackFv + .byte4 onStart__Q43scn4step6weapon15HitStopCallbackFv + .byte4 onEnd__Q43scn4step6weapon15HitStopCallbackFv .4byte 0 diff --git a/asm/src/InactiveHero.s b/asm/src/InactiveHero.s index 97e5a60c..d0f33bc7 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 - .4byte 0x80341814 - .4byte 0x803417F4 + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8inactive9StateInit$$4PQ43scn4step4hero12InactiveHero$$1Fv + .byte4 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 - .4byte 0x80341810 - .4byte 0x803417D4 + .byte4 __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero8inactive11StateSelect$$4PQ43scn4step4hero12InactiveHero$$4b$$1Fv + .byte4 create__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero8inactive11StateSelect$$4PQ43scn4step4hero12InactiveHero$$4b$$1Fv .global __vt__Q24util50StateChanger$$0Q43scn4step4hero14IInactiveState$$4256$$1 __vt__Q24util50StateChanger$$0Q43scn4step4hero14IInactiveState$$4256$$1: .4byte 0 .4byte 0 - .4byte 0x803412AC + .byte4 __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 d3205dcf..63a485ab 100644 --- a/asm/src/InactiveStateBase.s +++ b/asm/src/InactiveStateBase.s @@ -45,5 +45,5 @@ lbl_80341870: __vt__Q43scn4step4hero17InactiveStateBase: .4byte 0 .4byte 0 - .4byte 0x80341830 - .4byte 0x8034182C + .byte4 __dt__Q43scn4step4hero17InactiveStateBaseFv + .byte4 proc__Q43scn4step4hero17InactiveStateBaseFv diff --git a/asm/src/InactiveStateCallback.s b/asm/src/InactiveStateCallback.s index b7e1c756..69ee0aa9 100644 --- a/asm/src/InactiveStateCallback.s +++ b/asm/src/InactiveStateCallback.s @@ -18,5 +18,5 @@ onStateChanged__Q43scn4step4hero21InactiveStateCallbackFRCQ24util13IStateChanger __vt__Q43scn4step4hero21InactiveStateCallback: .4byte 0 .4byte 0 - .4byte 0x803412A8 - .4byte 0x803418A0 + .byte4 __dt__Q43scn4step4hero21InactiveStateCallbackFv + .byte4 onStateChanged__Q43scn4step4hero21InactiveStateCallbackFRCQ24util13IStateChanger diff --git a/asm/src/IndiviUtil.s b/asm/src/IndiviUtil.s index 45938465..70b096ab 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 - .4byte 0x80288B18 ;# ptr + .byte4 __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: - .4byte 0x803DC230 + .byte4 Create__Q53scn4step6weapon11starshotlv19ModelDescFv .4byte 0 - .4byte 0x803DCAA8 + .byte4 Create__Q53scn4step6weapon11starshotlv29ModelDescFv .4byte 0 - .4byte 0x803DD184 + .byte4 Create__Q53scn4step6weapon11starshotlv39ModelDescFv .4byte 0 - .4byte 0x803DB1B8 + .byte4 Create__Q53scn4step6weapon7airball9ModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803DE400 - .4byte 0x803DE534 - .4byte 0x803E2278 + .byte4 Create__Q53scn4step6weapon13whispyairball9ModelDescFv + .byte4 CreateEx__Q53scn4step6weapon13whispyairball9ModelDescFv + .byte4 Create__Q53scn4step6weapon10comothread9ModelDescFv .4byte 0 - .4byte 0x803E77F4 + .byte4 Create__Q53scn4step6weapon15sirkibblecutter9ModelDescFv .4byte 0 - .4byte 0x803E7290 + .byte4 Create__Q53scn4step6weapon12shotzobullet9ModelDescFv .4byte 0 - .4byte 0x803DF078 + .byte4 Create__Q53scn4step6weapon12leafanpollen9ModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803E3F64 + .byte4 Create__Q53scn4step6weapon10spearspear9ModelDescFv .4byte 0 - .4byte 0x803E5350 + .byte4 Create__Q53scn4step6weapon12hammerhammer9ModelDescFv .4byte 0 - .4byte 0x803E5AF4 + .byte4 Create__Q53scn4step6weapon8wingshot9ModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803E2A0C + .byte4 Create__Q53scn4step6weapon16enemywaterbullet9ModelDescFv .4byte 0 - .4byte 0x803E3668 + .byte4 Create__Q53scn4step6weapon20enemywaterbulletwarp9ModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803E02B8 + .byte4 Create__Q53scn4step6weapon13gigatzobullet9ModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803E8040 + .byte4 Create__Q53scn4step6weapon13owgulffeather9ModelDescFv .4byte 0 - .4byte 0x803E84A4 + .byte4 Create__Q53scn4step6weapon9foleyleaf9ModelDescFv .4byte 0 - .4byte 0x803E87F4 + .byte4 Create__Q53scn4step6weapon10bowbyarrow9ModelDescFv .4byte 0 - .4byte 0x803E9494 + .byte4 Create__Q53scn4step6weapon12jucklecutter9ModelDescFv .4byte 0 - .4byte 0x803E98C8 + .byte4 Create__Q53scn4step6weapon17tsukikageshuriken9ModelDescFv .4byte 0 - .4byte 0x803E0378 + .byte4 CreateVolt__Q53scn4step6weapon13gigatzobullet9ModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803E0438 + .byte4 CreateCold__Q53scn4step6weapon13gigatzobullet9ModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803EA768 + .byte4 Create__Q53scn4step6weapon10whispyroot9ModelDescFv .4byte 0 - .4byte 0x803EACAC + .byte4 Create__Q53scn4step6weapon18combinationairball9ModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803EBE30 + .byte4 Create__Q53scn4step6weapon18combinationdeeshot9ModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803EC79C + .byte4 Create__Q53scn4step6weapon12dededehammer9ModelDescFv .4byte 0 - .4byte 0x803ECF88 + .byte4 Create__Q53scn4step6weapon8deespear9ModelDescFv .4byte 0 - .4byte 0x803EE568 + .byte4 CreateStar__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .4byte 0x803EE628 + .byte4 CreateHeavy1x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .4byte 0x803EE6E8 + .byte4 CreateHeavy2x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .4byte 0x803EE7A8 + .byte4 CreateHeavy3x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .4byte 0x803EE868 + .byte4 CreateHeavy4x4__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .4byte 0x803EE928 + .byte4 CreateHeavyA1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .4byte 0x803EE9E8 + .byte4 CreateHeavyB1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .4byte 0x803EEAA8 + .byte4 CreateHeavy1x2x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .4byte 0x803EEB68 + .byte4 CreateHeavy1x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .4byte 0x803EEC28 + .byte4 CreateHeavy3x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .4byte 0x803EECE8 + .byte4 CreateHeavy2x4x4x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .4byte 0x803EEDA8 + .byte4 CreateHeavy3x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv .4byte 0 - .4byte 0x803E88B4 + .byte4 CreateHalcan__Q53scn4step6weapon10bowbyarrow9ModelDescFv .4byte 0 - .4byte 0x803EF5EC + .byte4 Create__Q53scn4step6weapon11hotheadfire9ModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 Create__Q43scn4step6weapon22EffectLocatorModelDescFv .4byte 0 - .4byte 0x803D6350 + .byte4 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: - .4byte 0x802E16E4 ;# ptr - .4byte 0x802E12DC ;# ptr + .byte4 Create__Q53scn4step5enemy9sirkibble9ModelDescFv + .byte4 Create__Q53scn4step5enemy9sirkibble10CharaParamFv .4byte 0 - .4byte 0x8029F364 ;# ptr - .4byte 0x8029F2DC ;# ptr + .byte4 Create__Q53scn4step5enemy10brontoburt9ModelDescFv + .byte4 Create__Q53scn4step5enemy10brontoburt10CharaParamFv .4byte 0 - .4byte 0x802ED6F4 ;# ptr - .4byte 0x802ED670 ;# ptr + .byte4 Create__Q53scn4step5enemy9waddledee9ModelDescFv + .byte4 Create__Q53scn4step5enemy9waddledee10CharaParamFv .4byte 0 - .4byte 0x802972CC ;# ptr - .4byte 0x80296F2C ;# ptr + .byte4 CreateNormal__Q53scn4step5enemy11bladeknight9ModelDescFv + .byte4 Create__Q53scn4step5enemy11bladeknight10CharaParamFv .4byte 0 - .4byte 0x802A2DA4 ;# ptr - .4byte 0x802A2704 ;# ptr + .byte4 Create__Q53scn4step5enemy5cappy9ModelDescFv + .byte4 Create__Q53scn4step5enemy5cappy10CharaParamFv .4byte 0 - .4byte 0x802BA66C ;# ptr - .4byte 0x802BA260 ;# ptr + .byte4 CreateNormal__Q53scn4step5enemy7hothead9ModelDescFv + .byte4 Create__Q53scn4step5enemy7hothead10CharaParamFv .4byte 0 - .4byte 0x802BF8C0 ;# ptr - .4byte 0x802BF2C8 ;# ptr + .byte4 Create__Q53scn4step5enemy10knucklejoe9ModelDescFv + .byte4 Create__Q53scn4step5enemy10knucklejoe10CharaParamFv .4byte 0 - .4byte 0x802D3318 ;# ptr - .4byte 0x802D3198 ;# ptr + .byte4 Create__Q53scn4step5enemy9puppetdee9ModelDescFv + .byte4 Create__Q53scn4step5enemy9puppetdee10CharaParamFv .4byte 0 - .4byte 0x8029662C ;# ptr - .4byte 0x8029638C ;# ptr + .byte4 Create__Q53scn4step5enemy8armordee9ModelDescFv + .byte4 Create__Q53scn4step5enemy8armordee10CharaParamFv .4byte 0 - .4byte 0x802A7470 ;# ptr - .4byte 0x802A7238 ;# ptr + .byte4 Create__Q53scn4step5enemy4como9ModelDescFv + .byte4 Create__Q53scn4step5enemy4como10CharaParamFv .4byte 0 - .4byte 0x802B9058 ;# ptr - .4byte 0x802B8D28 ;# ptr + .byte4 Create__Q53scn4step5enemy5gordo9ModelDescFv + .byte4 Create__Q53scn4step5enemy5gordo10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x802F0804 ;# ptr - .4byte 0x802F077C ;# ptr + .byte4 Create__Q53scn4step5enemy6whippy9ModelDescFv + .byte4 Create__Q53scn4step5enemy6whippy10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x802E0740 ;# ptr - .4byte 0x802E01E0 ;# ptr + .byte4 Create__Q53scn4step5enemy6shotzo9ModelDescFv + .byte4 Create__Q53scn4step5enemy6shotzo10CharaParamFv .4byte 0 - .4byte 0x802C3564 ;# ptr - .4byte 0x802C34E4 ;# ptr + .byte4 Create__Q53scn4step5enemy6leafan9ModelDescFv + .byte4 Create__Q53scn4step5enemy6leafan10CharaParamFv .4byte 0 - .4byte 0x802EFB34 ;# ptr - .4byte 0x802EFA68 ;# ptr + .byte4 CreateNormal__Q53scn4step5enemy9waddledoo9ModelDescFv + .byte4 Create__Q53scn4step5enemy9waddledoo10CharaParamFv .4byte 0 - .4byte 0x8029D1D4 ;# ptr - .4byte 0x8029D098 ;# ptr + .byte4 Create__Q53scn4step5enemy6bouncy9ModelDescFv + .byte4 Create__Q53scn4step5enemy6bouncy10CharaParamFv .4byte 0 - .4byte 0x802E6E78 ;# ptr - .4byte 0x802E6CB8 ;# ptr + .byte4 Create__Q53scn4step5enemy6sparky9ModelDescFv + .byte4 Create__Q53scn4step5enemy6sparky10CharaParamFv .4byte 0 - .4byte 0x802C6204 ;# ptr - .4byte 0x802C5D1C ;# ptr + .byte4 Create__Q53scn4step5enemy8needlous9ModelDescFv + .byte4 Create__Q53scn4step5enemy8needlous10CharaParamFv .4byte 0 - .4byte 0x802A0EE8 ;# ptr - .4byte 0x802A0E60 ;# ptr + .byte4 Create__Q53scn4step5enemy11broomhatter9ModelDescFv + .byte4 Create__Q53scn4step5enemy11broomhatter10CharaParamFv .4byte 0 - .4byte 0x802D9D58 ;# ptr - .4byte 0x802D9A00 ;# ptr + .byte4 Create__Q53scn4step5enemy6scarfy9ModelDescFv + .byte4 Create__Q53scn4step5enemy6scarfy10CharaParamFv .4byte 0 - .4byte 0x802C7E00 ;# ptr - .4byte 0x802C7A68 ;# ptr + .byte4 Create__Q53scn4step5enemy5nruff9ModelDescFv + .byte4 Create__Q53scn4step5enemy5nruff10CharaParamFv .4byte 0 - .4byte 0x802B22D8 ;# ptr - .4byte 0x802B2168 ;# ptr + .byte4 Create__Q53scn4step5enemy6flamer9ModelDescFv + .byte4 Create__Q53scn4step5enemy6flamer10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x802F01BC ;# ptr - .4byte 0x802F0134 ;# ptr + .byte4 Create__Q53scn4step5enemy10watergalbo9ModelDescFv + .byte4 Create__Q53scn4step5enemy10watergalbo10CharaParamFv .4byte 0 - .4byte 0x802D3A88 ;# ptr - .4byte 0x802D3928 ;# ptr + .byte4 Create__Q53scn4step5enemy5rocky9ModelDescFv + .byte4 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 - .4byte 0x802D1D28 ;# ptr - .4byte 0x802D167C ;# ptr + .byte4 Create__Q53scn4step5enemy10poppybrojr9ModelDescFv + .byte4 Create__Q53scn4step5enemy10poppybrojr10CharaParamFv .4byte 0 - .4byte 0x802C732C ;# ptr - .4byte 0x802C72B0 ;# ptr + .byte4 Create__Q53scn4step5enemy5noddy9ModelDescFv + .byte4 Create__Q53scn4step5enemy5noddy10CharaParamFv .4byte 0 - .4byte 0x802A5580 ;# ptr - .4byte 0x802A54F8 ;# ptr + .byte4 Create__Q53scn4step5enemy8cerulean9ModelDescFv + .byte4 Create__Q53scn4step5enemy8cerulean10CharaParamFv .4byte 0 - .4byte 0x80299398 ;# ptr - .4byte 0x80298E8C ;# ptr + .byte4 Create__Q53scn4step5enemy7blipper9ModelDescFv + .byte4 Create__Q53scn4step5enemy7blipper10CharaParamFv .4byte 0 - .4byte 0x802B76B8 ;# ptr - .4byte 0x802B6AA8 ;# ptr + .byte4 Create__Q53scn4step5enemy7gigatzo9ModelDescFv + .byte4 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 - .4byte 0x802E2AF4 ;# ptr - .4byte 0x802E2890 ;# ptr + .byte4 Create__Q53scn4step5enemy11sisterbound9ModelDescFv + .byte4 Create__Q53scn4step5enemy11sisterbound10CharaParamFv .4byte 0 - .4byte 0x802D662C ;# ptr - .4byte 0x802D6170 ;# ptr + .byte4 Create__Q53scn4step5enemy8rollball9ModelDescFv + .byte4 Create__Q53scn4step5enemy8rollball10CharaParamFv .4byte 0 - .4byte 0x802C5000 ;# ptr - .4byte 0x802C4DB4 ;# ptr + .byte4 Create__Q53scn4step5enemy7mumbies9ModelDescFv + .byte4 Create__Q53scn4step5enemy7mumbies10CharaParamFv .4byte 0 - .4byte 0x802ED6F4 ;# ptr - .4byte 0x802CBA74 ;# ptr + .byte4 Create__Q53scn4step5enemy9waddledee9ModelDescFv + .byte4 Create__Q53scn4step5enemy10parasoldee10CharaParamFv .4byte 0 - .4byte 0x802BCDC8 ;# ptr - .4byte 0x802BCBEC ;# ptr + .byte4 Create__Q53scn4step5enemy4kabu9ModelDescFv + .byte4 Create__Q53scn4step5enemy4kabu10CharaParamFv .4byte 0 - .4byte 0x802EFB34 ;# ptr - .4byte 0x802CDBA0 ;# ptr + .byte4 CreateNormal__Q53scn4step5enemy9waddledoo9ModelDescFv + .byte4 Create__Q53scn4step5enemy10parasoldoo10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x802B49C8 ;# ptr - .4byte 0x802B449C ;# ptr + .byte4 Create__Q53scn4step5enemy5foley9ModelDescFv + .byte4 Create__Q53scn4step5enemy5foley10CharaParamFv .4byte 0 - .4byte 0x802BB7A0 ;# ptr - .4byte 0x802BB270 ;# ptr + .byte4 Create__Q53scn4step5enemy6juckle9ModelDescFv + .byte4 Create__Q53scn4step5enemy6juckle10CharaParamFv .4byte 0 - .4byte 0x8029E788 ;# ptr - .4byte 0x8029E30C ;# ptr + .byte4 Create__Q53scn4step5enemy5bowby9ModelDescFv + .byte4 Create__Q53scn4step5enemy5bowby10CharaParamFv .4byte 0 - .4byte 0x802C9F18 ;# ptr - .4byte 0x802C9D68 ;# ptr + .byte4 Create__Q53scn4step5enemy6owgulf9ModelDescFv + .byte4 Create__Q53scn4step5enemy6owgulf10CharaParamFv .4byte 0 - .4byte 0x802AD344 ;# ptr - .4byte 0x802AD218 ;# ptr + .byte4 Create__Q53scn4step5enemy6degout9ModelDescFv + .byte4 Create__Q53scn4step5enemy6degout10CharaParamFv .4byte 0 - .4byte 0x802DD8F8 ;# ptr - .4byte 0x802DCE78 ;# ptr + .byte4 Create__Q53scn4step5enemy5sheld9ModelDescFv + .byte4 Create__Q53scn4step5enemy5sheld10CharaParamFv .4byte 0 - .4byte 0x802C2188 ;# ptr - .4byte 0x802C1EE4 ;# ptr + .byte4 Create__Q53scn4step5enemy6lanzer9ModelDescFv + .byte4 Create__Q53scn4step5enemy6lanzer10CharaParamFv .4byte 0 - .4byte 0x802A62E4 ;# ptr - .4byte 0x802A61E4 ;# ptr + .byte4 CreateNormal__Q53scn4step5enemy6chilly9ModelDescFv + .byte4 Create__Q53scn4step5enemy6chilly10CharaParamFv .4byte 0 - .4byte 0x802EAFFC ;# ptr - .4byte 0x802EA6F8 ;# ptr + .byte4 Create__Q53scn4step5enemy9tsukikage9ModelDescFv + .byte4 Create__Q53scn4step5enemy9tsukikage10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x802B61AC ;# ptr - .4byte 0x802B5840 ;# ptr + .byte4 Create__Q53scn4step5enemy5gemra9ModelDescFv + .byte4 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 - .4byte 0x802B7768 ;# ptr - .4byte 0x802B6AA8 ;# ptr + .byte4 CreateVolt__Q53scn4step5enemy7gigatzo9ModelDescFv + .byte4 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 - .4byte 0x802CFB3C ;# ptr - .4byte 0x802CF890 ;# ptr + .byte4 Create__Q53scn4step5enemy6pierce9ModelDescFv + .byte4 Create__Q53scn4step5enemy6pierce10CharaParamFv .4byte 0 - .4byte 0x802DBDF0 ;# ptr - .4byte 0x802DBB80 ;# ptr + .byte4 Create__Q53scn4step5enemy8searches9ModelDescFv + .byte4 Create__Q53scn4step5enemy8searches10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x802AFC40 ;# ptr - .4byte 0x802AFA00 ;# ptr + .byte4 Create__Q53scn4step5enemy4elec9ModelDescFv + .byte4 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 - .4byte 0x802E53D0 ;# ptr - .4byte 0x802E4C3C ;# ptr + .byte4 Create__Q53scn4step5enemy6sodory9ModelDescFv + .byte4 Create__Q53scn4step5enemy6sodory10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x802E3840 ;# ptr - .4byte 0x802E36A4 ;# ptr + .byte4 Create__Q53scn4step5enemy5snowl9ModelDescFv + .byte4 Create__Q53scn4step5enemy5snowl10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x802ED7AC ;# ptr - .4byte 0x802ED670 ;# ptr + .byte4 HalcandledeeCreate__Q53scn4step5enemy9waddledee9ModelDescFv + .byte4 Create__Q53scn4step5enemy9waddledee10CharaParamFv .4byte 0 - .4byte 0x802B7818 ;# ptr - .4byte 0x802B6AA8 ;# ptr + .byte4 CreateCold__Q53scn4step5enemy7gigatzo9ModelDescFv + .byte4 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 - .4byte 0x802ED6F4 ;# ptr - .4byte 0x802E9CD4 ;# ptr + .byte4 Create__Q53scn4step5enemy9waddledee9ModelDescFv + .byte4 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 - .4byte 0x8029F414 ;# ptr - .4byte 0x8029F2DC ;# ptr + .byte4 HalcandleCreate__Q53scn4step5enemy10brontoburt9ModelDescFv + .byte4 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 - .4byte 0x802D9188 ;# ptr - .4byte 0x802D87F8 ;# ptr + .byte4 Create__Q53scn4step5enemy7sandbag9ModelDescFv + .byte4 Create__Q53scn4step5enemy7sandbag10CharaParamFv .4byte 0 - .4byte 0x802ED7AC ;# ptr - .4byte 0x802CBA74 ;# ptr + .byte4 HalcandledeeCreate__Q53scn4step5enemy9waddledee9ModelDescFv + .byte4 Create__Q53scn4step5enemy10parasoldee10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8029E838 ;# ptr - .4byte 0x8029E30C ;# ptr + .byte4 HalcandleCreate__Q53scn4step5enemy5bowby9ModelDescFv + .byte4 Create__Q53scn4step5enemy5bowby10CharaParamFv .4byte 0 - .4byte 0x802E8C44 ;# ptr - .4byte 0x802E87B4 ;# ptr + .byte4 Create__Q53scn4step5enemy3sun9ModelDescFv + .byte4 Create__Q53scn4step5enemy3sun10CharaParamFv .4byte 0 - .4byte 0x802E8C44 ;# ptr - .4byte 0x802E87B4 ;# ptr + .byte4 Create__Q53scn4step5enemy3sun9ModelDescFv + .byte4 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 - .4byte 0x802D66DC ;# ptr - .4byte 0x802D6170 ;# ptr + .byte4 CreateMaster__Q53scn4step5enemy8rollball9ModelDescFv + .byte4 Create__Q53scn4step5enemy8rollball10CharaParamFv .4byte 0 - .4byte 0x802ED864 ;# ptr - .4byte 0x802ED674 ;# ptr + .byte4 GoldCreate__Q53scn4step5enemy9waddledee9ModelDescFv + .byte4 CreateGold__Q53scn4step5enemy9waddledee10CharaParamFv .4byte 0 - .4byte 0x802E7E84 ;# ptr - .4byte 0x802E79A8 ;# ptr + .byte4 Create__Q53scn4step5enemy10stareffect9ModelDescFv + .byte4 Create__Q53scn4step5enemy10stareffect10CharaParamFv .4byte 0 - .4byte 0x802A3D14 ;# ptr - .4byte 0x802A3918 ;# ptr + .byte4 Create__Q53scn4step5enemy8cappyhat9ModelDescFv + .byte4 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 - .4byte 0x802F10A8 ;# ptr - .4byte 0x802F0C94 ;# ptr + .byte4 Create__Q53scn4step5enemy11whispyapple9ModelDescFv + .byte4 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 - .4byte 0x802CB104 ;# ptr - .4byte 0x802CAAF8 ;# ptr + .byte4 Create__Q53scn4step5enemy7parasol9ModelDescFv + .byte4 Create__Q53scn4step5enemy7parasol10CharaParamFv .4byte 0 - .4byte 0x802AE194 ;# ptr - .4byte 0x802ADFB8 ;# ptr - .4byte 0x802AE2A0 ;# ptr - .4byte 0x802D2C0C ;# ptr - .4byte 0x802D2830 ;# ptr + .byte4 Create__Q53scn4step5enemy8dubiorjr9ModelDescFv + .byte4 Create__Q53scn4step5enemy8dubiorjr10CharaParamFv + .byte4 CreateEx__Q53scn4step5enemy8dubiorjr9ModelDescFv + .byte4 Create__Q53scn4step5enemy14poppybrojrbomb9ModelDescFv + .byte4 Create__Q53scn4step5enemy14poppybrojrbomb10CharaParamFv .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x802F2570 ;# ptr - .4byte 0x802F22D4 ;# ptr + .byte4 Create__Q53scn4step5enemy15zankibblecutter9ModelDescFv + .byte4 Create__Q53scn4step5enemy15zankibblecutter10CharaParamFv .4byte 0 - .4byte 0x8029C0E0 ;# ptr - .4byte 0x8029BB80 ;# ptr + .byte4 Create__Q53scn4step5enemy11bonkersbomb9ModelDescFv + .byte4 Create__Q53scn4step5enemy11bonkersbomb10CharaParamFv .4byte 0 - .4byte 0x802AEE80 ;# ptr - .4byte 0x802AEC08 ;# ptr + .byte4 Create__Q53scn4step5enemy11dubiorspark9ModelDescFv + .byte4 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 - .4byte 0x802C4698 ;# ptr - .4byte 0x802C4154 ;# ptr + .byte4 Create__Q53scn4step5enemy9mbossdead9ModelDescFv + .byte4 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 - .4byte 0x802A2DA4 ;# ptr - .4byte 0x802A27B0 ;# ptr + .byte4 Create__Q53scn4step5enemy5cappy9ModelDescFv + .byte4 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: - .4byte 0x802ED6F4 ;# ptr + .byte4 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: - .4byte 0x8029174C ;# ptr + .byte4 Create__Q53scn4step5enemy6common9ParamBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252509 diff --git a/asm/src/InfoGameStatus.s b/asm/src/InfoGameStatus.s index b08bd40b..3f28619a 100644 --- a/asm/src/InfoGameStatus.s +++ b/asm/src/InfoGameStatus.s @@ -1250,7 +1250,7 @@ $$254566: $$254817: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803AC804 + .byte4 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 efdec37a..fc1e7ee1 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 - .4byte 0x803C3970 - .4byte 0x803C3890 + .byte4 __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateFall$$4PQ43scn4step4item4Item$$1Fv + .byte4 create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateFall$$4PQ43scn4step4item4Item$$1Fv .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateBound$$4PQ43scn4step4item4Item$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateBound$$4PQ43scn4step4item4Item$$1: .4byte 0 .4byte 0 - .4byte 0x803C396C - .4byte 0x803C38AC + .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateBound$$4PQ43scn4step4item4Item$$1Fv + .byte4 create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateBound$$4PQ43scn4step4item4Item$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state17StateFallFeathery$$4PQ43scn4step4item4Item$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state17StateFallFeathery$$4PQ43scn4step4item4Item$$1: .4byte 0 .4byte 0 - .4byte 0x803C3968 - .4byte 0x803C38C8 + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state17StateFallFeathery$$4PQ43scn4step4item4Item$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state17StateFallFeathery$$4PQ43scn4step4item4Item$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state19StatePreciousAppear$$4PQ43scn4step4item4Item$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state19StatePreciousAppear$$4PQ43scn4step4item4Item$$1: .4byte 0 .4byte 0 - .4byte 0x803C3964 - .4byte 0x803C38E4 + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state19StatePreciousAppear$$4PQ43scn4step4item4Item$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state19StatePreciousAppear$$4PQ43scn4step4item4Item$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state13StateApproach$$4PQ43scn4step4item4Item$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state13StateApproach$$4PQ43scn4step4item4Item$$1: .4byte 0 .4byte 0 - .4byte 0x803C3960 - .4byte 0x803C3900 + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state13StateApproach$$4PQ43scn4step4item4Item$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state13StateApproach$$4PQ43scn4step4item4Item$$1Fv .global __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateRoah$$4PQ43scn4step4item4Item$$1 __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateRoah$$4PQ43scn4step4item4Item$$1: .4byte 0 .4byte 0 - .4byte 0x803C395C - .4byte 0x803C391C + .byte4 __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateRoah$$4PQ43scn4step4item4Item$$1Fv + .byte4 create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateRoah$$4PQ43scn4step4item4Item$$1Fv .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateFixed$$4PQ43scn4step4item4Item$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateFixed$$4PQ43scn4step4item4Item$$1: .4byte 0 .4byte 0 - .4byte 0x803C3958 - .4byte 0x803C3938 + .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10StateFixed$$4PQ43scn4step4item4Item$$1Fv + .byte4 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 - .4byte 0x803C3954 - .4byte 0x803C3870 + .byte4 __dt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state11StateGather$$4PQ43scn4step4item4Item$$4Q33std3tr143reference_wrapper$$0Q43scn4step4item7Catcher$$1$$1Fv + .byte4 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 - .4byte 0x803C1D38 + .byte4 __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: - .4byte 0x8055C528 - .4byte 0x8055C530 - .4byte 0x8055C538 - .4byte 0x8055C540 - .4byte 0x8055C548 - .4byte 0x8055C550 - .4byte 0x8055C558 - .4byte 0x804958E8 - .4byte 0x8055C560 + .byte4 $$252776 + .byte4 $$252777 + .byte4 $$252778 + .byte4 $$252779 + .byte4 $$252780 + .byte4 $$252781 + .byte4 $$252782 + .byte4 $$252783 + .byte4 $$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: - .4byte 0x80495918 - .4byte 0x80495924 - .4byte 0x80495930 - .4byte 0x8049593C - .4byte 0x80495948 - .4byte 0x80495954 - .4byte 0x80495960 - .4byte 0x8049596C - .4byte 0x80495978 - .4byte 0x80495984 - .4byte 0x80495990 - .4byte 0x8049599C - .4byte 0x804959A8 - .4byte 0x804959B4 - .4byte 0x804959C0 - .4byte 0x804959CC - .4byte 0x804959D8 - .4byte 0x804959E4 + .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 .global $$253750 $$253750: .asciz "grandmenu/Main" diff --git a/asm/src/ItemCatcher.s b/asm/src/ItemCatcher.s index 764867c2..b058815e 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 - .4byte 0x80342C60 + .byte4 __sinit_$$3ItemCatcher_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254426 diff --git a/asm/src/ItemCollReact.s b/asm/src/ItemCollReact.s index 2f0712c3..91b46727 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 - .4byte 0x80343374 - .4byte 0x80343338 + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick12StateItemGet$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick12StateItemGet$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateGetShipParts$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateGetShipParts$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80343370 - .4byte 0x80343354 + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateGetShipParts$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 6f9117ca..ac9f37b2 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 - .4byte 0x804928B8 - .4byte 0x8055BF20 - .4byte 0x8055BF28 + .byte4 $$249154 + .byte4 $$249155 + .byte4 $$249156 .4byte 0 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF20 - .4byte 0x8055BF30 + .byte4 $$249154 + .byte4 $$249155 + .byte4 $$249157 .4byte 0 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF20 - .4byte 0x8055BF38 + .byte4 $$249154 + .byte4 $$249155 + .byte4 $$249158 .4byte 0 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF20 - .4byte 0x8055BF40 + .byte4 $$249154 + .byte4 $$249155 + .byte4 $$249159 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF48 - .4byte 0x8055BF28 + .byte4 $$249154 + .byte4 $$249160 + .byte4 $$249156 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF48 - .4byte 0x8055BF30 + .byte4 $$249154 + .byte4 $$249160 + .byte4 $$249157 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF48 - .4byte 0x8055BF38 + .byte4 $$249154 + .byte4 $$249160 + .byte4 $$249158 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF48 - .4byte 0x8055BF40 + .byte4 $$249154 + .byte4 $$249160 + .byte4 $$249159 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF48 - .4byte 0x8055BF50 + .byte4 $$249154 + .byte4 $$249160 + .byte4 $$249161 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF48 - .4byte 0x8055BF58 + .byte4 $$249154 + .byte4 $$249160 + .byte4 $$249162 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF48 - .4byte 0x8055BF60 + .byte4 $$249154 + .byte4 $$249160 + .byte4 $$249163 .4byte 0x00000001 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF68 - .4byte 0x8055BF28 + .byte4 $$249154 + .byte4 $$249164 + .byte4 $$249156 .4byte 0x00000001 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF68 - .4byte 0x8055BF30 + .byte4 $$249154 + .byte4 $$249164 + .byte4 $$249157 .4byte 0x00000001 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF68 - .4byte 0x8055BF38 + .byte4 $$249154 + .byte4 $$249164 + .byte4 $$249158 .4byte 0x00000001 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF68 - .4byte 0x8055BF40 + .byte4 $$249154 + .byte4 $$249164 + .byte4 $$249159 .4byte 0 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF70 - .4byte 0x8055BF28 + .byte4 $$249154 + .byte4 $$249165 + .byte4 $$249156 .4byte 0 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF70 - .4byte 0x8055BF30 + .byte4 $$249154 + .byte4 $$249165 + .byte4 $$249157 .4byte 0 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF70 - .4byte 0x8055BF38 + .byte4 $$249154 + .byte4 $$249165 + .byte4 $$249158 .4byte 0 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF70 - .4byte 0x8055BF40 + .byte4 $$249154 + .byte4 $$249165 + .byte4 $$249159 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF78 - .4byte 0x8055BF28 + .byte4 $$249154 + .byte4 $$249166 + .byte4 $$249156 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF78 - .4byte 0x8055BF30 + .byte4 $$249154 + .byte4 $$249166 + .byte4 $$249157 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF78 - .4byte 0x8055BF38 + .byte4 $$249154 + .byte4 $$249166 + .byte4 $$249158 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF78 - .4byte 0x8055BF40 + .byte4 $$249154 + .byte4 $$249166 + .byte4 $$249159 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF78 - .4byte 0x8055BF50 + .byte4 $$249154 + .byte4 $$249166 + .byte4 $$249161 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF78 - .4byte 0x8055BF58 + .byte4 $$249154 + .byte4 $$249166 + .byte4 $$249162 .4byte 0x00000001 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF80 - .4byte 0x8055BF28 + .byte4 $$249154 + .byte4 $$249167 + .byte4 $$249156 .4byte 0x00000001 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF88 - .4byte 0x8055BF28 + .byte4 $$249154 + .byte4 $$249168 + .byte4 $$249156 .4byte 0x00000001 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF88 - .4byte 0x8055BF30 + .byte4 $$249154 + .byte4 $$249168 + .byte4 $$249157 .4byte 0x00000001 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF88 - .4byte 0x8055BF38 + .byte4 $$249154 + .byte4 $$249168 + .byte4 $$249158 .4byte 0x00000001 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF88 - .4byte 0x8055BF40 + .byte4 $$249154 + .byte4 $$249168 + .byte4 $$249159 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF90 - .4byte 0x8055BF28 + .byte4 $$249154 + .byte4 $$249169 + .byte4 $$249156 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF90 - .4byte 0x8055BF30 + .byte4 $$249154 + .byte4 $$249169 + .byte4 $$249157 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF90 - .4byte 0x8055BF38 + .byte4 $$249154 + .byte4 $$249169 + .byte4 $$249158 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF90 - .4byte 0x8055BF40 + .byte4 $$249154 + .byte4 $$249169 + .byte4 $$249159 .4byte 0 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF98 - .4byte 0x8055BF28 + .byte4 $$249154 + .byte4 $$249170 + .byte4 $$249156 .4byte 0 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF98 - .4byte 0x8055BF30 + .byte4 $$249154 + .byte4 $$249170 + .byte4 $$249157 .4byte 0 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF98 - .4byte 0x8055BF38 + .byte4 $$249154 + .byte4 $$249170 + .byte4 $$249158 .4byte 0 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BF98 - .4byte 0x8055BF40 + .byte4 $$249154 + .byte4 $$249170 + .byte4 $$249159 .4byte 0 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BFA0 - .4byte 0x8055BF28 + .byte4 $$249154 + .byte4 $$249171 + .byte4 $$249156 .4byte 0x00000001 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BFA8 - .4byte 0x8055BF28 + .byte4 $$249154 + .byte4 $$249172 + .byte4 $$249156 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BFB0 - .4byte 0x8055BF28 + .byte4 $$249154 + .byte4 $$249173 + .byte4 $$249156 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x8055BFB8 - .4byte 0x8055BF28 + .byte4 $$249154 + .byte4 $$249174 + .byte4 $$249156 .4byte 0 .4byte 0 - .4byte 0x804928B8 - .4byte 0x804928C4 - .4byte 0x8055BF28 + .byte4 $$249154 + .byte4 $$249175 + .byte4 $$249156 .4byte 0x00000001 .4byte 0 - .4byte 0x804928B8 - .4byte 0x804928D0 - .4byte 0x8055BF28 + .byte4 $$249154 + .byte4 $$249176 + .byte4 $$249156 .4byte 0x00000002 .4byte 0 - .4byte 0x804928B8 - .4byte 0x804928DC - .4byte 0x8055BF28 + .byte4 $$249154 + .byte4 $$249177 + .byte4 $$249156 .4byte 0 .4byte 0 - .4byte 0x8055BFC0 - .4byte 0x8055BFC8 - .4byte 0x8055BFD0 + .byte4 $$249178 + .byte4 $$249179 + .byte4 $$249180 .4byte 0x00000001 .4byte 0 - .4byte 0x8055BFC0 - .4byte 0x8055BFC8 - .4byte 0x8055BFD8 + .byte4 $$249178 + .byte4 $$249179 + .byte4 $$249181 .4byte 0x00000002 .4byte 0 - .4byte 0x8055BFC0 - .4byte 0x8055BFC8 - .4byte 0x8055BFE0 + .byte4 $$249178 + .byte4 $$249179 + .byte4 $$249182 .4byte 0 .4byte 0 - .4byte 0x8055BFC0 - .4byte 0x8055BFE8 - .4byte 0x804928E8 + .byte4 $$249178 + .byte4 $$249183 + .byte4 $$249184 .4byte 0 .4byte 0 - .4byte 0x8055BFC0 - .4byte 0x804928F4 - .4byte 0x80492900 + .byte4 $$249178 + .byte4 $$249185 + .byte4 $$249186 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249154 diff --git a/asm/src/Kirby.s b/asm/src/Kirby.s index 497e47d7..efc5db39 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 - .4byte 0x80209BD4 ;# ptr + .byte4 __sinit_$$3Kirby_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc5KirbyFv$$2ENTRIES$$20 $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc5KirbyFv$$2ENTRIES$$20: - .4byte 0x8055ADE8 + .byte4 $$248727 .4byte 0 - .4byte 0x8055ADF0 + .byte4 $$248728 .4byte 0 - .4byte 0x8055ADF8 + .byte4 $$248729 .4byte 0 - .4byte 0x8055AE00 + .byte4 $$248730 .4byte 0 - .4byte 0x8055AE08 + .byte4 $$248731 .4byte 0 - .4byte 0x8055AE10 + .byte4 $$248732 .4byte 0 - .4byte 0x8055AE18 + .byte4 $$248733 .4byte 0 - .4byte 0x80489B40 + .byte4 $$248734 .4byte 0 - .4byte 0x8055AE20 + .byte4 $$248735 .4byte 0 - .4byte 0x8055AE28 + .byte4 $$248736 .4byte 0 - .4byte 0x8055AE30 + .byte4 $$248737 .4byte 0 - .4byte 0x80489B4C + .byte4 $$248738 .4byte 0 - .4byte 0x8055AE38 + .byte4 $$248739 .4byte 0 - .4byte 0x80489B58 + .byte4 $$248740 .4byte 0 - .4byte 0x80489B64 + .byte4 $$248741 .4byte 0 - .4byte 0x8055AE40 + .byte4 $$248742 .4byte 0 - .4byte 0x80489B74 + .byte4 $$248743 .4byte 0 - .4byte 0x80489B80 + .byte4 $$248744 .4byte 0 - .4byte 0x80489B8C + .byte4 $$248745 .4byte 0 - .4byte 0x8055AE48 + .byte4 $$248746 .4byte 0 - .4byte 0x80489B98 + .byte4 $$248747 .4byte 0 - .4byte 0x80489BA4 + .byte4 $$248748 .4byte 0 - .4byte 0x80489BB4 + .byte4 $$248749 .4byte 0 - .4byte 0x8055AE50 + .byte4 $$248750 .4byte 0 - .4byte 0x80489BC4 + .byte4 $$248751 .4byte 0 - .4byte 0x80489BD0 + .byte4 $$248752 .4byte 0 - .4byte 0x8055AE58 + .byte4 $$248753 .4byte 0 - .4byte 0x80489BE0 + .byte4 $$248754 .4byte 0 - .4byte 0x80489BF0 + .byte4 $$248755 .4byte 0 - .4byte 0x80489C00 + .byte4 $$248756 .4byte 0 - .4byte 0x8055AE60 + .byte4 $$248757 .4byte 0 - .4byte 0x80489C10 + .byte4 $$248758 .4byte 0 - .4byte 0x80489C1C + .byte4 $$248759 .4byte 0 - .4byte 0x80489C28 + .byte4 $$248760 .4byte 0 - .4byte 0x8055AE68 + .byte4 $$248761 .4byte 0 - .4byte 0x8055AE6C + .byte4 $$248762 .4byte 0 - .4byte 0x8055AE70 + .byte4 $$248763 .4byte 0 - .4byte 0x8055AE78 + .byte4 $$248764 .4byte 0 - .4byte 0x8055AE80 + .byte4 $$248765 .4byte 0 - .4byte 0x80489C34 + .byte4 $$248766 .4byte 0 - .4byte 0x8055AE88 + .byte4 $$248767 .4byte 0 - .4byte 0x8055AE90 + .byte4 $$248768 .4byte 0 - .4byte 0x80489C44 + .byte4 $$248769 .4byte 0 - .4byte 0x80489C50 + .byte4 $$248770 .4byte 0 - .4byte 0x80489C60 + .byte4 $$248771 .4byte 0 - .4byte 0x80489C70 + .byte4 $$248772 .4byte 0 - .4byte 0x80489C7C + .byte4 $$248773 .4byte 0 - .4byte 0x8055AE98 + .byte4 $$248774 .4byte 0 - .4byte 0x80489C8C + .byte4 $$248775 .4byte 0 - .4byte 0x8055AEA0 + .byte4 $$248776 .4byte 0 - .4byte 0x8055AEA8 + .byte4 $$248777 .4byte 0 - .4byte 0x80489C98 + .byte4 $$248778 .4byte 0 - .4byte 0x80489CA8 + .byte4 $$248779 .4byte 0 - .4byte 0x80489CB8 + .byte4 $$248780 .4byte 0 - .4byte 0x80489CC8 + .byte4 $$248781 .4byte 0 - .4byte 0x80489CD8 + .byte4 $$248782 .4byte 0 - .4byte 0x80489CE4 + .byte4 $$248783 .4byte 0 - .4byte 0x80489CF0 + .byte4 $$248784 .4byte 0 - .4byte 0x80489CFC + .byte4 $$248785 .4byte 0 - .4byte 0x80489D08 + .byte4 $$248786 .4byte 0 - .4byte 0x80489D14 + .byte4 $$248787 .4byte 0 - .4byte 0x8055AEB0 + .byte4 $$248788 .4byte 0 - .4byte 0x80489D20 + .byte4 $$248789 .4byte 0 - .4byte 0x80489D30 + .byte4 $$248790 .4byte 0 - .4byte 0x80489D3C + .byte4 $$248791 .4byte 0 - .4byte 0x80489D48 + .byte4 $$248792 .4byte 0 - .4byte 0x80489D54 + .byte4 $$248793 .4byte 0 - .4byte 0x80489D60 + .byte4 $$248794 .4byte 0 - .4byte 0x80489D70 + .byte4 $$248795 .4byte 0 - .4byte 0x80489D7C + .byte4 $$248796 .4byte 0 - .4byte 0x8055AEB8 + .byte4 $$248797 .4byte 0 - .4byte 0x80489D8C + .byte4 $$248798 .4byte 0 - .4byte 0x8055AEC0 + .byte4 $$248799 .4byte 0 - .4byte 0x80489D98 + .byte4 $$248800 .4byte 0 - .4byte 0x80489DA4 + .byte4 $$248801 .4byte 0 - .4byte 0x8055AEC8 + .byte4 $$248802 .4byte 0 - .4byte 0x80489DB0 + .byte4 $$248803 .4byte 0 - .4byte 0x8055AED0 + .byte4 $$248804 .4byte 0 - .4byte 0x80489DBC + .byte4 $$248805 .4byte 0 - .4byte 0x80489DD0 + .byte4 $$248806 .4byte 0 - .4byte 0x80489DE4 + .byte4 $$248807 .4byte 0 - .4byte 0x80489DF8 + .byte4 $$248808 .4byte 0 - .4byte 0x80489E0C + .byte4 $$248809 .4byte 0 - .4byte 0x80489E20 + .byte4 $$248810 .4byte 0 - .4byte 0x80489E34 + .byte4 $$248811 .4byte 0 - .4byte 0x80489E48 + .byte4 $$248812 .4byte 0 - .4byte 0x8055AED8 + .byte4 $$248813 .4byte 0 - .4byte 0x8055AEE0 + .byte4 $$248814 .4byte 0 - .4byte 0x8055AEE8 + .byte4 $$248815 .4byte 0 - .4byte 0x8055AEF0 + .byte4 $$248816 .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055AEF8 + .byte4 $$248817 .4byte 0 - .4byte 0x8055AF00 + .byte4 $$248818 .4byte 0 - .4byte 0x8055AF08 + .byte4 $$248819 .4byte 0 - .4byte 0x8055AF10 + .byte4 $$248820 .4byte 0 - .4byte 0x8055AF18 + .byte4 $$248821 .4byte 0 - .4byte 0x8055AF20 + .byte4 $$248822 .4byte 0 - .4byte 0x8055AF28 + .byte4 $$248823 .4byte 0 - .4byte 0x8055AF30 + .byte4 $$248824 .4byte 0 - .4byte 0x8055AF38 + .byte4 $$248825 .4byte 0 - .4byte 0x8055AF40 + .byte4 $$248826 .4byte 0 - .4byte 0x8055AF48 + .byte4 $$248827 .4byte 0 - .4byte 0x8055AF50 + .byte4 $$248828 .4byte 0 - .4byte 0x8055AF58 + .byte4 $$248829 .4byte 0 - .4byte 0x80489E5C + .byte4 $$248830 .4byte 0 - .4byte 0x8055AF60 + .byte4 $$248831 .4byte 0 - .4byte 0x80489E68 + .byte4 $$248832 .4byte 0 - .4byte 0x8055AF68 + .byte4 $$248833 .4byte 0 - .4byte 0x8055AF70 + .byte4 $$248834 .4byte 0 - .4byte 0x80489E74 + .byte4 $$248835 .4byte 0 - .4byte 0x80489E80 + .byte4 $$248836 .4byte 0 - .4byte 0x80489E94 + .byte4 $$248837 .4byte 0 - .4byte 0x80489EA0 + .byte4 $$248838 .4byte 0 - .4byte 0x80489EAC + .byte4 $$248839 .4byte 0 - .4byte 0x8055AF78 + .byte4 $$248840 .4byte 0 - .4byte 0x8055AF80 + .byte4 $$248841 .4byte 0 - .4byte 0x80489EB8 + .byte4 $$248842 .4byte 0 - .4byte 0x80489EC4 + .byte4 $$248843 .4byte 0 - .4byte 0x80489ED8 + .byte4 $$248844 .4byte 0 - .4byte 0x80489EE8 + .byte4 $$248845 .4byte 0 - .4byte 0x80489EF4 + .byte4 $$248846 .4byte 0 - .4byte 0x80489F04 + .byte4 $$248847 .4byte 0 - .4byte 0x8055AF88 + .byte4 $$248848 .4byte 0 - .4byte 0x8055AF88 + .byte4 $$248848 .4byte 0 - .4byte 0x8055AF88 + .byte4 $$248848 .4byte 0 - .4byte 0x80489F14 + .byte4 $$248849 .4byte 0 - .4byte 0x80489F20 + .byte4 $$248850 .4byte 0 - .4byte 0x80489F30 + .byte4 $$248851 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055ADE8 + .byte4 $$248727 .4byte 0 - .4byte 0x80489F40 + .byte4 $$248852 .4byte 0 - .4byte 0x80489C1C + .byte4 $$248759 .4byte 0 - .4byte 0x8055ADE8 + .byte4 $$248727 .4byte 0 - .4byte 0x80489F4C + .byte4 $$248853 .4byte 0 - .4byte 0x80489F5C + .byte4 $$248854 .4byte 0 - .4byte 0x80489F70 + .byte4 $$248855 .4byte 0 - .4byte 0x80489F80 + .byte4 $$248856 .4byte 0 - .4byte 0x80489F98 + .byte4 $$248857 .4byte 0 - .4byte 0x8055AF90 + .byte4 $$248858 .4byte 0 - .4byte 0x80489FA4 + .byte4 $$248859 .4byte 0 - .4byte 0x80489FB0 + .byte4 $$248860 .4byte 0 - .4byte 0x80489FBC + .byte4 $$248861 .4byte 0 - .4byte 0x80489FC8 + .byte4 $$248862 .4byte 0 - .4byte 0x80489FD4 + .byte4 $$248863 .4byte 0x00000001 - .4byte 0x80489FE8 + .byte4 $$248864 .4byte 0x00000001 - .4byte 0x80489FF4 + .byte4 $$248865 .4byte 0x00000001 - .4byte 0x8048A004 + .byte4 $$248866 .4byte 0x00000001 - .4byte 0x8048A014 + .byte4 $$248867 .4byte 0x00000001 - .4byte 0x8055AF98 + .byte4 $$248868 .4byte 0x00000001 - .4byte 0x8048A020 + .byte4 $$248869 .4byte 0x00000001 - .4byte 0x8048A02C + .byte4 $$248870 .4byte 0x00000001 - .4byte 0x8048A040 + .byte4 $$248871 .4byte 0x00000001 - .4byte 0x8048A04C + .byte4 $$248872 .4byte 0x00000001 - .4byte 0x8048A060 + .byte4 $$248873 .4byte 0x00000001 - .4byte 0x8055AFA0 + .byte4 $$248874 .4byte 0x00000001 - .4byte 0x8048A070 + .byte4 $$248875 .4byte 0x00000001 - .4byte 0x8048A07C + .byte4 $$248876 .4byte 0x00000001 - .4byte 0x8048A090 + .byte4 $$248877 .4byte 0x00000001 - .4byte 0x8048A0A8 + .byte4 $$248878 .4byte 0x00000001 - .4byte 0x8048A0B8 + .byte4 $$248879 .4byte 0x00000001 - .4byte 0x8048A0D0 + .byte4 $$248880 .4byte 0x00000001 - .4byte 0x8048A0DC + .byte4 $$248881 .4byte 0x00000001 - .4byte 0x8048A0EC + .byte4 $$248882 .4byte 0x00000001 - .4byte 0x8048A0F8 + .byte4 $$248883 .4byte 0x00000001 - .4byte 0x8055AFA8 + .byte4 $$248884 .4byte 0x00000001 - .4byte 0x8048A108 + .byte4 $$248885 .4byte 0x00000002 - .4byte 0x8048A114 + .byte4 $$248886 .4byte 0x00000002 - .4byte 0x8048A128 + .byte4 $$248887 .4byte 0x00000002 - .4byte 0x8048A140 + .byte4 $$248888 .4byte 0x00000002 - .4byte 0x8048A150 + .byte4 $$248889 .4byte 0x00000002 - .4byte 0x8048A160 + .byte4 $$248890 .4byte 0x00000002 - .4byte 0x8048A16C + .byte4 $$248891 .4byte 0x00000002 - .4byte 0x8048A178 + .byte4 $$248892 .4byte 0x00000002 - .4byte 0x8048A188 + .byte4 $$248893 .4byte 0x00000002 - .4byte 0x8048A1A0 + .byte4 $$248894 .4byte 0x00000002 - .4byte 0x8048A1B0 + .byte4 $$248895 .4byte 0x00000002 - .4byte 0x8048A1C0 + .byte4 $$248896 .4byte 0x00000003 - .4byte 0x8048A1D0 + .byte4 $$248897 .4byte 0x00000003 - .4byte 0x8055AFB0 + .byte4 $$248898 .4byte 0x00000003 - .4byte 0x8048A1E0 + .byte4 $$248899 .4byte 0x00000003 - .4byte 0x8048A1F0 + .byte4 $$248900 .4byte 0x00000003 - .4byte 0x8055AFB8 + .byte4 $$248901 .4byte 0x00000003 - .4byte 0x8055AFC0 + .byte4 $$248902 .4byte 0x00000003 - .4byte 0x8048A200 + .byte4 $$248903 .4byte 0x00000003 - .4byte 0x8048A210 + .byte4 $$248904 .4byte 0x00000003 - .4byte 0x8048A21C + .byte4 $$248905 .4byte 0x00000003 - .4byte 0x8048A228 + .byte4 $$248906 .4byte 0x00000003 - .4byte 0x8055AFC8 + .byte4 $$248907 .4byte 0x00000003 - .4byte 0x8048A234 + .byte4 $$248908 .4byte 0x00000003 - .4byte 0x8048A244 + .byte4 $$248909 .4byte 0x00000003 - .4byte 0x8048A254 + .byte4 $$248910 .4byte 0x00000003 - .4byte 0x8048A260 + .byte4 $$248911 .4byte 0x00000003 - .4byte 0x8048A270 + .byte4 $$248912 .4byte 0x00000004 - .4byte 0x8048A280 + .byte4 $$248913 .4byte 0x00000004 - .4byte 0x8048A28C + .byte4 $$248914 .4byte 0x00000004 - .4byte 0x8048A29C + .byte4 $$248915 .4byte 0x00000004 - .4byte 0x8048A2A8 + .byte4 $$248916 .4byte 0x00000004 - .4byte 0x8048A2B8 + .byte4 $$248917 .4byte 0x00000004 - .4byte 0x8055AFD0 + .byte4 $$248918 .4byte 0x00000004 - .4byte 0x8048A2C8 + .byte4 $$248919 .4byte 0x00000004 - .4byte 0x8048A2D4 + .byte4 $$248920 .4byte 0x00000004 - .4byte 0x8048A2E4 + .byte4 $$248921 .4byte 0x00000004 - .4byte 0x8048A2F0 + .byte4 $$248922 .4byte 0x00000004 - .4byte 0x8048A304 + .byte4 $$248923 .4byte 0x00000005 - .4byte 0x8055AFD8 + .byte4 $$248924 .4byte 0x00000005 - .4byte 0x8048A310 + .byte4 $$248925 .4byte 0x00000005 - .4byte 0x8048A31C + .byte4 $$248926 .4byte 0x00000005 - .4byte 0x8055AFE0 + .byte4 $$248927 .4byte 0x00000005 - .4byte 0x8048A32C + .byte4 $$248928 .4byte 0x00000005 - .4byte 0x8048A338 + .byte4 $$248929 .4byte 0x00000005 - .4byte 0x8048A344 + .byte4 $$248930 .4byte 0x00000005 - .4byte 0x8048A350 + .byte4 $$248931 .4byte 0x00000005 - .4byte 0x8048A35C + .byte4 $$248932 .4byte 0x00000006 - .4byte 0x8048A36C + .byte4 $$248933 .4byte 0x00000006 - .4byte 0x8048A36C + .byte4 $$248933 .4byte 0x00000006 - .4byte 0x8048A378 + .byte4 $$248934 .4byte 0x00000006 - .4byte 0x8048A384 + .byte4 $$248935 .4byte 0x00000006 - .4byte 0x8048A390 + .byte4 $$248936 .4byte 0x00000006 - .4byte 0x8055AFE8 + .byte4 $$248937 .4byte 0x00000007 - .4byte 0x8048A3A0 + .byte4 $$248938 .4byte 0x00000007 - .4byte 0x8048A3AC + .byte4 $$248939 .4byte 0x00000007 - .4byte 0x8048A3B8 + .byte4 $$248940 .4byte 0x00000007 - .4byte 0x8055AFF0 + .byte4 $$248941 .4byte 0x00000007 - .4byte 0x8055AFF8 + .byte4 $$248942 .4byte 0x00000007 - .4byte 0x8055B000 + .byte4 $$248943 .4byte 0x00000007 - .4byte 0x8048A3C4 + .byte4 $$248944 .4byte 0x00000007 - .4byte 0x8055AFC8 + .byte4 $$248907 .4byte 0x00000007 - .4byte 0x8048A3D0 + .byte4 $$248945 .4byte 0x00000007 - .4byte 0x8048A3DC + .byte4 $$248946 .4byte 0x00000007 - .4byte 0x8048A3EC + .byte4 $$248947 .4byte 0x00000007 - .4byte 0x8048A400 + .byte4 $$248948 .4byte 0x00000007 - .4byte 0x8048A410 + .byte4 $$248949 .4byte 0x00000008 - .4byte 0x8048A428 + .byte4 $$248950 .4byte 0x00000008 - .4byte 0x8048A43C + .byte4 $$248951 .4byte 0x00000008 - .4byte 0x8048A450 + .byte4 $$248952 .4byte 0x00000008 - .4byte 0x8048A460 + .byte4 $$248953 .4byte 0x00000008 - .4byte 0x8048A474 + .byte4 $$248954 .4byte 0x00000008 - .4byte 0x8048A488 + .byte4 $$248955 .4byte 0x00000008 - .4byte 0x8048A49C + .byte4 $$248956 .4byte 0x00000008 - .4byte 0x8048A4B0 + .byte4 $$248957 .4byte 0x00000008 - .4byte 0x8048A4C8 + .byte4 $$248958 .4byte 0x00000008 - .4byte 0x8048A4D8 + .byte4 $$248959 .4byte 0x00000008 - .4byte 0x8048A4E4 + .byte4 $$248960 .4byte 0x00000008 - .4byte 0x8048A4F0 + .byte4 $$248961 .4byte 0x00000008 - .4byte 0x8048A508 + .byte4 $$248962 .4byte 0x00000008 - .4byte 0x8048A518 + .byte4 $$248963 .4byte 0x00000008 - .4byte 0x8048A524 + .byte4 $$248964 .4byte 0x00000009 - .4byte 0x8048A538 + .byte4 $$248965 .4byte 0x00000009 - .4byte 0x8048A54C + .byte4 $$248966 .4byte 0x00000009 - .4byte 0x8048A560 + .byte4 $$248967 .4byte 0x00000009 - .4byte 0x8048A570 + .byte4 $$248968 .4byte 0x00000009 - .4byte 0x8048A588 + .byte4 $$248969 .4byte 0x00000009 - .4byte 0x8048A5A0 + .byte4 $$248970 .4byte 0x00000009 - .4byte 0x8048A5B8 + .byte4 $$248971 .4byte 0x00000009 - .4byte 0x8048A5CC + .byte4 $$248972 .4byte 0x00000009 - .4byte 0x8048A5D8 + .byte4 $$248973 .4byte 0x00000009 - .4byte 0x8048A5E8 + .byte4 $$248974 .4byte 0x00000009 - .4byte 0x8048A5FC + .byte4 $$248975 .4byte 0x00000009 - .4byte 0x8048A60C + .byte4 $$248976 .4byte 0x00000009 - .4byte 0x8048A620 + .byte4 $$248977 .4byte 0x00000009 - .4byte 0x8048A634 + .byte4 $$248978 .4byte 0x00000009 - .4byte 0x8048A644 + .byte4 $$248979 .4byte 0x00000009 - .4byte 0x8048A658 + .byte4 $$248980 .4byte 0x00000009 - .4byte 0x8048A668 + .byte4 $$248981 .4byte 0x00000009 - .4byte 0x8048A678 + .byte4 $$248982 .4byte 0x00000009 - .4byte 0x8048A688 + .byte4 $$248983 .4byte 0x00000009 - .4byte 0x8048A69C + .byte4 $$248984 .4byte 0x00000009 - .4byte 0x8048A6A8 + .byte4 $$248985 .4byte 0x00000009 - .4byte 0x8048A6B8 + .byte4 $$248986 .4byte 0x00000009 - .4byte 0x8048A6C8 + .byte4 $$248987 .4byte 0x0000000A - .4byte 0x8048A6E0 + .byte4 $$248988 .4byte 0x0000000A - .4byte 0x8048A6F8 + .byte4 $$248989 .4byte 0x0000000A - .4byte 0x8048A710 + .byte4 $$248990 .4byte 0x0000000A - .4byte 0x8048A730 + .byte4 $$248991 .4byte 0x0000000A - .4byte 0x8048A748 + .byte4 $$248992 .4byte 0x0000000A - .4byte 0x8048A760 + .byte4 $$248993 .4byte 0x0000000A - .4byte 0x8048A774 + .byte4 $$248994 .4byte 0x0000000A - .4byte 0x8048A784 + .byte4 $$248995 .4byte 0x0000000A - .4byte 0x8048A79C + .byte4 $$248996 .4byte 0x0000000A - .4byte 0x8048A7B0 + .byte4 $$248997 .4byte 0x0000000A - .4byte 0x8048A7C4 + .byte4 $$248998 .4byte 0x0000000A - .4byte 0x8048A7D0 + .byte4 $$248999 .4byte 0x0000000A - .4byte 0x8048A7E4 + .byte4 $$249000 .4byte 0x0000000A - .4byte 0x8048A7F4 + .byte4 $$249001 .4byte 0x0000000A - .4byte 0x8048A808 + .byte4 $$249002 .4byte 0x0000000A - .4byte 0x8048A81C + .byte4 $$249003 .4byte 0x0000000A - .4byte 0x8048A830 + .byte4 $$249004 .4byte 0x0000000A - .4byte 0x8048A844 + .byte4 $$249005 .4byte 0x0000000A - .4byte 0x8048A85C + .byte4 $$249006 .4byte 0x0000000A - .4byte 0x8048A874 + .byte4 $$249007 .4byte 0x0000000A - .4byte 0x8048A88C + .byte4 $$249008 .4byte 0x0000000A - .4byte 0x8048A8A4 + .byte4 $$249009 .4byte 0x0000000A - .4byte 0x8048A8C0 + .byte4 $$249010 .4byte 0x0000000A - .4byte 0x8048A8D8 + .byte4 $$249011 .4byte 0x0000000A - .4byte 0x8048A8F0 + .byte4 $$249012 .4byte 0x0000000A - .4byte 0x8048A908 + .byte4 $$249013 .4byte 0x0000000A - .4byte 0x8048A924 + .byte4 $$249014 .4byte 0x0000000A - .4byte 0x8048A938 + .byte4 $$249015 .4byte 0x0000000A - .4byte 0x8048A938 + .byte4 $$249015 .4byte 0x0000000A - .4byte 0x8048A948 + .byte4 $$249016 .4byte 0x0000000A - .4byte 0x8048A95C + .byte4 $$249017 .4byte 0x0000000A - .4byte 0x8048A970 + .byte4 $$249018 .4byte 0x0000000A - .4byte 0x8048A988 + .byte4 $$249019 .4byte 0x0000000A - .4byte 0x8048A9A0 + .byte4 $$249020 .4byte 0x0000000A - .4byte 0x8048A9B4 + .byte4 $$249021 .4byte 0x0000000A - .4byte 0x8048A9C8 + .byte4 $$249022 .4byte 0x0000000A - .4byte 0x8048A9DC + .byte4 $$249023 .4byte 0x0000000A - .4byte 0x8048A9F0 + .byte4 $$249024 .4byte 0x0000000A - .4byte 0x8048AA04 + .byte4 $$249025 .4byte 0x0000000A - .4byte 0x8048AA18 + .byte4 $$249026 .4byte 0x0000000A .4byte 0 .4byte 0 @@ -2687,61 +2687,61 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc5KirbyFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048AA2C + .byte4 $$249027 .4byte 0 - .4byte 0x8048AA38 + .byte4 $$249028 .4byte 0 - .4byte 0x8048AA44 + .byte4 $$249029 .4byte 0 - .4byte 0x8048AA50 + .byte4 $$249030 .4byte 0 - .4byte 0x8055B008 + .byte4 $$249031 .4byte 0 - .4byte 0x8048AA5C + .byte4 $$249032 .4byte 0 - .4byte 0x8048AA68 + .byte4 $$249033 .4byte 0 - .4byte 0x8048AA7C + .byte4 $$249034 .4byte 0 - .4byte 0x8048AA88 + .byte4 $$249035 .4byte 0 - .4byte 0x8048AA98 + .byte4 $$249036 .4byte 0 - .4byte 0x8048AAAC + .byte4 $$249037 .4byte 0 - .4byte 0x8048AAB8 + .byte4 $$249038 .4byte 0 - .4byte 0x8055B010 + .byte4 $$249039 .4byte 0 - .4byte 0x8055B018 + .byte4 $$249040 .4byte 0 - .4byte 0x8048AAC8 + .byte4 $$249041 .4byte 0 - .4byte 0x8055B020 + .byte4 $$249042 .4byte 0 - .4byte 0x8048AAD4 + .byte4 $$249043 .4byte 0 - .4byte 0x8048AAE0 + .byte4 $$249044 .4byte 0 - .4byte 0x8048AAF0 + .byte4 $$249045 .4byte 0 - .4byte 0x8048AB08 + .byte4 $$249046 .4byte 0 - .4byte 0x8048AB18 + .byte4 $$249047 .4byte 0 - .4byte 0x8055B028 + .byte4 $$249048 .4byte 0 - .4byte 0x8055B030 + .byte4 $$249049 .4byte 0 - .4byte 0x8048AB2C + .byte4 $$249050 .4byte 0 - .4byte 0x8048AB38 + .byte4 $$249051 .4byte 0 - .4byte 0x8048AB44 + .byte4 $$249052 .4byte 0 - .4byte 0x8048AB54 + .byte4 $$249053 .4byte 0 - .4byte 0x8048AB60 + .byte4 $$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: - .4byte 0x8055B038 - .4byte 0x8048AB70 - .4byte 0x8048AB7C - .4byte 0x8055B040 - .4byte 0x8055B048 - .4byte 0x8055B050 - .4byte 0x8055B058 - .4byte 0x8048AB88 - .4byte 0x8048AB94 - .4byte 0x8048ABA4 - .4byte 0x8048ABB4 - .4byte 0x8048AB70 - .4byte 0x8055B060 - .4byte 0x8055B068 - .4byte 0x8055B070 - .4byte 0x8048ABC0 - .4byte 0x8048ABB4 - .4byte 0x8055B078 - .4byte 0x8055B038 - .4byte 0x8055B038 - .4byte 0x8055B038 - .4byte 0x8055B038 - .4byte 0x8055B038 - .4byte 0x8055B038 - .4byte 0x8048ABCC - .4byte 0x8048ABD8 - .4byte 0x8048ABE8 - .4byte 0x8048ABF8 - .4byte 0x8048AC08 - .4byte 0x8048AC18 + .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 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254931 diff --git a/asm/src/Kiss.s b/asm/src/Kiss.s index 8bc41a73..5cae907c 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 - .4byte 0x80344328 - .4byte 0x80344268 + .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 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256609 diff --git a/asm/src/LandLayer.s b/asm/src/LandLayer.s index 41d90200..8530bba0 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 - .4byte 0x801B931C ;# ptr + .byte4 __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 051db4dd..1cfd44ef 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: - .4byte 0x80495548 - .4byte 0x80495560 - .4byte 0x80495578 - .4byte 0x80495590 - .4byte 0x804955A8 - .4byte 0x804955C0 + .byte4 $$250070 + .byte4 $$250071 + .byte4 $$250072 + .byte4 $$250073 + .byte4 $$250074 + .byte4 $$250075 diff --git a/asm/src/Locale.s b/asm/src/Locale.s index b65ab519..dc38939b 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: - .4byte 0x80556BF8 - .4byte 0x80556C00 - .4byte 0x80556C08 - .4byte 0x80556C10 - .4byte 0x80556C18 - .4byte 0x80556C20 - .4byte 0x80556C28 + .byte4 $$250071 + .byte4 $$250072 + .byte4 $$250073 + .byte4 $$250074 + .byte4 $$250075 + .byte4 $$250076 + .byte4 $$250077 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/src/Mahoroa.s b/asm/src/Mahoroa.s index 890156d9..1ed8e766 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 - .4byte 0x80313D40 + .byte4 __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: - .4byte 0x8055A7B4 + .byte4 $$255205 .4byte 0 - .4byte 0x8055A7BC + .byte4 $$255206 .4byte 0 - .4byte 0x8055A7C4 + .byte4 $$255207 .4byte 0 - .4byte 0x804815B8 + .byte4 $$255208 .4byte 0 - .4byte 0x804815C8 + .byte4 $$255209 .4byte 0 - .4byte 0x804815D4 + .byte4 $$255210 .4byte 0 - .4byte 0x804815E0 + .byte4 $$255211 .4byte 0 - .4byte 0x804815F0 + .byte4 $$255212 .4byte 0 - .4byte 0x804815FC + .byte4 $$255213 .4byte 0 - .4byte 0x8048160C + .byte4 $$255214 .4byte 0 - .4byte 0x8048161C + .byte4 $$255215 .4byte 0 - .4byte 0x80481630 + .byte4 $$255216 .4byte 0 - .4byte 0x8055A7CC + .byte4 $$255217 .4byte 0 - .4byte 0x8048163C + .byte4 $$255218 .4byte 0 - .4byte 0x8055A7D4 + .byte4 $$255219 .4byte 0 - .4byte 0x8055A7DC + .byte4 $$255220 .4byte 0 - .4byte 0x8055A7E4 + .byte4 $$255221 .4byte 0 - .4byte 0x8055A7EC + .byte4 $$255222 .4byte 0 - .4byte 0x8055A7F4 + .byte4 $$255223 .4byte 0 - .4byte 0x8055A7FC + .byte4 $$255224 .4byte 0 - .4byte 0x8055A804 + .byte4 $$255225 .4byte 0 - .4byte 0x8055A80C + .byte4 $$255226 .4byte 0 - .4byte 0x8055A814 + .byte4 $$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: - .4byte 0x80481648 + .byte4 $$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 - .4byte 0x80481668 + .byte4 $$255230 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048168C + .byte4 $$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 - .4byte 0x804816B4 + .byte4 $$255232 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804816DC + .byte4 $$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: - .4byte 0x8055A7A8 + .byte4 $$255203 .global $$255205 $$255205: .asciz "Wait" diff --git a/asm/src/Main.s b/asm/src/Main.s index ee223dc3..4d4242c7 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: - .4byte 0x804601E8 + .byte4 $$251866 .4byte 0x00000027 - .4byte 0x804601F8 + .byte4 $$251867 .4byte 0x00000027 - .4byte 0x80460208 + .byte4 $$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: - .4byte 0x80460218 - .4byte 0x80460228 - .4byte 0x80460238 + .byte4 $$251870 + .byte4 $$251871 + .byte4 $$251872 .global $$257641 $$257641: .asciz "comic/Param" @@ -11100,97 +11100,97 @@ $$262268: $$262439: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8020E5A0 ;# ptr + .byte4 disappear__Q33scn7history12PackageHelpsFv .global $$262440 $$262440: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8021037C ;# ptr + .byte4 decideEffect__Q33scn7history5StageFi .global $$262441 $$262441: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80402CD4 + .byte4 start__Q23snd11SERequestorFUl .global $$262442 $$262442: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80209444 ;# ptr + .byte4 backStep__Q33scn7history5KirbyFv .global $$262443 $$262443: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80209570 ;# ptr + .byte4 isAnimEnd__Q33scn7history5KirbyFv .global $$262444 $$262444: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x802094A8 ;# ptr + .byte4 vacuum__Q33scn7history5KirbyFv .global $$262445 $$262445: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x802103A0 ;# ptr + .byte4 vacuumPackage__Q33scn7history5StageFiRCQ33hel4math7Vector3 .global $$262446 $$262446: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x802095F8 ;# ptr + .byte4 isVacuumEnd__Q33scn7history5KirbyCFv .global $$262447 $$262447: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80400920 + .byte4 setColor__Q23sfx4FadeFRC8_GXColor .global $$262448 $$262448: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80400908 + .byte4 setFadeOut__Q23sfx4FadeFUl .global $$262449 $$262449: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8040096C + .byte4 isEnd__Q23sfx4FadeCFv .global $$262450 $$262450: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80209500 ;# ptr + .byte4 vacuumSuka__Q33scn7history5KirbyFv .global $$262451 $$262451: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8021049C ;# ptr + .byte4 startShakePackage__Q33scn7history5StageFi .global $$262452 $$262452: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x802095F8 ;# ptr + .byte4 isVacuumEnd__Q33scn7history5KirbyCFv .global $$262453 $$262453: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80210510 ;# ptr + .byte4 stopShakePackage__Q33scn7history5StageFi .global $$262454 $$262454: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8020961C ;# ptr + .byte4 isTired__Q33scn7history5KirbyCFv .global $$262455 $$262455: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80400920 + .byte4 setColor__Q23sfx4FadeFRC8_GXColor .global $$262456 $$262456: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80400908 + .byte4 setFadeOut__Q23sfx4FadeFUl .global $$262457 $$262457: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8040096C + .byte4 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 - .4byte 0x8020CA54 ;# ptr - .4byte 0x8020C4E0 ;# ptr - .4byte 0x8020C520 ;# ptr - .4byte 0x8020C53C ;# ptr + .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 .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 - .4byte 0x8020CA50 ;# ptr - .4byte 0x8020C56C ;# ptr - .4byte 0x8020C5AC ;# ptr - .4byte 0x8020C5C8 ;# ptr + .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 .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 - .4byte 0x8020CA4C ;# ptr - .4byte 0x8020C5CC ;# ptr - .4byte 0x8020C60C ;# ptr - .4byte 0x8020C628 ;# ptr + .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 .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 - .4byte 0x8020CA48 ;# ptr - .4byte 0x8020C62C ;# ptr - .4byte 0x8020C66C ;# ptr - .4byte 0x8020C688 ;# ptr + .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 .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 - .4byte 0x8020CA44 ;# ptr - .4byte 0x8020C6C8 ;# ptr - .4byte 0x8020C708 ;# ptr - .4byte 0x8020C724 ;# ptr + .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 .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 - .4byte 0x8020CA40 ;# ptr - .4byte 0x8020C76C ;# ptr - .4byte 0x8020C7AC ;# ptr - .4byte 0x8020C7C8 ;# ptr + .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 .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 - .4byte 0x8020CA3C ;# ptr - .4byte 0x8020C800 ;# ptr - .4byte 0x8020C840 ;# ptr - .4byte 0x8020C85C ;# ptr + .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 0 .4byte 0 .4byte 0 @@ -11311,30 +11311,30 @@ $$255601: $$255656: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801A84A4 ;# ptr + .byte4 isPushEnd__Q34info6common10ButtonHelpCFv .global $$255657 $$255657: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80400920 + .byte4 setColor__Q23sfx4FadeFRC8_GXColor .global $$255658 $$255658: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80400908 + .byte4 setFadeOut__Q23sfx4FadeFUl .global $$255659 $$255659: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8040096C + .byte4 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 - .4byte 0x8021C950 ;# ptr - .4byte 0x8021C8AC ;# ptr - .4byte 0x8021C8EC ;# ptr - .4byte 0x8021C908 ;# ptr + .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 0 .4byte 0 .4byte 0 diff --git a/asm/src/Manager.s b/asm/src/Manager.s index 129e9c0c..8396ab85 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 - .4byte 0x801D13FC ;# ptr + .byte4 __sinit_$$3Manager_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$257185 @@ -37915,11 +37915,11 @@ $$257185: .4byte 0x0000000A .global $$257316 $$257316: - .4byte 0x8047F8DC - .4byte 0x8047F8F8 - .4byte 0x8047F914 - .4byte 0x8047F930 - .4byte 0x8047F950 + .byte4 $$257311 + .byte4 $$257312 + .byte4 $$257313 + .byte4 $$257314 + .byte4 $$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: - .4byte 0x805575D0 - .4byte 0x805575D8 - .4byte 0x805575E0 - .4byte 0x805575E8 - .4byte 0x8045D108 - .4byte 0x8045D114 - .4byte 0x8045D124 - .4byte 0x805575F0 - .4byte 0x805575F8 - .4byte 0x80557600 - .4byte 0x80557608 - .4byte 0x80557610 - .4byte 0x80557618 - .4byte 0x8045D138 - .4byte 0x8045D144 - .4byte 0x8045D150 - .4byte 0x8045D15C - .4byte 0x8045D168 + .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 .global $$249787 $$249787: .asciz "MsgManager" @@ -38010,11 +38010,11 @@ $$252573: __vt__Q43scn4step2bg7Manager: .4byte 0 .4byte 0 - .4byte 0x802273A8 ;# ptr - .4byte 0x802276B0 ;# ptr - .4byte 0x802276B8 ;# ptr - .4byte 0x802276C0 ;# ptr - .4byte 0x802276D0 ;# ptr + .byte4 __dt__Q43scn4step2bg7ManagerFv + .byte4 onStopNormalStarted__Q43scn4step2bg7ManagerFRCQ25ostop5Actor + .byte4 onStopNormalFinished__Q43scn4step2bg7ManagerFRCQ25ostop5Actor + .byte4 onStopPowerfulStarted__Q43scn4step2bg7ManagerFRCQ25ostop5Actor + .byte4 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 - .4byte 0x8026823C ;# ptr + .byte4 resFile100__Q43scn4step9challenge7ManagerFv .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80268C84 ;# ptr + .byte4 incCoinSCount__Q43scn4step9challenge7ManagerFv .4byte 0 .4byte 0x00000128 .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8026822C ;# ptr + .byte4 resFile1000__Q43scn4step9challenge7ManagerFv .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80268CD8 ;# ptr + .byte4 incCoinLCount__Q43scn4step9challenge7ManagerFv .4byte 0x01000000 .4byte 0x00000126 .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80268234 ;# ptr + .byte4 resFile50__Q43scn4step9challenge7ManagerFv .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80268D2C ;# ptr + .byte4 incEnemyCount__Q43scn4step9challenge7ManagerFv .4byte 0 .4byte 0x00000128 .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8026822C ;# ptr + .byte4 resFile1000__Q43scn4step9challenge7ManagerFv .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80268D88 ;# ptr + .byte4 incEnemyLCount__Q43scn4step9challenge7ManagerFv .4byte 0x01000000 .4byte 0x00000244 .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80268224 ;# ptr + .byte4 resFile100Minus__Q43scn4step9challenge7ManagerFv .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80268DDC ;# ptr + .byte4 incDamageScore__Q43scn4step9challenge7ManagerFv .4byte 0 .global $$255619 $$255619: @@ -38112,20 +38112,20 @@ $$259391: __vt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6bouncy11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1: .4byte 0 .4byte 0 - .4byte 0x8028A278 ;# ptr - .4byte 0x8028A214 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6bouncy11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv + .byte4 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 - .4byte 0x8028A274 ;# ptr - .4byte 0x8028A234 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv + .byte4 create__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateGoodbye$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateGoodbye$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x8028A270 ;# ptr - .4byte 0x8028A254 ;# ptr + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateGoodbye$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x80348E2C - .4byte 0x80348D68 + .byte4 __dt__Q24util179StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$4Q33hel4math7Vector3$$1Fv + .byte4 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 - .4byte 0x80348E28 - .4byte 0x80348DC8 + .byte4 __dt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$1Fv + .byte4 create__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateEnterMahoroa$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateEnterMahoroa$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80348E24 - .4byte 0x80348DE8 + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateEnterMahoroa$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateEnterMahoroa$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceFall$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceFall$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80348E20 - .4byte 0x80348E04 + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceFall$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceFall$$4PQ43scn4step4hero4Hero$$1Fv .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256047 @@ -38226,32 +38226,32 @@ $$256049: $$256236: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803ADA04 + .byte4 safeboolFunc__Q24util37PlacementNew$$0Q34info6common8SkipHelp$$1CFv .global $$256340 $$256340: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803ADA08 + .byte4 safeboolFunc__Q24util35PlacementNew$$0Q34info5cutin7Manager$$1CFv .global $$256351 $$256351: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803ADA0C + .byte4 safeboolFunc__Q24util43PlacementNew$$0Q43scn4step4info11InfoControl$$1CFv .global $$256362 $$256362: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803ADA10 + .byte4 safeboolFunc__Q24util40PlacementNew$$0Q53scn4step4info4ship4Ship$$1CFv .global $$256373 $$256373: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803ADA14 + .byte4 safeboolFunc__Q24util42PlacementNew$$0Q53scn4step4info5lvmap5LvMap$$1CFv .global $$256384 $$256384: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803ADA18 + .byte4 safeboolFunc__Q24util50PlacementNew$$0Q53scn4step4info9challenge9Challenge$$1CFv .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254030 diff --git a/asm/src/ManualData.s b/asm/src/ManualData.s index 83ae8435..ae68c653 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: - .4byte 0x80557710 + .byte4 $$248732 .4byte 0 - .4byte 0x80557718 + .byte4 $$248733 .4byte 0 - .4byte 0x8045D558 + .byte4 $$248734 .4byte 0 - .4byte 0x80557720 + .byte4 $$248735 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80557728 + .byte4 $$248736 .4byte 0 - .4byte 0x80557730 + .byte4 $$248737 .4byte 0 - .4byte 0x80557738 + .byte4 $$248738 .4byte 0 .global T_CMD_NORMAL_IN_WATER__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_NORMAL_IN_WATER__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .4byte 0x80557740 + .byte4 $$248739 .4byte 0 - .4byte 0x80557748 + .byte4 $$248740 .4byte 0 - .4byte 0x80557750 + .byte4 $$248741 .4byte 0 .global T_CMD_SWORD__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_SWORD__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .4byte 0x80557758 + .byte4 $$248742 .4byte 0 - .4byte 0x80557760 + .byte4 $$248743 .4byte 0 - .4byte 0x8045D568 + .byte4 $$248744 .4byte 0 - .4byte 0x8045D574 + .byte4 $$248745 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80557768 + .byte4 $$248746 .4byte 0 - .4byte 0x80557728 + .byte4 $$248736 .4byte 0 - .4byte 0x8045D584 + .byte4 $$248747 .4byte 0 - .4byte 0x80557770 + .byte4 $$248748 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80557778 + .byte4 $$248749 .4byte 0 - .4byte 0x80557780 + .byte4 $$248750 .4byte 0 - .4byte 0x80557788 + .byte4 $$248751 .4byte 0 .global T_CMD_WHIP__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_WHIP__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .4byte 0x8045D590 + .byte4 $$248752 .4byte 0 - .4byte 0x80557790 + .byte4 $$248753 .4byte 0 - .4byte 0x8045D59C + .byte4 $$248754 .4byte 0 - .4byte 0x80557798 + .byte4 $$248755 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80557710 + .byte4 $$248732 .4byte 0 - .4byte 0x8045D5A8 + .byte4 $$248756 .4byte 0 - .4byte 0x805577A0 + .byte4 $$248757 .4byte 0 - .4byte 0x805577A8 + .byte4 $$248758 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8045D5B4 + .byte4 $$248759 .4byte 0 - .4byte 0x8045D5C0 + .byte4 $$248760 .4byte 0 - .4byte 0x8045D5CC + .byte4 $$248761 .4byte 0 - .4byte 0x8045D5D8 + .byte4 $$248762 .4byte 0 .global T_CMD_SPARK__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_SPARK__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .4byte 0x805577B0 + .byte4 $$248763 .4byte 0 - .4byte 0x805577B8 + .byte4 $$248764 .4byte 0 - .4byte 0x805577C0 + .byte4 $$248765 .4byte 0 - .4byte 0x805577C8 + .byte4 $$248766 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x805577D0 + .byte4 $$248767 .4byte 0 - .4byte 0x805577D8 + .byte4 $$248768 .4byte 0 - .4byte 0x8045D5E4 + .byte4 $$248769 .4byte 0 - .4byte 0x8045D5F0 + .byte4 $$248770 .4byte 0 .global T_CMD_PARASOL__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_PARASOL__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .4byte 0x805577E0 + .byte4 $$248771 .4byte 0 - .4byte 0x805577E8 + .byte4 $$248772 .4byte 0 - .4byte 0x8045D5FC + .byte4 $$248773 .4byte 0 - .4byte 0x80557768 + .byte4 $$248746 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8045D608 + .byte4 $$248774 .4byte 0 - .4byte 0x805577F0 + .byte4 $$248775 .4byte 0 - .4byte 0x805577F8 + .byte4 $$248776 .4byte 0 - .4byte 0x80557800 + .byte4 $$248777 .4byte 0 .global T_CMD_WING__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_WING__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .4byte 0x8045D614 + .byte4 $$248778 .4byte 0 - .4byte 0x8045D620 + .byte4 $$248779 .4byte 0 - .4byte 0x80557808 + .byte4 $$248780 .4byte 0 - .4byte 0x8045D630 + .byte4 $$248781 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8045D640 + .byte4 $$248782 .4byte 0 - .4byte 0x8045D64C + .byte4 $$248783 .4byte 0 - .4byte 0x8045D658 + .byte4 $$248784 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80557810 + .byte4 $$248785 .4byte 0 - .4byte 0x8045D668 + .byte4 $$248786 .4byte 0 - .4byte 0x8045D674 + .byte4 $$248787 .4byte 0 .global T_CMD_FIGHTER__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_FIGHTER__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .4byte 0x80557710 + .byte4 $$248732 .4byte 0 - .4byte 0x80557818 + .byte4 $$248788 .4byte 0 - .4byte 0x80557770 + .byte4 $$248748 .4byte 0 - .4byte 0x8045D680 + .byte4 $$248789 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8045D68C + .byte4 $$248790 .4byte 0 - .4byte 0x8045D698 + .byte4 $$248791 .4byte 0 - .4byte 0x8045D6A4 + .byte4 $$248792 .4byte 0 - .4byte 0x80557820 + .byte4 $$248793 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x805577D0 + .byte4 $$248767 .4byte 0 - .4byte 0x8045D6B0 + .byte4 $$248794 .4byte 0 - .4byte 0x8045D6BC + .byte4 $$248795 .4byte 0 - .4byte 0x8045D6C8 + .byte4 $$248796 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8045D6D8 + .byte4 $$248797 .4byte 0 - .4byte 0x805577A8 + .byte4 $$248758 .4byte 0 - .4byte 0x805577F8 + .byte4 $$248776 .4byte 0 - .4byte 0x8045D6E4 + .byte4 $$248798 .4byte 0 .global T_CMD_SMASH__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_SMASH__Q25pause24$$2unnamed$$2ManualData_cpp$$2: - .4byte 0x80557828 + .byte4 $$248799 .4byte 0 - .4byte 0x80557728 + .byte4 $$248736 .4byte 0 - .4byte 0x8055782C + .byte4 $$248800 .4byte 0 - .4byte 0x80557834 + .byte4 $$248801 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8045D6F0 + .byte4 $$248802 .4byte 0 - .4byte 0x80557840 + .byte4 $$248803 .4byte 0 - .4byte 0x80557848 + .byte4 $$248804 .4byte 0 - .4byte 0x8045D700 + .byte4 $$248805 .4byte 0 .global T_ENTRIES__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_ENTRIES__Q25pause24$$2unnamed$$2ManualData_cpp$$2: .4byte 0 - .4byte 0x80557758 + .byte4 $$248742 .4byte 0 - .4byte 0x80415080 + .byte4 T_CMD_NORMAL__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x00000008 .4byte 0 - .4byte 0x8045D710 - .4byte 0x80557758 - .4byte 0x804150C0 + .byte4 $$248895 + .byte4 $$248742 + .byte4 T_CMD_NORMAL_IN_WATER__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x00000003 .4byte 0 - .4byte 0x80557850 + .byte4 $$248896 .4byte 0 - .4byte 0x804150D8 + .byte4 T_CMD_SWORD__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x0000000D .4byte 0x01000000 - .4byte 0x80557858 + .byte4 $$248897 .4byte 0 - .4byte 0x80415140 + .byte4 T_CMD_WHIP__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x0000000E .4byte 0 - .4byte 0x80557860 + .byte4 $$248898 .4byte 0 - .4byte 0x804151B0 + .byte4 T_CMD_SPARK__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x00000009 .4byte 0x01000000 - .4byte 0x80557868 + .byte4 $$248899 .4byte 0 - .4byte 0x804151F8 + .byte4 T_CMD_PARASOL__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x00000009 .4byte 0 - .4byte 0x80557870 + .byte4 $$248900 .4byte 0 - .4byte 0x80415240 + .byte4 T_CMD_WING__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x0000000C .4byte 0x01000000 - .4byte 0x80557878 + .byte4 $$248901 .4byte 0 - .4byte 0x804152A0 + .byte4 T_CMD_FIGHTER__Q25pause24$$2unnamed$$2ManualData_cpp$$2 .4byte 0x00000013 .4byte 0 - .4byte 0x80557880 + .byte4 $$248902 .4byte 0 - .4byte 0x80415338 + .byte4 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 6f981ebd..9b6d4b51 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: - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 + .byte4 $$248753 + .byte4 $$248753 + .byte4 $$248753 + .byte4 $$248753 + .byte4 $$248753 + .byte4 $$248753 .4byte 0 - .4byte 0x80558810 - .4byte 0x80461D60 - .4byte 0x80461D70 - .4byte 0x80461D80 - .4byte 0x80558818 - .4byte 0x80461D90 - .4byte 0x80461DA4 - .4byte 0x80461DB0 - .4byte 0x80461DC0 - .4byte 0x80461DD8 - .4byte 0x80461DF0 - .4byte 0x8055881C - .4byte 0x80461E08 - .4byte 0x80461DA4 - .4byte 0x80461E24 - .4byte 0x80461E34 - .4byte 0x80461E48 - .4byte 0x80461E5C - .4byte 0x80558818 - .4byte 0x80558820 - .4byte 0x80558820 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 + .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 0 - .4byte 0x80461E70 - .4byte 0x80461E80 - .4byte 0x80461E90 - .4byte 0x80461EA4 - .4byte 0x80558824 - .4byte 0x80558820 - .4byte 0x80558820 - .4byte 0x80461EB8 - .4byte 0x80461EC8 - .4byte 0x80461EE0 - .4byte 0x80461EF8 - .4byte 0x80558824 - .4byte 0x80558820 - .4byte 0x80558820 - .4byte 0x80558828 - .4byte 0x80461F10 - .4byte 0x80461F20 - .4byte 0x80461F30 - .4byte 0x80558818 - .4byte 0x80461F40 - .4byte 0x80461DA4 - .4byte 0x80461F54 - .4byte 0x80461F64 - .4byte 0x80461F7C - .4byte 0x80461F94 - .4byte 0x80558818 - .4byte 0x80558820 - .4byte 0x80558820 - .4byte 0x80461FAC - .4byte 0x80461FB8 - .4byte 0x80461FC8 - .4byte 0x80461FD8 - .4byte 0x80558824 - .4byte 0x80461FE8 - .4byte 0x80462000 - .4byte 0x80462010 - .4byte 0x8046201C - .4byte 0x80462030 - .4byte 0x80462044 - .4byte 0x80558818 - .4byte 0x80558820 - .4byte 0x80558820 - .4byte 0x80558830 - .4byte 0x80462058 - .4byte 0x80462068 - .4byte 0x80462078 - .4byte 0x80558824 - .4byte 0x80462088 - .4byte 0x80462000 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 + .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 0 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 + .byte4 $$248753 + .byte4 $$248753 + .byte4 $$248753 + .byte4 $$248753 + .byte4 $$248753 + .byte4 $$248753 .4byte 0 - .4byte 0x80558838 - .4byte 0x8046209C - .4byte 0x804620AC - .4byte 0x804620BC - .4byte 0x80558840 - .4byte 0x804620CC - .4byte 0x804620E8 - .4byte 0x804620F8 - .4byte 0x80462108 - .4byte 0x8046211C - .4byte 0x80462134 - .4byte 0x80558844 - .4byte 0x80558820 - .4byte 0x80558820 - .4byte 0x8046214C - .4byte 0x80462160 - .4byte 0x80462178 - .4byte 0x80462190 - .4byte 0x80558848 - .4byte 0x80558820 - .4byte 0x80558820 - .4byte 0x804621A8 - .4byte 0x804621B4 - .4byte 0x804621C8 - .4byte 0x804621DC - .4byte 0x80558850 - .4byte 0x804621F0 - .4byte 0x80558820 - .4byte 0x80462200 - .4byte 0x80462210 - .4byte 0x80462224 - .4byte 0x80462238 - .4byte 0x80558858 - .4byte 0x80558820 - .4byte 0x80558820 - .4byte 0x8046224C - .4byte 0x80462258 - .4byte 0x8046226C - .4byte 0x80462280 - .4byte 0x80558848 - .4byte 0x80558820 - .4byte 0x80558820 - .4byte 0x80462294 - .4byte 0x804622A0 - .4byte 0x804622B4 - .4byte 0x804622C8 - .4byte 0x8055885C - .4byte 0x80558820 - .4byte 0x80558820 - .4byte 0x804622DC - .4byte 0x804622EC - .4byte 0x80462300 - .4byte 0x80462314 - .4byte 0x8055885C - .4byte 0x80558820 - .4byte 0x80558820 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 + .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 0 - .4byte 0x80462328 - .4byte 0x80462334 - .4byte 0x80462348 - .4byte 0x80462358 - .4byte 0x8055885C - .4byte 0x80558820 - .4byte 0x80558820 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 - .4byte 0x80558808 + .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 0 - .4byte 0x80462368 - .4byte 0x80462378 - .4byte 0x8046238C - .4byte 0x804623A4 - .4byte 0x80558860 - .4byte 0x80558820 - .4byte 0x80558820 - .4byte 0x804623C0 - .4byte 0x804623D0 - .4byte 0x804623E8 - .4byte 0x80462400 - .4byte 0x8055885C - .4byte 0x80558820 - .4byte 0x80558820 - .4byte 0x80462418 - .4byte 0x80462424 - .4byte 0x80462438 - .4byte 0x80462448 - .4byte 0x80558860 - .4byte 0x80558820 - .4byte 0x80558820 - .4byte 0x80558868 - .4byte 0x80462458 - .4byte 0x80462468 - .4byte 0x80462478 - .4byte 0x80558870 - .4byte 0x80558820 - .4byte 0x80558820 + .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 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 - .4byte 0x8045D1D0 + .byte4 $$248890 .4byte 0 - .4byte 0x8045D1DC - .4byte 0x8045D1E8 + .byte4 $$248891 + .byte4 $$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 - .4byte 0x8045D210 - .4byte 0x8045D21C - .4byte 0x8045D228 - .4byte 0x8045D234 - .4byte 0x8045D240 - .4byte 0x8045D24C + .byte4 $$248894 + .byte4 $$248895 + .byte4 $$248896 + .byte4 $$248897 + .byte4 $$248898 + .byte4 $$248899 .global $$248901 $$248901: .asciz "JP_Japanese" .global DIRS_JP__21$$2unnamed$$2Message_cpp$$2 DIRS_JP__21$$2unnamed$$2Message_cpp$$2: - .4byte 0x8045D274 + .byte4 $$248901 .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/MessageWindow.s b/asm/src/MessageWindow.s index 152926d4..6d18a015 100644 --- a/asm/src/MessageWindow.s +++ b/asm/src/MessageWindow.s @@ -2078,22 +2078,22 @@ $$257580: $$257614: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803AEDE0 + .byte4 processMessage__Q43scn4step4info13MessageWindowFUl .global $$257687 $$257687: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803AEDE0 + .byte4 processMessage__Q43scn4step4info13MessageWindowFUl .global $$257688 $$257688: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803AEDE0 + .byte4 processMessage__Q43scn4step4info13MessageWindowFUl .global $$257731 $$257731: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803AF1FC + .byte4 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 - .4byte 0x803AF644 - .4byte 0x803AF30C - .4byte 0x803AF34C - .4byte 0x803AF368 + .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 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 - .4byte 0x803AF640 - .4byte 0x803AF36C - .4byte 0x803AF3AC - .4byte 0x803AF3C8 + .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 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 - .4byte 0x803AF63C - .4byte 0x803AF3D0 - .4byte 0x803AF410 - .4byte 0x803AF42C + .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 .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 - .4byte 0x803AF638 - .4byte 0x803AF458 - .4byte 0x803AF498 - .4byte 0x803AF4B4 + .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 0 .4byte 0 .4byte 0 diff --git a/asm/src/Meta.s b/asm/src/Meta.s index 284ee4f8..ab2b6717 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: - .4byte 0x8055B088 + .byte4 $$248727 .4byte 0x0000000C - .4byte 0x8055B090 + .byte4 $$248728 .4byte 0x0000000C - .4byte 0x8055B098 + .byte4 $$248729 .4byte 0x0000000C - .4byte 0x8055B0A0 + .byte4 $$248730 .4byte 0x0000000C - .4byte 0x8055B0A8 + .byte4 $$248731 .4byte 0x0000000C - .4byte 0x8055B0B0 + .byte4 $$248732 .4byte 0x0000000C - .4byte 0x8055B0B8 + .byte4 $$248733 .4byte 0x0000000C - .4byte 0x8048ACA8 + .byte4 $$248734 .4byte 0x0000000C - .4byte 0x8055B0C0 + .byte4 $$248735 .4byte 0x0000000C - .4byte 0x8055B0C8 + .byte4 $$248736 .4byte 0x0000000C - .4byte 0x8055B0D0 + .byte4 $$248737 .4byte 0x0000000C - .4byte 0x8048ACB4 + .byte4 $$248738 .4byte 0x0000000C - .4byte 0x8055B0D8 + .byte4 $$248739 .4byte 0x0000000C - .4byte 0x8048ACC0 + .byte4 $$248740 .4byte 0x0000000C - .4byte 0x8048ACCC + .byte4 $$248741 .4byte 0x0000000C - .4byte 0x8055B0E0 + .byte4 $$248742 .4byte 0x0000000C - .4byte 0x8048ACDC + .byte4 $$248743 .4byte 0x0000000C - .4byte 0x8048ACE8 + .byte4 $$248744 .4byte 0x0000000C .4byte 0 .4byte 0 @@ -155,15 +155,15 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055B0E8 + .byte4 $$248745 .4byte 0x0000000C - .4byte 0x8048ACF4 + .byte4 $$248746 .4byte 0x0000000C - .4byte 0x8048AD00 + .byte4 $$248747 .4byte 0x0000000C - .4byte 0x8048AD0C + .byte4 $$248748 .4byte 0x0000000C - .4byte 0x8055B0F0 + .byte4 $$248749 .4byte 0x0000000C .4byte 0 .4byte 0 @@ -197,21 +197,21 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048AD18 + .byte4 $$248750 .4byte 0x0000000C - .4byte 0x8048AD28 + .byte4 $$248751 .4byte 0x0000000C - .4byte 0x8048AD38 + .byte4 $$248752 .4byte 0x0000000C - .4byte 0x8048AD48 + .byte4 $$248753 .4byte 0x0000000C - .4byte 0x8048AD58 + .byte4 $$248754 .4byte 0x0000000C - .4byte 0x8048AD64 + .byte4 $$248755 .4byte 0x0000000C - .4byte 0x8048AD70 + .byte4 $$248756 .4byte 0x0000000C - .4byte 0x8048AD7C + .byte4 $$248757 .4byte 0x0000000C .4byte 0 .4byte 0 @@ -235,25 +235,25 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055B0F4 + .byte4 $$248758 .4byte 0x0000000C - .4byte 0x8048AD88 + .byte4 $$248759 .4byte 0x0000000C - .4byte 0x8055B0F4 + .byte4 $$248758 .4byte 0x0000000C - .4byte 0x8048AD88 + .byte4 $$248759 .4byte 0x0000000C - .4byte 0x8048AD94 + .byte4 $$248760 .4byte 0x0000000C - .4byte 0x8055B0FC + .byte4 $$248761 .4byte 0x0000000C - .4byte 0x8048ADA0 + .byte4 $$248762 .4byte 0x0000000C - .4byte 0x8055B104 + .byte4 $$248763 .4byte 0x0000000C - .4byte 0x8048ADAC + .byte4 $$248764 .4byte 0x0000000C - .4byte 0x8048ADC4 + .byte4 $$248765 .4byte 0x0000000C .4byte 0 .4byte 0 @@ -267,115 +267,115 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055B108 + .byte4 $$248766 .4byte 0x0000000C - .4byte 0x8055B110 + .byte4 $$248767 .4byte 0x0000000C - .4byte 0x8055B118 + .byte4 $$248768 .4byte 0x0000000C - .4byte 0x8055B120 + .byte4 $$248769 .4byte 0x0000000C - .4byte 0x8048ADD8 + .byte4 $$248770 .4byte 0x0000000C - .4byte 0x8048ADE4 + .byte4 $$248771 .4byte 0x0000000C - .4byte 0x8055B128 + .byte4 $$248772 .4byte 0x0000000C - .4byte 0x8055B130 + .byte4 $$248773 .4byte 0x0000000C - .4byte 0x8055B138 + .byte4 $$248774 .4byte 0x0000000C - .4byte 0x8055B140 + .byte4 $$248775 .4byte 0x0000000C - .4byte 0x8055B148 + .byte4 $$248776 .4byte 0x0000000C - .4byte 0x8055B150 + .byte4 $$248777 .4byte 0x0000000C - .4byte 0x8055B158 + .byte4 $$248778 .4byte 0x0000000C - .4byte 0x8055B160 + .byte4 $$248779 .4byte 0x0000000C .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055B088 + .byte4 $$248727 .4byte 0x0000000C - .4byte 0x8055B0B0 + .byte4 $$248732 .4byte 0x0000000C - .4byte 0x8055B168 + .byte4 $$248780 .4byte 0x0000000C .4byte 0 .4byte 0 - .4byte 0x8055B170 + .byte4 $$248781 .4byte 0x0000000C .4byte 0 .4byte 0 - .4byte 0x8055B178 + .byte4 $$248782 .4byte 0x0000000C - .4byte 0x8055B180 + .byte4 $$248783 .4byte 0x0000000C .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048ADF0 + .byte4 $$248784 .4byte 0x0000000C - .4byte 0x8048ADFC + .byte4 $$248785 .4byte 0x0000000C - .4byte 0x8048AE08 + .byte4 $$248786 .4byte 0x0000000C - .4byte 0x8055B188 + .byte4 $$248787 .4byte 0x0000000C - .4byte 0x8055B190 + .byte4 $$248788 .4byte 0x0000000C - .4byte 0x8048AE14 + .byte4 $$248789 .4byte 0x0000000C - .4byte 0x8048AE20 + .byte4 $$248790 .4byte 0x0000000C - .4byte 0x8048AE34 + .byte4 $$248791 .4byte 0x0000000C - .4byte 0x8048AE44 + .byte4 $$248792 .4byte 0x0000000C - .4byte 0x8048AE50 + .byte4 $$248793 .4byte 0x0000000C - .4byte 0x8048AE60 + .byte4 $$248794 .4byte 0x0000000C - .4byte 0x8055B198 + .byte4 $$248795 .4byte 0x0000000C - .4byte 0x8055B198 + .byte4 $$248795 .4byte 0x0000000C - .4byte 0x8055B198 + .byte4 $$248795 .4byte 0x0000000C - .4byte 0x8048AE70 + .byte4 $$248796 .4byte 0x0000000C - .4byte 0x8048AE7C + .byte4 $$248797 .4byte 0x0000000C - .4byte 0x8048AE88 + .byte4 $$248798 .4byte 0x0000000C .4byte 0 .4byte 0 - .4byte 0x8055B088 + .byte4 $$248727 .4byte 0x0000000C - .4byte 0x8048AE98 + .byte4 $$248799 .4byte 0x0000000C - .4byte 0x8048AD00 + .byte4 $$248747 .4byte 0x0000000C - .4byte 0x8048AEA4 + .byte4 $$248800 .4byte 0x0000000C - .4byte 0x8048AEB4 + .byte4 $$248801 .4byte 0x0000000C - .4byte 0x8048AEC4 + .byte4 $$248802 .4byte 0x0000000C - .4byte 0x8048AED8 + .byte4 $$248803 .4byte 0x0000000C - .4byte 0x8048AEE8 + .byte4 $$248804 .4byte 0x0000000C - .4byte 0x8048AF00 + .byte4 $$248805 .4byte 0x0000000C - .4byte 0x8055B1A0 + .byte4 $$248806 .4byte 0x0000000C - .4byte 0x8048AF0C + .byte4 $$248807 .4byte 0x0000000C .4byte 0 .4byte 0 @@ -717,103 +717,103 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048AF18 + .byte4 $$248808 .4byte 0x0000000C - .4byte 0x8055B1A8 + .byte4 $$248809 .4byte 0x0000000C - .4byte 0x8048AF28 + .byte4 $$248810 .4byte 0x0000000C - .4byte 0x8055B1B0 + .byte4 $$248811 .4byte 0x0000000C - .4byte 0x8048AF34 + .byte4 $$248812 .4byte 0x0000000C - .4byte 0x8055B1B8 + .byte4 $$248813 .4byte 0x0000000C - .4byte 0x8048AF40 + .byte4 $$248814 .4byte 0x0000000C - .4byte 0x8048AF4C + .byte4 $$248815 .4byte 0x0000000C - .4byte 0x8048AF58 + .byte4 $$248816 .4byte 0x0000000C - .4byte 0x8048AF68 + .byte4 $$248817 .4byte 0x0000000C - .4byte 0x8048AF74 + .byte4 $$248818 .4byte 0x0000000C - .4byte 0x8048AF80 + .byte4 $$248819 .4byte 0x0000000C - .4byte 0x8048AF90 + .byte4 $$248820 .4byte 0x0000000C - .4byte 0x8048AF9C + .byte4 $$248821 .4byte 0x0000000C - .4byte 0x8048AFAC + .byte4 $$248822 .4byte 0x0000000C - .4byte 0x8048AFBC + .byte4 $$248823 .4byte 0x0000000C - .4byte 0x8048AFC8 + .byte4 $$248824 .4byte 0x0000000C - .4byte 0x8048AFD4 + .byte4 $$248825 .4byte 0x0000000C - .4byte 0x8048AFE4 + .byte4 $$248826 .4byte 0x0000000C - .4byte 0x8048AFF8 + .byte4 $$248827 .4byte 0x0000000C - .4byte 0x8048B004 + .byte4 $$248828 .4byte 0x0000000C - .4byte 0x8048B014 + .byte4 $$248829 .4byte 0x0000000C - .4byte 0x8048B024 + .byte4 $$248830 .4byte 0x0000000C - .4byte 0x8048B038 + .byte4 $$248831 .4byte 0x0000000C - .4byte 0x8048B04C + .byte4 $$248832 .4byte 0x0000000C - .4byte 0x8048B064 + .byte4 $$248833 .4byte 0x0000000C - .4byte 0x8048B078 + .byte4 $$248834 .4byte 0x0000000C - .4byte 0x8048B098 + .byte4 $$248835 .4byte 0x0000000C - .4byte 0x8048B0B8 + .byte4 $$248836 .4byte 0x0000000C - .4byte 0x8048B0D8 + .byte4 $$248837 .4byte 0x0000000C - .4byte 0x8048B0EC + .byte4 $$248838 .4byte 0x0000000C - .4byte 0x8048B0FC + .byte4 $$248839 .4byte 0x0000000C - .4byte 0x8048B110 + .byte4 $$248840 .4byte 0x0000000C - .4byte 0x8048B120 + .byte4 $$248841 .4byte 0x0000000C - .4byte 0x8055B1C0 + .byte4 $$248842 .4byte 0x0000000C - .4byte 0x8048B134 + .byte4 $$248843 .4byte 0x0000000C - .4byte 0x8048B150 + .byte4 $$248844 .4byte 0x0000000C - .4byte 0x8048B168 + .byte4 $$248845 .4byte 0x0000000C - .4byte 0x8048B184 + .byte4 $$248846 .4byte 0x0000000C - .4byte 0x8048B198 + .byte4 $$248847 .4byte 0x0000000C - .4byte 0x8048B1A8 + .byte4 $$248848 .4byte 0x0000000C - .4byte 0x8048B1B8 + .byte4 $$248849 .4byte 0x0000000C - .4byte 0x8048B1C8 + .byte4 $$248850 .4byte 0x0000000C - .4byte 0x8048B1E0 + .byte4 $$248851 .4byte 0x0000000C - .4byte 0x8048B1F4 + .byte4 $$248852 .4byte 0x0000000C - .4byte 0x8048B204 + .byte4 $$248853 .4byte 0x0000000C - .4byte 0x8048B218 + .byte4 $$248854 .4byte 0x0000000C - .4byte 0x8048B228 + .byte4 $$248855 .4byte 0x0000000C - .4byte 0x8048B238 + .byte4 $$248856 .4byte 0x0000000C .4byte 0 .4byte 0 @@ -949,39 +949,39 @@ $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8048B24C + .byte4 $$248857 .4byte 0x0000000C - .4byte 0x8048B258 + .byte4 $$248858 .4byte 0x0000000C - .4byte 0x8048B264 + .byte4 $$248859 .4byte 0x0000000C - .4byte 0x8048B270 + .byte4 $$248860 .4byte 0x0000000C - .4byte 0x8055B1C8 + .byte4 $$248861 .4byte 0x0000000C - .4byte 0x8048B27C + .byte4 $$248862 .4byte 0x0000000C - .4byte 0x8055B088 + .byte4 $$248727 .4byte 0x0000000C - .4byte 0x8055B088 + .byte4 $$248727 .4byte 0x0000000C - .4byte 0x8055B088 + .byte4 $$248727 .4byte 0x0000000C - .4byte 0x8055B088 + .byte4 $$248727 .4byte 0x0000000C - .4byte 0x8055B088 + .byte4 $$248727 .4byte 0x0000000C - .4byte 0x8055B088 + .byte4 $$248727 .4byte 0x0000000C - .4byte 0x8055B1D0 + .byte4 $$248863 .4byte 0x0000000C - .4byte 0x8055B1D8 + .byte4 $$248864 .4byte 0x0000000C - .4byte 0x8048B288 + .byte4 $$248865 .4byte 0x0000000C - .4byte 0x8055B1E0 + .byte4 $$248866 .4byte 0x0000000C - .4byte 0x8048B294 + .byte4 $$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: - .4byte 0x8055B1E8 - .4byte 0x8048B2A0 - .4byte 0x8048B2AC - .4byte 0x8048B2B8 - .4byte 0x8055B1F0 - .4byte 0x8048B2C4 - .4byte 0x8048B2B8 - .4byte 0x8048B2B8 - .4byte 0x8048B2D0 - .4byte 0x8048B2E0 - .4byte 0x8048B2B8 - .4byte 0x8048B2A0 - .4byte 0x8055B1F8 - .4byte 0x8055B200 - .4byte 0x8048B2AC - .4byte 0x8048B2B8 - .4byte 0x8048B2B8 - .4byte 0x8048B2C4 - .4byte 0x8055B208 - .4byte 0x8055B1F0 - .4byte 0x8055B210 - .4byte 0x8055B1E8 - .4byte 0x8055B1E8 - .4byte 0x8055B1E8 - .4byte 0x8055B218 - .4byte 0x8055B218 - .4byte 0x8055B218 - .4byte 0x8055B218 - .4byte 0x8055B218 - .4byte 0x8055B218 + .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 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248727 diff --git a/asm/src/MintAnim.s b/asm/src/MintAnim.s index b1222722..b67b0851 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 - .4byte 0x8019AC60 ;# ptr + .byte4 __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 36bbb821..6767f9d6 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 - .4byte 0x803D30B4 + .byte4 __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 3fc84500..bc1d4578 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 - .4byte 0x80277634 ;# ptr + .byte4 __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 d18c9a2f..4117cb8b 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 - .4byte 0x802329CC ;# ptr + .byte4 __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 aa56efcd..84249b10 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 - .4byte 0x80266298 ;# ptr + .byte4 __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 78230539..4f1531dc 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 - .4byte 0x8030B068 + .byte4 __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 87c7cb69..5c57bc37 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 - .4byte 0x803F9B74 + .byte4 __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 eeb2bd61..dae97a88 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 - .4byte 0x802FDDB0 + .byte4 __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 581aac14..5367b10c 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 - .4byte 0x8026FD78 ;# ptr + .byte4 __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 ce014c38..d3a176b0 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 - .4byte 0x8028ADD4 ;# ptr + .byte4 __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 f4f1dff4..7fc9824e 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 - .4byte 0x8019AC8C ;# ptr + .byte4 __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 ebe7a467..e882494c 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 - .4byte 0x8034B68C + .byte4 __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 96df1bec..8603de4b 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 - .4byte 0x8019AD2C ;# ptr + .byte4 __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 cec33785..4a47d255 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 - .4byte 0x8034B6B0 + .byte4 __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 231ec2f6..f7cc3ca9 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 - .4byte 0x8019ADB8 ;# ptr + .byte4 __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 1987af23..37b842fe 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 - .4byte 0x8019ADE0 ;# ptr + .byte4 __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 a8539b49..33a05b52 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 - .4byte 0x8019AE84 ;# ptr + .byte4 __sinit_$$3MintModel_cpp .section .ctors, "wa" # 0x80406260 - 0x80406540 - .4byte 0x8026FDC8 ;# ptr + .byte4 __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 2ed8961e..e93d31ed 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 - .4byte 0x8018E9A4 ;# ptr + .byte4 __sinit_$$3MintModelAccessor_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$253943 diff --git a/asm/src/MintModelRotCtrl.s b/asm/src/MintModelRotCtrl.s index ec5c2787..8c1d609c 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 - .4byte 0x8026FE88 ;# ptr + .byte4 __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 4ec044d1..eca2f155 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 - .4byte 0x80319804 + .byte4 __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 7902c799..9eb4a10c 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 - .4byte 0x8019AF3C ;# ptr + .byte4 __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 d89fe37f..da0cd789 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 - .4byte 0x8018EB04 ;# ptr + .byte4 __sinit_$$3MintNodeAccessor_cpp .section .bss, "wa" # 0x80496700 - 0x805643FC .global $$253785 diff --git a/asm/src/MintOCollManager.s b/asm/src/MintOCollManager.s index ee94fbeb..64615aa8 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 - .4byte 0x803CABB4 + .byte4 __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 e47f736d..65f478d6 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 - .4byte 0x80270684 ;# ptr + .byte4 __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 501ff27f..80903a72 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 - .4byte 0x80402A64 + .byte4 __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 47dc9d10..e58b40ea 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 - .4byte 0x8019AF60 ;# ptr + .byte4 __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 da38af0c..628fa034 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 - .4byte 0x802706AC ;# ptr + .byte4 __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 db35b08f..3995cf2a 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: - .4byte 0x80557530 - .4byte 0x80557538 - .4byte 0x80557540 + .byte4 $$249078 + .byte4 $$249079 + .byte4 $$249080 .global __vt__Q26mintvm13MintAllocator __vt__Q26mintvm13MintAllocator: .4byte 0 .4byte 0 - .4byte 0x801C5C54 ;# ptr - .4byte 0x801C5F38 ;# ptr - .4byte 0x801C5ECC ;# ptr + .byte4 __dt__Q26mintvm13MintAllocatorFv + .byte4 mintAlloc__Q26mintvm13MintAllocatorFUl + .byte4 mintFree__Q26mintvm13MintAllocatorFPv .global __vt__Q26mintvm10IAllocator __vt__Q26mintvm10IAllocator: .4byte 0 .4byte 0 - .4byte 0x801C5BB8 ;# ptr + .byte4 __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 932c00e8..05113b88 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 - .4byte 0x802706D4 ;# ptr + .byte4 __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 376035c9..fbe88cdb 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 - .4byte 0x8031F7BC + .byte4 __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 28c9725b..4dbb3f9c 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 - .4byte 0x803CDCD4 + .byte4 __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 ee757b85..45bbdd57 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 - .4byte 0x803CDCFC + .byte4 __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 ab28124b..1da5f072 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 - .4byte 0x8019AFD0 ;# ptr + .byte4 __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 7da3e1c8..0d6293a3 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 - .4byte 0x802662BC ;# ptr + .byte4 __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 f4d1e957..b2e64a47 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: - .4byte 0x8035C6B4 - .4byte 0x8035C6B4 - .4byte 0x8035C6B4 - .4byte 0x8035C6B4 - .4byte 0x8035C7D4 - .4byte 0x8035BC10 - .4byte 0x8035BE24 + .byte4 Model__Q53scn4step4hero9modeldesc5KirbyFv + .byte4 Model__Q53scn4step4hero9modeldesc5KirbyFv + .byte4 Model__Q53scn4step4hero9modeldesc5KirbyFv + .byte4 Model__Q53scn4step4hero9modeldesc5KirbyFv + .byte4 Model__Q53scn4step4hero9modeldesc4MetaFv + .byte4 Model__Q53scn4step4hero9modeldesc6DededeFv + .byte4 Model__Q53scn4step4hero9modeldesc3DeeFv .global $$258152 $$258152: - .4byte 0x8035C634 - .4byte 0x8035C634 - .4byte 0x8035C634 - .4byte 0x8035C634 - .4byte 0x8035C77C - .4byte 0x8035BBE4 - .4byte 0x8035BDCC + .byte4 Anim__Q53scn4step4hero9modeldesc5KirbyFv + .byte4 Anim__Q53scn4step4hero9modeldesc5KirbyFv + .byte4 Anim__Q53scn4step4hero9modeldesc5KirbyFv + .byte4 Anim__Q53scn4step4hero9modeldesc5KirbyFv + .byte4 Anim__Q53scn4step4hero9modeldesc4MetaFv + .byte4 Anim__Q53scn4step4hero9modeldesc6DededeFv + .byte4 Anim__Q53scn4step4hero9modeldesc3DeeFv .global $$258162 $$258162: - .4byte 0x8035C65C - .4byte 0x8035C65C - .4byte 0x8035C65C - .4byte 0x8035C65C - .4byte 0x8035C7A4 - .4byte 0x8035BC0C - .4byte 0x8035BDF4 + .byte4 MeshFlip__Q53scn4step4hero9modeldesc5KirbyFv + .byte4 MeshFlip__Q53scn4step4hero9modeldesc5KirbyFv + .byte4 MeshFlip__Q53scn4step4hero9modeldesc5KirbyFv + .byte4 MeshFlip__Q53scn4step4hero9modeldesc5KirbyFv + .byte4 MeshFlip__Q53scn4step4hero9modeldesc4MetaFv + .byte4 MeshFlip__Q53scn4step4hero9modeldesc6DededeFv + .byte4 MeshFlip__Q53scn4step4hero9modeldesc3DeeFv .global $$258172 $$258172: - .4byte 0x8035C778 - .4byte 0x8035C778 - .4byte 0x8035C778 - .4byte 0x8035C778 - .4byte 0x8035C8A8 - .4byte 0x8035BCE4 - .4byte 0x8035BEF8 + .byte4 Script__Q53scn4step4hero9modeldesc5KirbyFv + .byte4 Script__Q53scn4step4hero9modeldesc5KirbyFv + .byte4 Script__Q53scn4step4hero9modeldesc5KirbyFv + .byte4 Script__Q53scn4step4hero9modeldesc5KirbyFv + .byte4 Script__Q53scn4step4hero9modeldesc4MetaFv + .byte4 Script__Q53scn4step4hero9modeldesc6DededeFv + .byte4 Script__Q53scn4step4hero9modeldesc3DeeFv .global $$258190 $$258190: - .4byte 0x80484E28 - .4byte 0x80484E48 - .4byte 0x80484E70 - .4byte 0x80484E90 - .4byte 0x80484EB4 - .4byte 0x80484ED8 - .4byte 0x80484EFC + .byte4 $$258183 + .byte4 $$258184 + .byte4 $$258185 + .byte4 $$258186 + .byte4 $$258187 + .byte4 $$258188 + .byte4 $$258189 .global $$258207 $$258207: - .4byte 0x80484F20 - .4byte 0x80484F20 - .4byte 0x80484F20 - .4byte 0x80484F20 - .4byte 0x80484F44 - .4byte 0x80484F68 - .4byte 0x80484F90 + .byte4 $$258203 + .byte4 $$258203 + .byte4 $$258203 + .byte4 $$258203 + .byte4 $$258204 + .byte4 $$258205 + .byte4 $$258206 .global $$258220 $$258220: - .4byte 0x80484FB4 - .4byte 0x80484FB4 - .4byte 0x80484FB4 - .4byte 0x80484FB4 - .4byte 0x80484FDC - .4byte 0x80485000 - .4byte 0x80485028 + .byte4 $$258216 + .byte4 $$258216 + .byte4 $$258216 + .byte4 $$258216 + .byte4 $$258217 + .byte4 $$258218 + .byte4 $$258219 .4byte 0 .global $$258964 $$258964: - .4byte 0x8055AA08 - .4byte 0x804850E0 - .4byte 0x804850EC - .4byte 0x804850F8 + .byte4 $$258960 + .byte4 $$258961 + .byte4 $$258962 + .byte4 $$258963 .global $$258967 $$258967: - .4byte 0x8055AA08 - .4byte 0x8055AA08 - .4byte 0x8055AA08 - .4byte 0x8055AA08 + .byte4 $$258960 + .byte4 $$258960 + .byte4 $$258960 + .byte4 $$258960 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$256416 @@ -5400,20 +5400,20 @@ $$256416: __vt__Q33g3d5Model14ScnObjCallback: .4byte 0 .4byte 0 - .4byte 0x80190270 ;# ptr - .4byte 0x801903A4 ;# ptr - .4byte 0x800E9D20 ;# ptr - .4byte 0x801904C4 ;# ptr - .4byte 0x800EC990 ;# ptr - .4byte 0x800EC9A0 ;# ptr + .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 .global __vt__Q33g3d5Model17CalcWorldCallback __vt__Q33g3d5Model17CalcWorldCallback: .4byte 0 .4byte 0 - .4byte 0x8018FFB0 ;# ptr - .4byte 0x80190024 ;# ptr - .4byte 0x800E3740 ;# ptr - .4byte 0x800E3750 ;# ptr + .byte4 __dt__Q33g3d5Model17CalcWorldCallbackFv + .byte4 ExecCallbackA__Q33g3d5Model17CalcWorldCallbackFPQ34nw4r3g3d12ChrAnmResultQ34nw4r3g3d6ResMdlPQ34nw4r3g3d16FuncObjCalcWorld + .byte4 ExecCallbackB__Q34nw4r3g3d18ICalcWorldCallbackFPQ34nw4r3g3d13WorldMtxManipQ34nw4r3g3d6ResMdlPQ34nw4r3g3d16FuncObjCalcWorld + .byte4 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 - .4byte 0x8019B11C ;# ptr - .4byte 0x8019B194 ;# ptr + .byte4 __dt__Q24gobj5ModelFv + .byte4 g3dModel__Q24gobj5ModelFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5chara5Model __vt__Q43scn4step5chara5Model: .4byte 0 .4byte 0 - .4byte 0x80270C60 ;# ptr - .4byte 0x802710AC ;# ptr - .4byte 0x802710CC ;# ptr - .4byte 0x80271124 ;# ptr + .byte4 __dt__Q43scn4step5chara5ModelFv + .byte4 onScriptRequested__Q43scn4step5chara5ModelFRCQ24gobj6ScriptUlUl + .byte4 onScriptExecPre__Q43scn4step5chara5ModelFRCQ24gobj6Script + .byte4 onScriptExecPost__Q43scn4step5chara5ModelFRCQ24gobj6Script .section .data, "wa" # 0x80421040 - 0x80496700 .global $$258183 @@ -5572,10 +5572,10 @@ $$258997: __vt__Q43scn4step4hero5Model: .4byte 0 .4byte 0 - .4byte 0x8034D120 - .4byte 0x8034D83C - .4byte 0x8034D9F4 - .4byte 0x8034DADC + .byte4 __dt__Q43scn4step4hero5ModelFv + .byte4 onScriptRequested__Q43scn4step4hero5ModelFRCQ24gobj6ScriptUlUl + .byte4 onScriptExecPre__Q43scn4step4hero5ModelFRCQ24gobj6Script + .byte4 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: - .4byte 0x8055AA10 + .byte4 $$258993 .global $$258998 $$258998: - .4byte 0x80485104 + .byte4 $$258997 .global $$260515 $$260515: .4byte 0xBE99999A diff --git a/asm/src/ModelAnimAccessor.s b/asm/src/ModelAnimAccessor.s index a95aa470..4c876837 100644 --- a/asm/src/ModelAnimAccessor.s +++ b/asm/src/ModelAnimAccessor.s @@ -218,8 +218,8 @@ onFrameChanged__Q23g3d34NullModelAnimAccessorEventReceiverFRCQ23g3d17ModelAnimAc __vt__Q23g3d34NullModelAnimAccessorEventReceiver: .4byte 0 .4byte 0 - .4byte 0x80191E8C ;# ptr - .4byte 0x80191EE8 ;# ptr + .byte4 __dt__Q23g3d34NullModelAnimAccessorEventReceiverFv + .byte4 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 86e22992..e7337c1f 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 - .4byte 0x80232B24 ;# ptr - .4byte 0x8023DB80 ;# ptr + .byte4 __sinit_$$3ModelDesc_cpp + .byte4 __sinit_$$3ModelDesc_cpp .section .ctors, "wa" # 0x80406260 - 0x80406540 - .4byte 0x80247D14 ;# ptr - .4byte 0x802488FC ;# ptr - .4byte 0x80249E00 ;# ptr - .4byte 0x8024B7E8 ;# ptr - .4byte 0x8025C8DC ;# ptr + .byte4 __sinit_$$3ModelDesc_cpp + .byte4 __sinit_$$3ModelDesc_cpp + .byte4 __sinit_$$3ModelDesc_cpp + .byte4 __sinit_$$3ModelDesc_cpp + .byte4 __sinit_$$3ModelDesc_cpp .section .ctors, "wa" # 0x80406260 - 0x80406540 - .4byte 0x802966DC ;# ptr - .4byte 0x802975A8 ;# ptr - .4byte 0x80299448 ;# ptr - .4byte 0x8029D284 ;# ptr - .4byte 0x8029E8F0 ;# ptr - .4byte 0x8029F4C4 ;# ptr - .4byte 0x802A0F98 ;# ptr - .4byte 0x802A2E54 ;# ptr - .4byte 0x802A3DC4 ;# ptr - .4byte 0x802A5630 ;# ptr - .4byte 0x802A6394 ;# ptr - .4byte 0x802A7520 ;# ptr - .4byte 0x802AD3F4 ;# ptr - .4byte 0x802AE2FC ;# ptr - .4byte 0x802AEF8C ;# ptr - .4byte 0x802AFCF0 ;# ptr - .4byte 0x802B2388 ;# ptr - .4byte 0x802B4A78 ;# ptr - .4byte 0x802B625C ;# ptr - .4byte 0x802B78C8 ;# ptr - .4byte 0x802B9108 ;# ptr - .4byte 0x802BA71C ;# ptr - .4byte 0x802BB850 ;# ptr - .4byte 0x802BCE78 ;# ptr - .4byte 0x802BFC34 ;# ptr - .4byte 0x802C2238 ;# ptr - .4byte 0x802C3614 ;# ptr - .4byte 0x802C50B0 ;# ptr - .4byte 0x802C62B4 ;# ptr - .4byte 0x802C73DC ;# ptr - .4byte 0x802C7EB0 ;# ptr - .4byte 0x802C9FC8 ;# ptr - .4byte 0x802CB1B4 ;# ptr - .4byte 0x802CFBEC ;# ptr - .4byte 0x802D1FC0 ;# ptr - .4byte 0x802D33C8 ;# ptr - .4byte 0x802D3B38 ;# ptr - .4byte 0x802D678C ;# ptr - .4byte 0x802D9238 ;# ptr - .4byte 0x802D9E2C ;# ptr - .4byte 0x802DBEA0 ;# ptr - .4byte 0x802DD9A8 ;# ptr - .4byte 0x802E07F0 ;# ptr - .4byte 0x802E1794 ;# ptr - .4byte 0x802E2BA4 ;# ptr - .4byte 0x802E38F0 ;# ptr - .4byte 0x802E5480 ;# ptr - .4byte 0x802E6F28 ;# ptr - .4byte 0x802E8CF4 ;# ptr - .4byte 0x802EB0AC ;# ptr - .4byte 0x802ED91C ;# ptr - .4byte 0x802EFBEC ;# ptr - .4byte 0x802F026C ;# ptr - .4byte 0x802F08B4 ;# ptr - .4byte 0x802F1160 ;# ptr + .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 .section .ctors, "wa" # 0x80406260 - 0x80406540 - .4byte 0x803DB2C0 - .4byte 0x803DCBB4 - .4byte 0x803DD290 - .4byte 0x803DE5B8 - .4byte 0x803E2B18 - .4byte 0x803E3774 - .4byte 0x803E4070 - .4byte 0x803E5C00 - .4byte 0x803E7900 - .4byte 0x803E85B0 - .4byte 0x803E99D4 - .4byte 0x803EADB8 - .4byte 0x803ED094 - .4byte 0x803EF6F8 + .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 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80558F10 + .byte4 $$250137 .4byte 0 - .4byte 0x80558F18 + .byte4 $$250138 .4byte 0 - .4byte 0x80464D58 + .byte4 $$250139 .4byte 0 - .4byte 0x80464D64 + .byte4 $$250140 .4byte 0 - .4byte 0x80464D70 + .byte4 $$250141 .4byte 0 - .4byte 0x80464D7C + .byte4 $$250142 .4byte 0 - .4byte 0x80464D88 + .byte4 $$250143 .4byte 0 - .4byte 0x80464D98 + .byte4 $$250144 .4byte 0 - .4byte 0x80464DA4 + .byte4 $$250145 .4byte 0 - .4byte 0x80558F20 + .byte4 $$250146 .4byte 0 - .4byte 0x80558F28 + .byte4 $$250147 .4byte 0 - .4byte 0x80558F30 + .byte4 $$250148 .4byte 0 - .4byte 0x80464DB0 + .byte4 $$250149 .4byte 0 - .4byte 0x80464DBC + .byte4 $$250150 .4byte 0 - .4byte 0x80464DCC + .byte4 $$250151 .4byte 0 - .4byte 0x80464DDC + .byte4 $$250152 .4byte 0 - .4byte 0x80558F38 + .byte4 $$250153 .4byte 0 - .4byte 0x80558F40 + .byte4 $$250154 .4byte 0 - .4byte 0x80464DE8 + .byte4 $$250155 .4byte 0 - .4byte 0x80464DF8 + .byte4 $$250156 .4byte 0 - .4byte 0x80464E04 + .byte4 $$250157 .4byte 0 - .4byte 0x80464E14 + .byte4 $$250158 .4byte 0 - .4byte 0x80464E28 + .byte4 $$250159 .4byte 0 - .4byte 0x80464E38 + .byte4 $$250160 .4byte 0 - .4byte 0x80464E48 + .byte4 $$250161 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80464E58 + .byte4 $$250163 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80464E78 + .byte4 $$250164 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80464E98 + .byte4 $$250165 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80464EB8 + .byte4 $$250166 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80464ED8 + .byte4 $$250167 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80464EF8 + .byte4 $$250168 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80464F18 + .byte4 $$250169 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80464F3C + .byte4 $$250170 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80464F60 + .byte4 $$250171 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80464F84 + .byte4 $$250172 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80464FB0 + .byte4 $$250173 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80464FD0 + .byte4 $$250174 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80464FF0 + .byte4 $$250175 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80465014 + .byte4 $$250176 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80465038 + .byte4 $$250177 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046505C + .byte4 $$250178 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80465080 + .byte4 $$250179 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804650A8 + .byte4 $$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: - .4byte 0x80558F78 + .byte4 $$250137 .4byte 0 - .4byte 0x80558F80 + .byte4 $$250138 .4byte 0 - .4byte 0x80465680 + .byte4 $$250139 .4byte 0 - .4byte 0x8046568C + .byte4 $$250140 .4byte 0 - .4byte 0x80558F84 + .byte4 $$250141 .4byte 0 - .4byte 0x80558F8C + .byte4 $$250142 .4byte 0 - .4byte 0x8046569C + .byte4 $$250143 .4byte 0 - .4byte 0x804656AC + .byte4 $$250144 .4byte 0 - .4byte 0x80558F94 + .byte4 $$250145 .4byte 0 - .4byte 0x80558F9C + .byte4 $$250146 .4byte 0 - .4byte 0x804656B8 + .byte4 $$250147 .4byte 0 - .4byte 0x80558FA8 + .byte4 $$250148 .4byte 0 - .4byte 0x80558FB0 + .byte4 $$250149 .4byte 0 - .4byte 0x80558FB8 + .byte4 $$250150 .4byte 0 - .4byte 0x804656C8 + .byte4 $$250151 .4byte 0 - .4byte 0x80558FC0 + .byte4 $$250152 .4byte 0 - .4byte 0x804656D8 + .byte4 $$250153 .4byte 0 - .4byte 0x80558FC8 + .byte4 $$250154 .4byte 0 - .4byte 0x804656E4 + .byte4 $$250155 .4byte 0 - .4byte 0x804656F0 + .byte4 $$250156 .4byte 0 - .4byte 0x80558FD0 + .byte4 $$250157 .4byte 0 - .4byte 0x80558FD8 + .byte4 $$250158 .4byte 0 - .4byte 0x80558FE0 + .byte4 $$250159 .4byte 0 - .4byte 0x804656FC + .byte4 $$250160 .4byte 0 - .4byte 0x80558FE8 + .byte4 $$250161 .4byte 0 - .4byte 0x80465708 + .byte4 $$250162 .4byte 0 - .4byte 0x80558FF0 + .byte4 $$250163 .4byte 0 - .4byte 0x80465714 + .byte4 $$250164 .4byte 0 - .4byte 0x80465724 + .byte4 $$250165 .4byte 0 - .4byte 0x80465734 + .byte4 $$250166 .4byte 0 - .4byte 0x80465744 + .byte4 $$250167 .4byte 0 - .4byte 0x80465754 + .byte4 $$250168 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step4boss12creditdedede23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss12creditdedede23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559030 + .byte4 $$250134 .4byte 0 - .4byte 0x80559038 + .byte4 $$250135 .4byte 0 - .4byte 0x80559040 + .byte4 $$250136 .4byte 0 - .4byte 0x8046657C + .byte4 $$250137 .4byte 0 - .4byte 0x80559048 + .byte4 $$250138 .4byte 0 - .4byte 0x80559050 + .byte4 $$250139 .4byte 0 - .4byte 0x80559058 + .byte4 $$250140 .4byte 0 - .4byte 0x80559060 + .byte4 $$250141 .4byte 0 - .4byte 0x80559064 + .byte4 $$250142 .4byte 0 - .4byte 0x80466588 + .byte4 $$250143 .4byte 0 - .4byte 0x8055906C + .byte4 $$250144 .4byte 0 - .4byte 0x80466594 + .byte4 $$250145 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559088 + .byte4 $$250135 .4byte 0 - .4byte 0x80559090 + .byte4 $$250136 .4byte 0 - .4byte 0x80559098 + .byte4 $$250137 .4byte 0 - .4byte 0x80466850 + .byte4 $$250138 .4byte 0 - .4byte 0x805590A0 + .byte4 $$250139 .4byte 0 - .4byte 0x805590A8 + .byte4 $$250140 .4byte 0 - .4byte 0x805590B0 + .byte4 $$250141 .4byte 0 - .4byte 0x805590B8 + .byte4 $$250142 .4byte 0 - .4byte 0x8046685C + .byte4 $$250143 .4byte 0 - .4byte 0x80466868 + .byte4 $$250144 .4byte 0 - .4byte 0x80466880 + .byte4 $$250145 .4byte 0 - .4byte 0x80466894 + .byte4 $$250146 .4byte 0 - .4byte 0x805590C0 + .byte4 $$250147 .4byte 0 - .4byte 0x804668A8 + .byte4 $$250148 .4byte 0 - .4byte 0x804668B8 + .byte4 $$250149 .4byte 0 - .4byte 0x805590C8 + .byte4 $$250150 .4byte 0 - .4byte 0x805590D0 + .byte4 $$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: - .4byte 0x805590E8 + .byte4 $$250134 .4byte 0 - .4byte 0x805590F0 + .byte4 $$250135 .4byte 0 - .4byte 0x805590F8 + .byte4 $$250136 .4byte 0 - .4byte 0x80466CAC + .byte4 $$250137 .4byte 0 - .4byte 0x80559100 + .byte4 $$250138 .4byte 0 - .4byte 0x80559108 + .byte4 $$250139 .4byte 0 - .4byte 0x80559110 + .byte4 $$250140 .4byte 0 - .4byte 0x80559118 + .byte4 $$250141 .4byte 0 - .4byte 0x8055911C + .byte4 $$250142 .4byte 0 - .4byte 0x80466CB8 + .byte4 $$250143 .4byte 0 - .4byte 0x80466CC8 + .byte4 $$250144 .4byte 0 - .4byte 0x80466CDC + .byte4 $$250145 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055918C + .byte4 $$250132 .4byte 0 - .4byte 0x80467578 + .byte4 $$250133 .4byte 0 - .4byte 0x80467584 + .byte4 $$250134 .4byte 0 - .4byte 0x80467590 + .byte4 $$250135 .4byte 0 - .4byte 0x80559194 + .byte4 $$250136 .4byte 0 - .4byte 0x8046759C + .byte4 $$250137 .4byte 0 - .4byte 0x804675A8 + .byte4 $$250138 .4byte 0 - .4byte 0x805591A0 + .byte4 $$250139 .4byte 0 - .4byte 0x804675B4 + .byte4 $$250140 .4byte 0 - .4byte 0x80467578 + .byte4 $$250133 .4byte 0 - .4byte 0x804675C4 + .byte4 $$250141 .4byte 0 - .4byte 0x804675B4 + .byte4 $$250140 .4byte 0 - .4byte 0x8055918C + .byte4 $$250132 .4byte 0 - .4byte 0x804675D0 + .byte4 $$250142 .4byte 0 - .4byte 0x804675B4 + .byte4 $$250140 .4byte 0 - .4byte 0x804675B4 + .byte4 $$250140 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x804675DC + .byte4 $$250144 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804675F8 + .byte4 $$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 - .4byte 0x80467618 + .byte4 $$250146 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467634 + .byte4 $$250147 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467650 + .byte4 $$250148 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467650 + .byte4 $$250148 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467674 + .byte4 $$250149 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467698 + .byte4 $$250150 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804676BC + .byte4 $$250151 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804676BC + .byte4 $$250151 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804676E0 + .byte4 $$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: - .4byte 0x805591C8 + .byte4 $$250135 .4byte 0 - .4byte 0x805591D0 + .byte4 $$250136 .4byte 0 - .4byte 0x80467C78 + .byte4 $$250137 .4byte 0 - .4byte 0x80467C84 + .byte4 $$250138 .4byte 0 - .4byte 0x805591D8 + .byte4 $$250139 .4byte 0 - .4byte 0x80467C90 + .byte4 $$250140 .4byte 0 - .4byte 0x80467C9C + .byte4 $$250141 .4byte 0 - .4byte 0x805591E0 + .byte4 $$250142 .4byte 0 - .4byte 0x80467CAC + .byte4 $$250143 .4byte 0 - .4byte 0x805591E8 + .byte4 $$250144 .4byte 0 - .4byte 0x80467CB8 + .byte4 $$250145 .4byte 0 - .4byte 0x805591F0 + .byte4 $$250146 .4byte 0 - .4byte 0x805591F8 + .byte4 $$250147 .4byte 0 - .4byte 0x80467CC4 + .byte4 $$250148 .4byte 0 - .4byte 0x80467CD4 + .byte4 $$250149 .4byte 0 - .4byte 0x80467CE0 + .byte4 $$250150 .4byte 0 - .4byte 0x80467CF0 + .byte4 $$250151 .4byte 0 - .4byte 0x80467CFC + .byte4 $$250152 .4byte 0 - .4byte 0x80467D08 + .byte4 $$250153 .4byte 0 - .4byte 0x80559200 + .byte4 $$250154 .4byte 0 - .4byte 0x80559208 + .byte4 $$250155 .4byte 0 - .4byte 0x80467D14 + .byte4 $$250156 .4byte 0 - .4byte 0x80467C84 + .byte4 $$250138 .4byte 0 - .4byte 0x805591D8 + .byte4 $$250139 .4byte 0 - .4byte 0x80467C90 + .byte4 $$250140 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80467D20 + .byte4 $$250158 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467D40 + .byte4 $$250159 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467D64 + .byte4 $$250160 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467D88 + .byte4 $$250161 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467DA8 + .byte4 $$250162 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467DC8 + .byte4 $$250163 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467DE8 + .byte4 $$250164 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467E10 + .byte4 $$250165 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467E34 + .byte4 $$250166 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467E58 + .byte4 $$250167 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467E58 + .byte4 $$250167 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467E58 + .byte4 $$250167 .4byte 0x00000002 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467E80 + .byte4 $$250168 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467EA8 + .byte4 $$250169 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467ECC + .byte4 $$250170 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467EF0 + .byte4 $$250171 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467F10 + .byte4 $$250172 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467F3C + .byte4 $$250173 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467F64 + .byte4 $$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: - .4byte 0x80559238 + .byte4 $$250136 .4byte 0 - .4byte 0x80559240 + .byte4 $$250137 .4byte 0 - .4byte 0x804683E4 + .byte4 $$250138 .4byte 0 - .4byte 0x80559248 + .byte4 $$250139 .4byte 0 - .4byte 0x80559250 + .byte4 $$250140 .4byte 0 - .4byte 0x804683F0 + .byte4 $$250141 .4byte 0 - .4byte 0x80559258 + .byte4 $$250142 .4byte 0 - .4byte 0x80559260 + .byte4 $$250143 .4byte 0 - .4byte 0x80559260 + .byte4 $$250143 .4byte 0 - .4byte 0x80559268 + .byte4 $$250144 .4byte 0 - .4byte 0x80559248 + .byte4 $$250139 .4byte 0 - .4byte 0x804683FC + .byte4 $$250145 .4byte 0 - .4byte 0x80559270 + .byte4 $$250146 .4byte 0 - .4byte 0x80559278 + .byte4 $$250147 .4byte 0 - .4byte 0x804683E4 + .byte4 $$250138 .4byte 0 - .4byte 0x80559258 + .byte4 $$250142 .4byte 0 - .4byte 0x80468408 + .byte4 $$250148 .4byte 0 - .4byte 0x80468414 + .byte4 $$250149 .4byte 0 - .4byte 0x80559280 + .byte4 $$250150 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80468420 + .byte4 $$250152 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468440 + .byte4 $$250153 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468460 + .byte4 $$250154 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468484 + .byte4 $$250155 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804684A4 + .byte4 $$250156 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804684C4 + .byte4 $$250157 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804684E4 + .byte4 $$250158 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046850C + .byte4 $$250159 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468530 + .byte4 $$250160 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468550 + .byte4 $$250161 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468578 + .byte4 $$250162 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046859C + .byte4 $$250163 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804685BC + .byte4 $$250164 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804685E8 + .byte4 $$250165 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804685E8 + .byte4 $$250165 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468614 + .byte4 $$250166 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468648 + .byte4 $$250167 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468670 + .byte4 $$250168 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046869C + .byte4 $$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: - .4byte 0x805592A0 + .byte4 $$250133 .4byte 0 - .4byte 0x80468B78 + .byte4 $$250134 .4byte 0 - .4byte 0x805592A8 + .byte4 $$250135 .4byte 0 - .4byte 0x805592B0 + .byte4 $$250136 .4byte 0 - .4byte 0x80468B8C + .byte4 $$250137 .4byte 0 - .4byte 0x80468B98 + .byte4 $$250138 .4byte 0 - .4byte 0x805592B8 + .byte4 $$250139 .4byte 0 - .4byte 0x80468BA4 + .byte4 $$250140 .4byte 0 - .4byte 0x805592C0 + .byte4 $$250141 .4byte 0 - .4byte 0x805592C8 + .byte4 $$250142 .4byte 0 - .4byte 0x80468BB0 + .byte4 $$250143 .4byte 0 - .4byte 0x80468BB0 + .byte4 $$250143 .4byte 0 - .4byte 0x80468B78 + .byte4 $$250134 .4byte 0 - .4byte 0x80468BBC + .byte4 $$250144 .4byte 0 - .4byte 0x80468BC8 + .byte4 $$250145 .4byte 0 - .4byte 0x805592A8 + .byte4 $$250135 .4byte 0 - .4byte 0x805592A0 + .byte4 $$250133 .4byte 0 - .4byte 0x805592A8 + .byte4 $$250135 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss9moundeath23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss9moundeath23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80468BD4 + .byte4 $$250147 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468BF4 + .byte4 $$250148 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468C18 + .byte4 $$250149 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468C3C + .byte4 $$250150 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468C5C + .byte4 $$250151 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468C7C + .byte4 $$250152 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468CA0 + .byte4 $$250153 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468CC8 + .byte4 $$250154 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468CEC + .byte4 $$250155 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468D0C + .byte4 $$250156 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468D38 + .byte4 $$250157 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468D5C + .byte4 $$250158 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468D88 + .byte4 $$250159 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468DB4 + .byte4 $$250160 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468DDC + .byte4 $$250161 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468E0C + .byte4 $$250162 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468E38 + .byte4 $$250163 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468E64 + .byte4 $$250164 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468E88 + .byte4 $$250165 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468EB0 + .byte4 $$250166 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468ED4 + .byte4 $$250167 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468F00 + .byte4 $$250168 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468F20 + .byte4 $$250169 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468F48 + .byte4 $$250170 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468F6C + .byte4 $$250171 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468F90 + .byte4 $$250172 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468FB8 + .byte4 $$250173 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80468FE0 + .byte4 $$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: - .4byte 0x805592DC + .byte4 $$250132 .4byte 0 - .4byte 0x805592E4 + .byte4 $$250133 .4byte 0 - .4byte 0x805592F0 + .byte4 $$250134 .4byte 0 - .4byte 0x805592F8 + .byte4 $$250135 .4byte 0 - .4byte 0x804695F8 + .byte4 $$250136 .4byte 0 - .4byte 0x80469604 + .byte4 $$250137 .4byte 0 - .4byte 0x80559300 + .byte4 $$250138 .4byte 0 - .4byte 0x80469610 + .byte4 $$250139 .4byte 0 - .4byte 0x8046961C + .byte4 $$250140 .4byte 0 - .4byte 0x80559308 + .byte4 $$250141 .4byte 0 - .4byte 0x80469628 + .byte4 $$250142 .4byte 0 - .4byte 0x80469634 + .byte4 $$250143 .4byte 0 - .4byte 0x80559310 + .byte4 $$250144 .4byte 0 - .4byte 0x80559318 + .byte4 $$250145 .4byte 0 - .4byte 0x80469640 + .byte4 $$250146 .4byte 0 - .4byte 0x80559320 + .byte4 $$250147 .4byte 0 - .4byte 0x80469640 + .byte4 $$250146 .4byte 0 - .4byte 0x80559320 + .byte4 $$250147 .4byte 0 - .4byte 0x8046964C + .byte4 $$250148 .4byte 0 - .4byte 0x80559328 + .byte4 $$250149 .4byte 0 - .4byte 0x80469658 + .byte4 $$250150 .4byte 0 - .4byte 0x80469634 + .byte4 $$250143 .4byte 0 - .4byte 0x80559308 + .byte4 $$250141 .4byte 0 - .4byte 0x80469664 + .byte4 $$250151 .4byte 0 - .4byte 0x805592F0 + .byte4 $$250134 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80469670 + .byte4 $$250153 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80469694 + .byte4 $$250154 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804696BC + .byte4 $$250155 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804696E4 + .byte4 $$250156 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80469708 + .byte4 $$250157 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80469730 + .byte4 $$250158 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80469758 + .byte4 $$250159 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046977C + .byte4 $$250160 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804697A8 + .byte4 $$250161 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804697D0 + .byte4 $$250162 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804697FC + .byte4 $$250163 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80469828 + .byte4 $$250164 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80469854 + .byte4 $$250165 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046987C + .byte4 $$250166 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804698A8 + .byte4 $$250167 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804698CC + .byte4 $$250168 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804698F8 + .byte4 $$250169 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80469920 + .byte4 $$250170 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046994C + .byte4 $$250171 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80469974 + .byte4 $$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: - .4byte 0x80559368 + .byte4 $$250143 .4byte 0 - .4byte 0x80559370 + .byte4 $$250144 .4byte 0 - .4byte 0x80469F00 + .byte4 $$250145 .4byte 0 - .4byte 0x80559378 + .byte4 $$250146 .4byte 0 - .4byte 0x80559380 + .byte4 $$250147 .4byte 0 - .4byte 0x80559388 + .byte4 $$250148 .4byte 0 - .4byte 0x80469F0C + .byte4 $$250149 .4byte 0 - .4byte 0x80469F18 + .byte4 $$250150 .4byte 0 - .4byte 0x80469F28 + .byte4 $$250151 .4byte 0 - .4byte 0x80469F38 + .byte4 $$250152 .4byte 0 - .4byte 0x80469F4C + .byte4 $$250153 .4byte 0 - .4byte 0x80469F58 + .byte4 $$250154 .4byte 0 - .4byte 0x80469F68 + .byte4 $$250155 .4byte 0 - .4byte 0x80469F74 + .byte4 $$250156 .4byte 0 - .4byte 0x80469F80 + .byte4 $$250157 .4byte 0 - .4byte 0x80469F8C + .byte4 $$250158 .4byte 0 - .4byte 0x80469F9C + .byte4 $$250159 .4byte 0 - .4byte 0x80469FB0 + .byte4 $$250160 .4byte 0 - .4byte 0x80469FC0 + .byte4 $$250161 .4byte 0 - .4byte 0x80469FD4 + .byte4 $$250162 .4byte 0 - .4byte 0x80469FE0 + .byte4 $$250163 .4byte 0 - .4byte 0x80559390 + .byte4 $$250164 .4byte 0 - .4byte 0x80559398 + .byte4 $$250165 .4byte 0 - .4byte 0x80469FF0 + .byte4 $$250166 .4byte 0 - .4byte 0x8046A000 + .byte4 $$250167 .4byte 0 - .4byte 0x8046A00C + .byte4 $$250168 .4byte 0 - .4byte 0x805593A0 + .byte4 $$250169 .4byte 0 - .4byte 0x8046A01C + .byte4 $$250170 .4byte 0 - .4byte 0x805593A8 + .byte4 $$250171 .4byte 0 - .4byte 0x8046A028 + .byte4 $$250172 .4byte 0 - .4byte 0x805593B0 + .byte4 $$250173 .4byte 0 - .4byte 0x805593B8 + .byte4 $$250174 .4byte 0 - .4byte 0x805593C0 + .byte4 $$250175 .4byte 0 - .4byte 0x8046A034 + .byte4 $$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: - .4byte 0x805593F0 + .byte4 $$250133 .4byte 0 - .4byte 0x805593F8 + .byte4 $$250134 .4byte 0 - .4byte 0x8046ABCC + .byte4 $$250135 .4byte 0 - .4byte 0x80559400 + .byte4 $$250136 .4byte 0 - .4byte 0x80559408 + .byte4 $$250137 .4byte 0 - .4byte 0x8046ABD8 + .byte4 $$250138 .4byte 0 - .4byte 0x8046ABE4 + .byte4 $$250139 .4byte 0 - .4byte 0x80559410 + .byte4 $$250140 .4byte 0 - .4byte 0x8046ABF0 + .byte4 $$250141 .4byte 0 - .4byte 0x80559418 + .byte4 $$250142 .4byte 0 - .4byte 0x80559420 + .byte4 $$250143 .4byte 0 - .4byte 0x8046AC00 + .byte4 $$250144 .4byte 0 - .4byte 0x8046AC10 + .byte4 $$250145 .4byte 0 - .4byte 0x8046AC1C + .byte4 $$250146 .4byte 0 - .4byte 0x8046AC1C + .byte4 $$250146 .4byte 0 - .4byte 0x8046AC2C + .byte4 $$250147 .4byte 0 - .4byte 0x8046AC40 + .byte4 $$250148 .4byte 0 - .4byte 0x8046AC4C + .byte4 $$250149 .4byte 0 - .4byte 0x8046AC58 + .byte4 $$250150 .4byte 0 - .4byte 0x80559428 + .byte4 $$250151 .4byte 0 - .4byte 0x8046AC64 + .byte4 $$250152 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8046AC78 + .byte4 $$250154 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046AC98 + .byte4 $$250155 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046ACBC + .byte4 $$250156 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046ACE4 + .byte4 $$250157 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046AD04 + .byte4 $$250158 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046AD24 + .byte4 $$250159 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046AD48 + .byte4 $$250160 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046AD70 + .byte4 $$250161 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046AD94 + .byte4 $$250162 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046AD94 + .byte4 $$250162 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046ADB8 + .byte4 $$250163 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046ADE0 + .byte4 $$250164 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046AE04 + .byte4 $$250165 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046AE30 + .byte4 $$250166 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046AE50 + .byte4 $$250167 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046AE50 + .byte4 $$250167 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046AE50 + .byte4 $$250167 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046AE7C + .byte4 $$250168 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046AEA8 + .byte4 $$250169 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046AED0 + .byte4 $$250170 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046AEF4 + .byte4 $$250171 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046ACBC + .byte4 $$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: - .4byte 0x80559658 + .byte4 $$250124 .4byte 0 - .4byte 0x80559660 + .byte4 $$250125 .4byte 0 - .4byte 0x80559668 + .byte4 $$250126 .4byte 0 - .4byte 0x80559670 + .byte4 $$250127 .4byte 0 - .4byte 0x80559678 + .byte4 $$250128 .4byte 0 - .4byte 0x80473478 + .byte4 $$250129 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy11bladeknight23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy11bladeknight23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559690 + .byte4 $$250126 .4byte 0 - .4byte 0x80559698 + .byte4 $$250127 .4byte 0 - .4byte 0x805596A0 + .byte4 $$250128 .4byte 0 - .4byte 0x805596A8 + .byte4 $$250129 .4byte 0 - .4byte 0x805596B0 + .byte4 $$250130 .4byte 0 - .4byte 0x80473758 + .byte4 $$250131 .4byte 0 - .4byte 0x80473764 + .byte4 $$250132 .4byte 0 - .4byte 0x80473770 + .byte4 $$250133 .4byte 0 - .4byte 0x805596B8 + .byte4 $$250134 .4byte 0 - .4byte 0x805596C0 + .byte4 $$250135 .4byte 0 - .4byte 0x805596C8 + .byte4 $$250136 .4byte 0 - .4byte 0x80473780 + .byte4 $$250137 .4byte 0 - .4byte 0x805596D0 + .byte4 $$250138 .4byte 0 - .4byte 0x8047378C + .byte4 $$250139 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy7blipper23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7blipper23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x805596E8 + .byte4 $$250125 .4byte 0 - .4byte 0x80473CF4 + .byte4 $$250126 .4byte 0 - .4byte 0x80473D00 + .byte4 $$250127 .4byte 0 - .4byte 0x80473D0C + .byte4 $$250128 .4byte 0 - .4byte 0x805596F0 + .byte4 $$250129 .4byte 0 - .4byte 0x80473D18 + .byte4 $$250130 .4byte 0 - .4byte 0x80473D24 + .byte4 $$250131 .4byte 0 - .4byte 0x805596F8 + .byte4 $$250132 .4byte 0 - .4byte 0x80559700 + .byte4 $$250133 .4byte 0 - .4byte 0x80559708 + .byte4 $$250134 .4byte 0 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy11bonkersbomb23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy11bonkersbomb23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80473FB8 + .byte4 $$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: - .4byte 0x80559748 + .byte4 $$250125 .4byte 0 - .4byte 0x80559750 + .byte4 $$250126 .4byte 0 - .4byte 0x80474264 + .byte4 $$250127 .4byte 0 - .4byte 0x80559748 + .byte4 $$250125 .4byte 0 - .4byte 0x80559758 + .byte4 $$250128 .4byte 0 - .4byte 0x80474270 + .byte4 $$250129 .4byte 0 - .4byte 0x80559760 + .byte4 $$250130 .4byte 0 - .4byte 0x80474264 + .byte4 $$250127 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5bowby23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5bowby23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559788 + .byte4 $$250125 .4byte 0 - .4byte 0x80559790 + .byte4 $$250126 .4byte 0 - .4byte 0x80474600 + .byte4 $$250127 .4byte 0 - .4byte 0x80559798 + .byte4 $$250128 .4byte 0 - .4byte 0x8047460C + .byte4 $$250129 .4byte 0 - .4byte 0x80474618 + .byte4 $$250130 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy10brontoburt23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy10brontoburt23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80474920 + .byte4 $$250124 .4byte 0 - .4byte 0x805597B4 + .byte4 $$250125 .4byte 0 - .4byte 0x805597B8 + .byte4 $$250126 .4byte 0 - .4byte 0x805597C0 + .byte4 $$250127 .4byte 0 - .4byte 0x805597C8 + .byte4 $$250128 .4byte 0 - .4byte 0x8047492C + .byte4 $$250129 .4byte 0 - .4byte 0x8047492C + .byte4 $$250129 .4byte 0 - .4byte 0x80474938 + .byte4 $$250130 .4byte 0 - .4byte 0x80474944 + .byte4 $$250131 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy11broomhatter23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy11broomhatter23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x805597E8 + .byte4 $$250125 .4byte 0 - .4byte 0x805597F0 + .byte4 $$250126 .4byte 0 - .4byte 0x805597F8 + .byte4 $$250127 .4byte 0 - .4byte 0x80559800 + .byte4 $$250128 .4byte 0 - .4byte 0x80559808 + .byte4 $$250129 .4byte 0 - .4byte 0x80559810 + .byte4 $$250130 .4byte 0 - .4byte 0x80474CB0 + .byte4 $$250131 .4byte 0 - .4byte 0x80474CBC + .byte4 $$250132 .4byte 0 - .4byte 0x80474CC8 + .byte4 $$250133 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5cappy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5cappy23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559830 + .byte4 $$250127 .4byte 0 - .4byte 0x80559838 + .byte4 $$250128 .4byte 0 - .4byte 0x80559840 + .byte4 $$250129 .4byte 0 - .4byte 0x80559830 + .byte4 $$250127 .4byte 0 - .4byte 0x80559848 + .byte4 $$250130 .4byte 0 - .4byte 0x80475120 + .byte4 $$250131 .4byte 0 - .4byte 0x80559850 + .byte4 $$250132 .4byte 0 - .4byte 0x8047512C + .byte4 $$250133 .4byte 0 - .4byte 0x80475138 + .byte4 $$250134 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8cappyhat23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8cappyhat23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559868 + .byte4 $$250124 .4byte 0 - .4byte 0x80559868 + .byte4 $$250124 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8cerulean23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8cerulean23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559888 + .byte4 $$250125 .4byte 0 - .4byte 0x80559890 + .byte4 $$250126 .4byte 0 - .4byte 0x80559888 + .byte4 $$250125 .4byte 0 - .4byte 0x80559890 + .byte4 $$250126 .4byte 0 - .4byte 0x80559898 + .byte4 $$250127 .4byte 0 - .4byte 0x804754B4 + .byte4 $$250128 .4byte 0 - .4byte 0x80559890 + .byte4 $$250126 .4byte 0 - .4byte 0x805598A0 + .byte4 $$250129 .4byte 0 - .4byte 0x805598A8 + .byte4 $$250130 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6chilly23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6chilly23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x805598C0 + .byte4 $$250124 .4byte 0 - .4byte 0x805598C8 + .byte4 $$250125 .4byte 0 - .4byte 0x805598D0 + .byte4 $$250126 .4byte 0 - .4byte 0x80475780 + .byte4 $$250127 .4byte 0 - .4byte 0x805598D8 + .byte4 $$250128 .4byte 0 - .4byte 0x805598E0 + .byte4 $$250129 .4byte 0 - .4byte 0x805598E8 + .byte4 $$250130 .4byte 0 - .4byte 0x805598F0 + .byte4 $$250131 .4byte 0 - .4byte 0x8047578C + .byte4 $$250132 .4byte 0 - .4byte 0x80475798 + .byte4 $$250133 .4byte 0 - .4byte 0x804757A4 + .byte4 $$250134 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy4como23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy4como23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559908 + .byte4 $$250125 .4byte 0 - .4byte 0x80559908 + .byte4 $$250125 .4byte 0 - .4byte 0x80559910 + .byte4 $$250126 .4byte 0 - .4byte 0x80559908 + .byte4 $$250125 .4byte 0 - .4byte 0x80559918 + .byte4 $$250127 .4byte 0 - .4byte 0x80475AB0 + .byte4 $$250128 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6degout23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6degout23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055993C + .byte4 $$250124 .4byte 0 - .4byte 0x80559944 + .byte4 $$250125 .4byte 0 - .4byte 0x80475F40 + .byte4 $$250126 .4byte 0 - .4byte 0x8055994C + .byte4 $$250127 .4byte 0 - .4byte 0x80475F4C + .byte4 $$250128 .4byte 0 - .4byte 0x80559958 + .byte4 $$250129 .4byte 0 - .4byte 0x80559960 + .byte4 $$250130 .4byte 0 - .4byte 0x80559968 + .byte4 $$250131 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8dubiorjr23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8dubiorjr23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559990 + .byte4 $$250125 .4byte 0 - .4byte 0x80559998 + .byte4 $$250126 .4byte 0 - .4byte 0x804761F8 + .byte4 $$250127 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy4elec23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy4elec23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x805599D8 + .byte4 $$250126 .4byte 0 - .4byte 0x805599D8 + .byte4 $$250126 .4byte 0 - .4byte 0x805599E0 + .byte4 $$250127 .4byte 0 - .4byte 0x805599E8 + .byte4 $$250128 .4byte 0 - .4byte 0x804765E8 + .byte4 $$250129 .4byte 0 - .4byte 0x804765F4 + .byte4 $$250130 .4byte 0 - .4byte 0x805599F0 + .byte4 $$250131 .4byte 0 - .4byte 0x80476600 + .byte4 $$250132 .4byte 0 - .4byte 0x805599F8 + .byte4 $$250133 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559A20 + .byte4 $$250126 .4byte 0 - .4byte 0x80559A28 + .byte4 $$250127 .4byte 0 - .4byte 0x80476ACC + .byte4 $$250128 .4byte 0 - .4byte 0x80559A30 + .byte4 $$250129 .4byte 0 - .4byte 0x80559A38 + .byte4 $$250130 .4byte 0 - .4byte 0x80476AD8 + .byte4 $$250131 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5foley23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5foley23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559A70 + .byte4 $$250128 .4byte 0 - .4byte 0x80559A78 + .byte4 $$250129 .4byte 0 - .4byte 0x80476D94 + .byte4 $$250130 .4byte 0 - .4byte 0x80476DA0 + .byte4 $$250131 .4byte 0 - .4byte 0x80559A80 + .byte4 $$250132 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5gemra23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5gemra23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80477008 + .byte4 $$250131 .4byte 0 - .4byte 0x80559AC8 + .byte4 $$250132 .4byte 0 - .4byte 0x80477014 + .byte4 $$250133 .4byte 0 - .4byte 0x80559AD0 + .byte4 $$250134 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559B28 + .byte4 $$250135 .4byte 0 - .4byte 0x80559B28 + .byte4 $$250135 .4byte 0 - .4byte 0x80559B28 + .byte4 $$250135 .4byte 0 - .4byte 0x80559B28 + .byte4 $$250135 .4byte 0 - .4byte 0x80559B28 + .byte4 $$250135 .4byte 0 - .4byte 0x80559B28 + .byte4 $$250135 .4byte 0 - .4byte 0x80559B30 + .byte4 $$250136 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5gordo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5gordo23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559B60 + .byte4 $$250124 .4byte 0 - .4byte 0x80559B60 + .byte4 $$250124 .4byte 0 - .4byte 0x80559B60 + .byte4 $$250124 .4byte 0 - .4byte 0x80559B60 + .byte4 $$250124 .4byte 0 - .4byte 0x80559B60 + .byte4 $$250124 .4byte 0 - .4byte 0x80559B60 + .byte4 $$250124 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy7hothead23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7hothead23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559B88 + .byte4 $$250127 .4byte 0 - .4byte 0x80559B90 + .byte4 $$250128 .4byte 0 - .4byte 0x80559B98 + .byte4 $$250129 .4byte 0 - .4byte 0x80559BA0 + .byte4 $$250130 .4byte 0 - .4byte 0x80559BA8 + .byte4 $$250131 .4byte 0 - .4byte 0x804778C4 + .byte4 $$250132 .4byte 0 - .4byte 0x804778D0 + .byte4 $$250133 .4byte 0 - .4byte 0x80559BB0 + .byte4 $$250134 .4byte 0 - .4byte 0x804778E0 + .byte4 $$250135 .4byte 0 - .4byte 0x80559BB8 + .byte4 $$250136 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6juckle23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6juckle23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559BD4 + .byte4 $$250124 .4byte 0 - .4byte 0x80559BDC + .byte4 $$250125 .4byte 0 - .4byte 0x80477C18 + .byte4 $$250126 .4byte 0 - .4byte 0x80559BE4 + .byte4 $$250127 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy4kabu23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy4kabu23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559C10 + .byte4 $$250125 .4byte 0 - .4byte 0x80559C18 + .byte4 $$250126 .4byte 0 - .4byte 0x80559C20 + .byte4 $$250127 .4byte 0 - .4byte 0x80559C10 + .byte4 $$250125 .4byte 0 - .4byte 0x80559C28 + .byte4 $$250128 .4byte 0 - .4byte 0x80477FA8 + .byte4 $$250129 .4byte 0 - .4byte 0x80477FB4 + .byte4 $$250130 .4byte 0 - .4byte 0x80559C30 + .byte4 $$250131 .4byte 0 - .4byte 0x80559C38 + .byte4 $$250132 .4byte 0 - .4byte 0x80559C40 + .byte4 $$250133 .4byte 0 - .4byte 0x80559C48 + .byte4 $$250134 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559C70 + .byte4 $$250136 .4byte 0 - .4byte 0x80559C78 + .byte4 $$250137 .4byte 0 - .4byte 0x804784A4 + .byte4 $$250138 .4byte 0 - .4byte 0x804784B0 + .byte4 $$250139 .4byte 0 - .4byte 0x80559C80 + .byte4 $$250140 .4byte 0 - .4byte 0x80559C88 + .byte4 $$250141 .4byte 0 - .4byte 0x80559C90 + .byte4 $$250142 .4byte 0 - .4byte 0x80559C98 + .byte4 $$250143 .4byte 0 - .4byte 0x804784BC + .byte4 $$250144 .4byte 0 - .4byte 0x80559CA0 + .byte4 $$250145 .4byte 0 - .4byte 0x80559CA8 + .byte4 $$250146 .4byte 0 - .4byte 0x804784C8 + .byte4 $$250147 .4byte 0 - .4byte 0x804784E0 + .byte4 $$250148 .4byte 0 - .4byte 0x804784F8 + .byte4 $$250149 .4byte 0 - .4byte 0x80478510 + .byte4 $$250150 .4byte 0 - .4byte 0x80478528 + .byte4 $$250151 .4byte 0 - .4byte 0x80478544 + .byte4 $$250152 .4byte 0 - .4byte 0x80478560 + .byte4 $$250153 .4byte 0 - .4byte 0x80478578 + .byte4 $$250154 .4byte 0 - .4byte 0x80478590 + .byte4 $$250155 .4byte 0 - .4byte 0x804785A4 + .byte4 $$250156 .4byte 0 - .4byte 0x804785B8 + .byte4 $$250157 .4byte 0 - .4byte 0x804785D0 + .byte4 $$250158 .4byte 0 - .4byte 0x804785E8 + .byte4 $$250159 .4byte 0 - .4byte 0x80478604 + .byte4 $$250160 .4byte 0 - .4byte 0x80478620 + .byte4 $$250161 .4byte 0 - .4byte 0x8047863C + .byte4 $$250162 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6lanzer23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6lanzer23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559CC8 + .byte4 $$250127 .4byte 0 - .4byte 0x80559CD0 + .byte4 $$250128 .4byte 0 - .4byte 0x80559CD8 + .byte4 $$250129 .4byte 0 - .4byte 0x80559CE0 + .byte4 $$250130 .4byte 0 - .4byte 0x80559CE8 + .byte4 $$250131 .4byte 0 - .4byte 0x80478BD0 + .byte4 $$250132 .4byte 0 - .4byte 0x80559CF0 + .byte4 $$250133 .4byte 0 - .4byte 0x80478BDC + .byte4 $$250134 .4byte 0 - .4byte 0x80478BE8 + .byte4 $$250135 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6leafan23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6leafan23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559D0C + .byte4 $$250124 .4byte 0 - .4byte 0x80559D14 + .byte4 $$250125 .4byte 0 - .4byte 0x80559D20 + .byte4 $$250126 .4byte 0 - .4byte 0x80559D0C + .byte4 $$250124 .4byte 0 - .4byte 0x80559D28 + .byte4 $$250127 .4byte 0 - .4byte 0x80478E60 + .byte4 $$250128 .4byte 0 - .4byte 0x80559D30 + .byte4 $$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: - .4byte 0x80559D64 + .byte4 $$250124 .4byte 0 - .4byte 0x80559D6C + .byte4 $$250125 .4byte 0 - .4byte 0x80479150 + .byte4 $$250126 .4byte 0 - .4byte 0x8047915C + .byte4 $$250127 .4byte 0 - .4byte 0x80479168 + .byte4 $$250128 .4byte 0 - .4byte 0x80479178 + .byte4 $$250129 .4byte 0 - .4byte 0x80559D74 + .byte4 $$250130 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559DA0 + .byte4 $$250126 .4byte 0 - .4byte 0x80559DA8 + .byte4 $$250127 .4byte 0 - .4byte 0x80559DB0 + .byte4 $$250128 .4byte 0 - .4byte 0x80559DB8 + .byte4 $$250129 .4byte 0 - .4byte 0x80559DC0 + .byte4 $$250130 .4byte 0 - .4byte 0x80479344 + .byte4 $$250131 .4byte 0 - .4byte 0x80479350 + .byte4 $$250132 .4byte 0 - .4byte 0x80559DC8 + .byte4 $$250133 .4byte 0 - .4byte 0x8047935C + .byte4 $$250134 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5noddy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5noddy23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559DDC + .byte4 $$250124 .4byte 0 - .4byte 0x80559DE4 + .byte4 $$250125 .4byte 0 - .4byte 0x80559DF0 + .byte4 $$250126 .4byte 0 - .4byte 0x80559DF8 + .byte4 $$250127 .4byte 0 - .4byte 0x80559E00 + .byte4 $$250128 .4byte 0 - .4byte 0x80479570 + .byte4 $$250129 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5nruff23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5nruff23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559E18 + .byte4 $$250127 .4byte 0 - .4byte 0x80559E20 + .byte4 $$250128 .4byte 0 - .4byte 0x80559E28 + .byte4 $$250129 .4byte 0 - .4byte 0x80559E30 + .byte4 $$250130 .4byte 0 - .4byte 0x80559E38 + .byte4 $$250131 .4byte 0 - .4byte 0x80479800 + .byte4 $$250132 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6owgulf23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6owgulf23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559E58 + .byte4 $$250125 .4byte 0 - .4byte 0x80479C04 + .byte4 $$250126 .4byte 0 - .4byte 0x80479C10 + .byte4 $$250127 .4byte 0 - .4byte 0x80479C1C + .byte4 $$250128 .4byte 0 - .4byte 0x80559E5C + .byte4 $$250129 .4byte 0 - .4byte 0x80479C28 + .byte4 $$250130 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy7parasol23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7parasol23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559E80 + .byte4 $$250126 .4byte 0 - .4byte 0x80559E88 + .byte4 $$250127 .4byte 0 - .4byte 0x80479E28 + .byte4 $$250128 .4byte 0 - .4byte 0x80559E90 + .byte4 $$250129 .4byte 0 - .4byte 0x80479E38 + .byte4 $$250130 .4byte 0 - .4byte 0x80559E88 + .byte4 $$250127 .4byte 0 - .4byte 0x80479E28 + .byte4 $$250128 .4byte 0 - .4byte 0x80479E44 + .byte4 $$250131 .4byte 0 - .4byte 0x80479E38 + .byte4 $$250130 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6pierce23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6pierce23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559EB0 + .byte4 $$250125 .4byte 0 - .4byte 0x80559EB8 + .byte4 $$250126 .4byte 0 - .4byte 0x8047A3AC + .byte4 $$250127 .4byte 0 - .4byte 0x80559EC0 + .byte4 $$250128 .4byte 0 - .4byte 0x8047A3B8 + .byte4 $$250129 .4byte 0 - .4byte 0x80559EC8 + .byte4 $$250130 .4byte 0 - .4byte 0x80559ED0 + .byte4 $$250131 .4byte 0 - .4byte 0x80559ED8 + .byte4 $$250132 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy10poppybrojr23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy10poppybrojr23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559F00 + .byte4 $$250125 .4byte 0 - .4byte 0x80559F08 + .byte4 $$250126 .4byte 0 - .4byte 0x80559F10 + .byte4 $$250127 .4byte 0 - .4byte 0x80559F18 + .byte4 $$250128 .4byte 0 - .4byte 0x8047A780 + .byte4 $$250129 .4byte 0 - .4byte 0x80559F20 + .byte4 $$250130 .4byte 0 - .4byte 0x8047A78C + .byte4 $$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: - .4byte 0x80559FA8 + .byte4 $$250124 .4byte 0 - .4byte 0x80559FB0 + .byte4 $$250125 .4byte 0 - .4byte 0x80559FB8 + .byte4 $$250126 .4byte 0 - .4byte 0x80559FC0 + .byte4 $$250127 .4byte 0 - .4byte 0x80559FC8 + .byte4 $$250128 .4byte 0 - .4byte 0x8047A9F0 + .byte4 $$250129 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5rocky23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5rocky23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559FE0 + .byte4 $$250126 .4byte 0 - .4byte 0x8047AC30 + .byte4 $$250127 .4byte 0 - .4byte 0x8047AC3C + .byte4 $$250128 .4byte 0 - .4byte 0x80559FE8 + .byte4 $$250129 .4byte 0 - .4byte 0x80559FF0 + .byte4 $$250130 .4byte 0 - .4byte 0x8047AC4C + .byte4 $$250131 .4byte 0 - .4byte 0x8047AC58 + .byte4 $$250132 .4byte 0 - .4byte 0x80559FF8 + .byte4 $$250133 .4byte 0 - .4byte 0x8047AC64 + .byte4 $$250134 .4byte 0 - .4byte 0x8047AC70 + .byte4 $$250135 .4byte 0 - .4byte 0x8055A000 + .byte4 $$250136 .4byte 0 - .4byte 0x8055A008 + .byte4 $$250137 .4byte 0 - .4byte 0x8047AC7C + .byte4 $$250138 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8rollball23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8rollball23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055A028 + .byte4 $$250125 .4byte 0 - .4byte 0x8055A030 + .byte4 $$250126 .4byte 0 - .4byte 0x8055A028 + .byte4 $$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: - .4byte 0x8055A044 + .byte4 $$250124 .4byte 0 - .4byte 0x8055A04C + .byte4 $$250125 .4byte 0 - .4byte 0x8055A058 + .byte4 $$250126 .4byte 0 - .4byte 0x8055A044 + .byte4 $$250124 .4byte 0 - .4byte 0x8055A060 + .byte4 $$250127 .4byte 0 - .4byte 0x8047B198 + .byte4 $$250128 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055A078 + .byte4 $$250126 .4byte 0 - .4byte 0x8055A080 + .byte4 $$250127 .4byte 0 - .4byte 0x8047B4AC + .byte4 $$250128 .4byte 0 - .4byte 0x8055A088 + .byte4 $$250129 .4byte 0 - .4byte 0x8055A090 + .byte4 $$250130 .4byte 0 - .4byte 0x8047B4B8 + .byte4 $$250131 .4byte 0 - .4byte 0x8047B4C4 + .byte4 $$250132 .4byte 0 - .4byte 0x8047B4D0 + .byte4 $$250133 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy8searches23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8searches23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055A0AC + .byte4 $$250124 .4byte 0 - .4byte 0x8055A0B4 + .byte4 $$250125 .4byte 0 - .4byte 0x8047B760 + .byte4 $$250126 .4byte 0 - .4byte 0x8055A0BC + .byte4 $$250127 .4byte 0 - .4byte 0x8047B76C + .byte4 $$250128 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055A0E0 + .byte4 $$250126 .4byte 0 - .4byte 0x8055A0E8 + .byte4 $$250127 .4byte 0 - .4byte 0x8055A0F0 + .byte4 $$250128 .4byte 0 - .4byte 0x8055A0F8 + .byte4 $$250129 .4byte 0 - .4byte 0x8055A100 + .byte4 $$250130 .4byte 0 - .4byte 0x8047BA94 + .byte4 $$250131 .4byte 0 - .4byte 0x8055A108 + .byte4 $$250132 .4byte 0 - .4byte 0x8047BAA0 + .byte4 $$250133 .4byte 0 - .4byte 0x8055A110 + .byte4 $$250134 .4byte 0 - .4byte 0x8055A118 + .byte4 $$250135 .4byte 0 - .4byte 0x8047BAAC + .byte4 $$250136 .4byte 0 - .4byte 0x8047BAB8 + .byte4 $$250137 .4byte 0 - .4byte 0x8055A120 + .byte4 $$250138 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6shotzo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6shotzo23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055A148 + .byte4 $$250126 .4byte 0 - .4byte 0x8055A148 + .byte4 $$250126 .4byte 0 - .4byte 0x8055A148 + .byte4 $$250126 .4byte 0 - .4byte 0x8055A148 + .byte4 $$250126 .4byte 0 - .4byte 0x8055A148 + .byte4 $$250126 .4byte 0 - .4byte 0x8055A148 + .byte4 $$250126 .4byte 0 - .4byte 0x8055A150 + .byte4 $$250127 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy9sirkibble23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy9sirkibble23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055A168 + .byte4 $$250128 .4byte 0 - .4byte 0x8055A170 + .byte4 $$250129 .4byte 0 - .4byte 0x8055A178 + .byte4 $$250130 .4byte 0 - .4byte 0x8055A180 + .byte4 $$250131 .4byte 0 - .4byte 0x8055A188 + .byte4 $$250132 .4byte 0 - .4byte 0x8047C3D4 + .byte4 $$250133 .4byte 0 - .4byte 0x8047C3E0 + .byte4 $$250134 .4byte 0 - .4byte 0x8047C3EC + .byte4 $$250135 .4byte 0 - .4byte 0x8047C3F8 + .byte4 $$250136 .4byte 0 - .4byte 0x8055A190 + .byte4 $$250137 .4byte 0 - .4byte 0x8047C404 + .byte4 $$250138 .4byte 0 - .4byte 0x8047C414 + .byte4 $$250139 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy11sisterbound23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy11sisterbound23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055A1A8 + .byte4 $$250125 .4byte 0 - .4byte 0x8055A1B0 + .byte4 $$250126 .4byte 0 - .4byte 0x8055A1B8 + .byte4 $$250127 .4byte 0 - .4byte 0x8055A1C0 + .byte4 $$250128 .4byte 0 - .4byte 0x8047C7FC + .byte4 $$250129 .4byte 0 - .4byte 0x8055A1C8 + .byte4 $$250130 .4byte 0 - .4byte 0x8047C808 + .byte4 $$250131 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy5snowl23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy5snowl23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055A1DC + .byte4 $$250124 .4byte 0 - .4byte 0x8047CA48 + .byte4 $$250125 .4byte 0 - .4byte 0x8055A1E4 + .byte4 $$250126 .4byte 0 - .4byte 0x8055A1EC + .byte4 $$250127 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6sodory23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6sodory23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055A238 + .byte4 $$250133 .4byte 0 - .4byte 0x8055A240 + .byte4 $$250134 .4byte 0 - .4byte 0x8055A248 + .byte4 $$250135 .4byte 0 - .4byte 0x8055A250 + .byte4 $$250136 .4byte 0 - .4byte 0x8055A258 + .byte4 $$250137 .4byte 0 - .4byte 0x8047CD88 + .byte4 $$250138 .4byte 0 - .4byte 0x8047CD94 + .byte4 $$250139 .4byte 0 - .4byte 0x8055A260 + .byte4 $$250140 .4byte 0 - .4byte 0x8047CDA0 + .byte4 $$250141 .4byte 0 - .4byte 0x8047CDB4 + .byte4 $$250142 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6sparky23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6sparky23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055A278 + .byte4 $$250127 .4byte 0 - .4byte 0x8055A280 + .byte4 $$250128 .4byte 0 - .4byte 0x8055A288 + .byte4 $$250129 .4byte 0 - .4byte 0x8055A290 + .byte4 $$250130 .4byte 0 - .4byte 0x8047D098 + .byte4 $$250131 .4byte 0 - .4byte 0x8055A298 + .byte4 $$250132 .4byte 0 - .4byte 0x8047D0A4 + .byte4 $$250133 .4byte 0 - .4byte 0x8055A2A0 + .byte4 $$250134 .4byte 0 - .4byte 0x8047D0B0 + .byte4 $$250135 .4byte 0 - .4byte 0x8047D0BC + .byte4 $$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: - .4byte 0x8055A2E0 + .byte4 $$250127 .4byte 0 - .4byte 0x8055A2E0 + .byte4 $$250127 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy9tsukikage23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy9tsukikage23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8047D780 + .byte4 $$250124 .4byte 0 - .4byte 0x8055A2FC + .byte4 $$250125 .4byte 0 - .4byte 0x8055A308 + .byte4 $$250126 .4byte 0 - .4byte 0x8055A310 + .byte4 $$250127 .4byte 0 - .4byte 0x8047D78C + .byte4 $$250128 .4byte 0 - .4byte 0x8047D798 + .byte4 $$250129 .4byte 0 - .4byte 0x8055A318 + .byte4 $$250130 .4byte 0 - .4byte 0x8047D7A4 + .byte4 $$250131 .4byte 0 - .4byte 0x8047D7B0 + .byte4 $$250132 .4byte 0 - .4byte 0x8047D7C0 + .byte4 $$250133 .4byte 0 - .4byte 0x8047D7D0 + .byte4 $$250134 .4byte 0 - .4byte 0x8047D7E0 + .byte4 $$250135 .4byte 0 - .4byte 0x8047D7F0 + .byte4 $$250136 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy9waddledee23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy9waddledee23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055A330 + .byte4 $$250128 .4byte 0 - .4byte 0x8055A338 + .byte4 $$250129 .4byte 0 - .4byte 0x8055A340 + .byte4 $$250130 .4byte 0 - .4byte 0x8055A348 + .byte4 $$250131 .4byte 0 - .4byte 0x8055A350 + .byte4 $$250132 .4byte 0 - .4byte 0x8047DC14 + .byte4 $$250133 .4byte 0 - .4byte 0x8047DC20 + .byte4 $$250134 .4byte 0 - .4byte 0x8047DC2C + .byte4 $$250135 .4byte 0 - .4byte 0x8055A358 + .byte4 $$250136 .4byte 0 - .4byte 0x8055A360 + .byte4 $$250137 .4byte 0 - .4byte 0x8047DC38 + .byte4 $$250138 .4byte 0 - .4byte 0x8047DC44 + .byte4 $$250139 .4byte 0 - .4byte 0x8047DC58 + .byte4 $$250140 .4byte 0 - .4byte 0x8047DC68 + .byte4 $$250141 .4byte 0 - .4byte 0x8047DC74 + .byte4 $$250142 .4byte 0 - .4byte 0x8055A368 + .byte4 $$250143 .4byte 0 - .4byte 0x8047DC80 + .byte4 $$250144 .4byte 0 - .4byte 0x8047DC94 + .byte4 $$250145 .4byte 0 - .4byte 0x8047DCA0 + .byte4 $$250146 .4byte 0 - .4byte 0x8047DCAC + .byte4 $$250147 .4byte 0 - .4byte 0x8047DCB8 + .byte4 $$250148 .4byte 0 - .4byte 0x8047DCC4 + .byte4 $$250149 .4byte 0 - .4byte 0x8055A370 + .byte4 $$250150 .4byte 0 - .4byte 0x8055A378 + .byte4 $$250151 .4byte 0 - .4byte 0x8055A380 + .byte4 $$250152 .4byte 0 - .4byte 0x8055A388 + .byte4 $$250153 .4byte 0 - .4byte 0x8055A390 + .byte4 $$250154 .4byte 0 - .4byte 0x8047DCD0 + .byte4 $$250155 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy9waddledoo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy9waddledoo23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055A3C8 + .byte4 $$250133 .4byte 0 - .4byte 0x8055A3D0 + .byte4 $$250134 .4byte 0 - .4byte 0x8055A3D8 + .byte4 $$250135 .4byte 0 - .4byte 0x8055A3E0 + .byte4 $$250136 .4byte 0 - .4byte 0x8055A3E8 + .byte4 $$250137 .4byte 0 - .4byte 0x8055A3F0 + .byte4 $$250138 .4byte 0 - .4byte 0x8047E4F8 + .byte4 $$250139 .4byte 0 - .4byte 0x8055A3F8 + .byte4 $$250140 .4byte 0 - .4byte 0x8055A3E8 + .byte4 $$250137 .4byte 0 - .4byte 0x8047E504 + .byte4 $$250141 .4byte 0 - .4byte 0x8047E510 + .byte4 $$250142 .4byte 0 - .4byte 0x8047E51C + .byte4 $$250143 .4byte 0 - .4byte 0x8047E52C + .byte4 $$250144 .4byte 0 - .4byte 0x8047E538 + .byte4 $$250145 .4byte 0 - .4byte 0x8047E54C + .byte4 $$250146 .4byte 0 - .4byte 0x8047E55C + .byte4 $$250147 .4byte 0 - .4byte 0x8047E568 + .byte4 $$250148 .4byte 0 - .4byte 0x8047E57C + .byte4 $$250149 .4byte 0 - .4byte 0x8047E588 + .byte4 $$250150 .4byte 0 - .4byte 0x8047E594 + .byte4 $$250151 .4byte 0 - .4byte 0x8047E5A0 + .byte4 $$250152 .4byte 0 - .4byte 0x8047E5AC + .byte4 $$250153 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy10watergalbo23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy10watergalbo23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055A40C + .byte4 $$250124 .4byte 0 - .4byte 0x8055A414 + .byte4 $$250125 .4byte 0 - .4byte 0x8055A420 + .byte4 $$250126 .4byte 0 - .4byte 0x8055A40C + .byte4 $$250124 .4byte 0 - .4byte 0x8055A428 + .byte4 $$250127 .4byte 0 - .4byte 0x8047E878 + .byte4 $$250128 .4byte 0 - .4byte 0x8055A430 + .byte4 $$250129 .4byte 0 - .4byte 0x8047E884 + .byte4 $$250130 .4byte 0 - .4byte 0x8047E890 + .byte4 $$250131 .4byte 0 - .4byte 0x8047E89C + .byte4 $$250132 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055A488 + .byte4 $$250133 .4byte 0 - .4byte 0x8055A488 + .byte4 $$250133 .4byte 0 - .4byte 0x8055A488 + .byte4 $$250133 .4byte 0 - .4byte 0x8055A488 + .byte4 $$250133 .4byte 0 - .4byte 0x8055A490 + .byte4 $$250134 .4byte 0 - .4byte 0x8047EA58 + .byte4 $$250135 .4byte 0 - .4byte 0x8047EA64 + .byte4 $$250136 .4byte 0 - .4byte 0x8047EA70 + .byte4 $$250137 .4byte 0 - .4byte 0x8055A498 + .byte4 $$250138 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step5enemy11whispyapple23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy11whispyapple23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055A4B4 + .byte4 $$250124 .4byte 0 - .4byte 0x8055A4BC + .byte4 $$250125 .4byte 0 - .4byte 0x8047EBD0 + .byte4 $$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 - .4byte 0x8047EE50 + .byte4 $$250127 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047EE7C + .byte4 $$250128 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047EE7C + .byte4 $$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: - .4byte 0x8055C0EC + .byte4 $$250124 .4byte 0 - .4byte 0x8055C0F8 + .byte4 $$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: - .4byte 0x80494610 + .byte4 $$250125 .4byte 0 - .4byte 0x8055C190 + .byte4 $$250126 .4byte 0 - .4byte 0x8055C198 + .byte4 $$250127 .4byte 0 .global T_ANIM_ENTRIES__Q53scn4step6weapon9foleyleaf23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon9foleyleaf23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x8055C244 + .byte4 $$250124 .4byte 0 - .4byte 0x8055C24C + .byte4 $$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: - .4byte 0x80494ED8 + .byte4 $$250125 .4byte 0 - .4byte 0x8055C388 + .byte4 $$250126 .4byte 0 - .4byte 0x8055C390 + .byte4 $$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 - .4byte 0x8025C810 ;# ptr - .4byte 0x802522B8 ;# ptr + .byte4 Create__Q53scn4step4boss6whispy9ModelDescFUlb + .byte4 Create__Q53scn4step4boss10gigantedge9ModelDescFUlb .4byte 0 - .4byte 0x80259DE4 ;# ptr - .4byte 0x8025388C ;# ptr - .4byte 0x80260D68 ;# ptr - .4byte 0x80237C08 ;# ptr - .4byte 0x8024D75C ;# ptr + .byte4 Create__Q53scn4step4boss13watergalboros9ModelDescFUlb + .byte4 Create__Q53scn4step4boss8kingsdoo9ModelDescFUlb + .byte4 Create__Q53scn4step4boss9zankibble9ModelDescFUlb + .byte4 CreateNormal__Q53scn4step4boss7bonkers9ModelDescFUlb + .byte4 Create__Q53scn4step4boss6dubior9ModelDescFUlb .4byte 0 - .4byte 0x80255AC8 ;# ptr + .byte4 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 - .4byte 0x8023DAC8 ;# ptr - .4byte 0x8024B6D4 ;# ptr - .4byte 0x80247C58 ;# ptr - .4byte 0x802486A8 ;# ptr - .4byte 0x80249D44 ;# ptr + .byte4 Create__Q53scn4step4boss15challengemaster9ModelDescFUlb + .byte4 Create__Q53scn4step4boss10creditroah9ModelDescFUlb + .byte4 Create__Q53scn4step4boss12creditdedede9ModelDescFUlb + .byte4 Create__Q53scn4step4boss9creditdee9ModelDescFUlb + .byte4 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: - .4byte 0x80558F00 - .4byte 0x80464D28 - .4byte 0x80464D38 - .4byte 0x80558F08 + .byte4 $$250132 + .byte4 $$250133 + .byte4 $$250134 + .byte4 $$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: - .4byte 0x80558F58 - .4byte 0x80558F60 - .4byte 0x80465650 - .4byte 0x80558F68 - .4byte 0x8046565C - .4byte 0x80558F70 + .byte4 $$250130 + .byte4 $$250131 + .byte4 $$250132 + .byte4 $$250133 + .byte4 $$250134 + .byte4 $$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: - .4byte 0x80465760 + .byte4 $$250170 .4byte 0 .4byte 0 .4byte 0 @@ -11821,107 +11821,107 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss15challengemaster23$$2unnamed$$2ModelDesc_cpp$ .4byte 0x00000004 .4byte 0 .4byte 0 - .4byte 0x80465788 + .byte4 $$250171 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804657B4 + .byte4 $$250172 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804657D8 + .byte4 $$250173 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80465800 + .byte4 $$250174 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80465830 + .byte4 $$250175 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80465860 + .byte4 $$250176 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046588C + .byte4 $$250177 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804658B4 + .byte4 $$250178 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804658E0 + .byte4 $$250179 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80465908 + .byte4 $$250180 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80465938 + .byte4 $$250181 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80465960 + .byte4 $$250182 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80465988 + .byte4 $$250183 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804659B0 + .byte4 $$250184 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804659D8 + .byte4 $$250185 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804659FC + .byte4 $$250186 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80465A24 + .byte4 $$250187 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80465A50 + .byte4 $$250188 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80465A7C + .byte4 $$250189 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80465AA8 + .byte4 $$250190 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80465AD4 + .byte4 $$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: - .4byte 0x80559028 - .4byte 0x80466558 - .4byte 0x80466564 + .byte4 $$250130 + .byte4 $$250131 + .byte4 $$250132 .global $$250137 $$250137: .asciz "JumpStart" @@ -12009,17 +12009,17 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss12creditdedede23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .4byte 0x804665A0 + .byte4 $$250147 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804665C8 + .byte4 $$250148 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804665EC + .byte4 $$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: - .4byte 0x80559078 - .4byte 0x80466828 - .4byte 0x80466834 - .4byte 0x80559080 + .byte4 $$250130 + .byte4 $$250131 + .byte4 $$250132 + .byte4 $$250133 .global $$250138 $$250138: .asciz "JumpStart" @@ -12132,37 +12132,37 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss9creditdee23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804668C8 + .byte4 $$250153 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804668E8 + .byte4 $$250154 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046690C + .byte4 $$250155 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046692C + .byte4 $$250156 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80466950 + .byte4 $$250157 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80466974 + .byte4 $$250158 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046699C + .byte4 $$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: - .4byte 0x805590E0 - .4byte 0x80466C88 - .4byte 0x80466C94 + .byte4 $$250130 + .byte4 $$250131 + .byte4 $$250132 .global $$250137 $$250137: .asciz "JumpStart" @@ -12257,27 +12257,27 @@ T_SCRIPT_ENTRIES__Q53scn4step4boss10creditmeta23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80466CE8 + .byte4 $$250147 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80466D0C + .byte4 $$250148 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80466D30 + .byte4 $$250149 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80466D54 + .byte4 $$250150 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80466D7C + .byte4 $$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: - .4byte 0x80559138 - .4byte 0x80467018 - .4byte 0x80559140 - .4byte 0x80559148 - .4byte 0x80559150 - .4byte 0x80559158 + .byte4 $$250130 + .byte4 $$250131 + .byte4 $$250132 + .byte4 $$250133 + .byte4 $$250134 + .byte4 $$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 - .4byte 0x80467040 + .byte4 $$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 - .4byte 0x80467064 + .byte4 $$250140 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80467088 + .byte4 $$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: - .4byte 0x805591B0 - .4byte 0x805591B8 - .4byte 0x805591C0 - .4byte 0x80467C58 + .byte4 $$250130 + .byte4 $$250131 + .byte4 $$250132 + .byte4 $$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: - .4byte 0x80559210 - .4byte 0x80559218 - .4byte 0x80559220 - .4byte 0x80559228 - .4byte 0x80559230 + .byte4 $$250130 + .byte4 $$250131 + .byte4 $$250132 + .byte4 $$250133 + .byte4 $$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: - .4byte 0x80559330 - .4byte 0x80559338 - .4byte 0x80559340 - .4byte 0x80559348 - .4byte 0x80469E90 - .4byte 0x80559350 - .4byte 0x80559358 - .4byte 0x80559360 - .4byte 0x80469E9C - .4byte 0x80469EA8 - .4byte 0x80469EB4 - .4byte 0x80469EC0 + .byte4 $$250130 + .byte4 $$250131 + .byte4 $$250132 + .byte4 $$250133 + .byte4 $$250134 + .byte4 $$250135 + .byte4 $$250136 + .byte4 $$250137 + .byte4 $$250138 + .byte4 $$250139 + .byte4 $$250140 + .byte4 $$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: - .4byte 0x8046A040 + .byte4 $$250178 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046A05C + .byte4 $$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 - .4byte 0x8046A07C + .byte4 $$250180 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046A0A0 + .byte4 $$250181 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046A0C8 + .byte4 $$250182 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046A0F0 + .byte4 $$250183 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046A110 + .byte4 $$250184 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046A134 + .byte4 $$250185 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046A158 + .byte4 $$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 - .4byte 0x8046A17C + .byte4 $$250187 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046A198 + .byte4 $$250188 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046A1BC + .byte4 $$250189 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046A1DC + .byte4 $$250190 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046A200 + .byte4 $$250191 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046A220 + .byte4 $$250192 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046A240 + .byte4 $$250193 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046A260 + .byte4 $$250194 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046A27C + .byte4 $$250195 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8046A2A0 + .byte4 $$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 - .4byte 0x80473484 + .byte4 $$250131 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804734A8 + .byte4 $$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: - .4byte 0x80559680 - .4byte 0x80473740 - .4byte 0x80559688 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 .global $$250131 $$250131: .asciz "DamageEtc" @@ -13598,12 +13598,12 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy11bladeknight23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .4byte 0x80473798 + .byte4 $$250141 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804737BC + .byte4 $$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 - .4byte 0x804737E8 + .byte4 $$250143 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047381C + .byte4 $$250144 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80473850 + .byte4 $$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 - .4byte 0x8047427C + .byte4 $$250132 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804742AC + .byte4 $$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 - .4byte 0x80474624 + .byte4 $$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 - .4byte 0x80474950 + .byte4 $$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 - .4byte 0x80474970 + .byte4 $$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 - .4byte 0x80474CD4 + .byte4 $$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 - .4byte 0x80474CF8 + .byte4 $$250136 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80474D2C + .byte4 $$250137 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80474D5C + .byte4 $$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: - .4byte 0x80559818 - .4byte 0x80559820 - .4byte 0x80475100 - .4byte 0x80559828 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 .global $$250131 $$250131: .asciz "DamageEtc" @@ -14370,7 +14370,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6chilly23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .4byte 0x804757B0 + .byte4 $$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: - .4byte 0x80559900 - .4byte 0x80559900 - .4byte 0x80475A98 + .byte4 $$250122 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x805599C8 - .4byte 0x804765D0 - .4byte 0x805599D0 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 .global $$250129 $$250129: .asciz "DamageEtc" @@ -14662,12 +14662,12 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy4elec23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .4byte 0x8047660C + .byte4 $$250135 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80476628 + .byte4 $$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: - .4byte 0x80559A08 - .4byte 0x80559A10 - .4byte 0x80559A18 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 .global $$250128 $$250128: .asciz "MoveStart" @@ -14751,17 +14751,17 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000008 .4byte 0 .4byte 0 - .4byte 0x80476AE4 + .byte4 $$250133 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80476B04 + .byte4 $$250134 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80476B24 + .byte4 $$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: - .4byte 0x80559A48 - .4byte 0x80559A50 - .4byte 0x80559A58 - .4byte 0x80559A60 - .4byte 0x80559A68 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 + .byte4 $$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: - .4byte 0x80559A90 - .4byte 0x80559A98 - .4byte 0x80476FD8 - .4byte 0x80559AA0 - .4byte 0x80559AA8 - .4byte 0x80559AB0 - .4byte 0x80559AB8 - .4byte 0x80559AC0 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 + .byte4 $$250126 + .byte4 $$250127 + .byte4 $$250128 + .byte4 $$250129 .global $$250131 $$250131: .asciz "FlightWait" @@ -14904,7 +14904,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5gemra23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .4byte 0x80477020 + .byte4 $$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: - .4byte 0x80559AE0 - .4byte 0x80559AE8 - .4byte 0x80559AF0 - .4byte 0x80559AF8 - .4byte 0x80559AE8 - .4byte 0x80559AE8 - .4byte 0x80559AE8 - .4byte 0x80559B00 - .4byte 0x80559B08 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 + .byte4 $$250123 + .byte4 $$250123 + .byte4 $$250123 + .byte4 $$250126 + .byte4 $$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: - .4byte 0x80559AE0 - .4byte 0x80559AE8 - .4byte 0x80559AF0 - .4byte 0x80559AF8 - .4byte 0x8047733C - .4byte 0x80559B10 - .4byte 0x80559B18 - .4byte 0x80559B00 - .4byte 0x80559B08 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 + .byte4 $$250129 + .byte4 $$250130 + .byte4 $$250131 + .byte4 $$250126 + .byte4 $$250127 .global T_NODE_NAMES_COLD__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES_COLD__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2: - .4byte 0x80559AE0 - .4byte 0x80559AE8 - .4byte 0x80559AF0 - .4byte 0x80559AF8 - .4byte 0x80559AE8 - .4byte 0x80559AE8 - .4byte 0x80559B18 - .4byte 0x80559B20 - .4byte 0x80559B20 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 + .byte4 $$250123 + .byte4 $$250123 + .byte4 $$250131 + .byte4 $$250133 + .byte4 $$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: - .4byte 0x80559B78 - .4byte 0x80559B78 - .4byte 0x80477898 - .4byte 0x80559B80 - .4byte 0x804778A4 + .byte4 $$250122 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 .global $$250132 $$250132: .asciz "DamageEtc" @@ -15124,12 +15124,12 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy7hothead23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .4byte 0x804778EC + .byte4 $$250138 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047790C + .byte4 $$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 - .4byte 0x80477FC0 + .byte4 $$250136 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80477FEC + .byte4 $$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: - .4byte 0x80559C58 - .4byte 0x804783F8 - .4byte 0x80478404 - .4byte 0x80559C60 - .4byte 0x80559C68 - .4byte 0x80478410 - .4byte 0x8047841C - .4byte 0x80478428 - .4byte 0x80478434 - .4byte 0x80478440 - .4byte 0x8047844C - .4byte 0x80478458 - .4byte 0x80478464 + .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 .global $$250138 $$250138: .asciz "LandingL" @@ -15465,7 +15465,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000008 .4byte 0 .4byte 0 - .4byte 0x80478658 + .byte4 $$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 - .4byte 0x8047867C + .byte4 $$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 - .4byte 0x804786A0 + .byte4 $$250166 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804786C0 + .byte4 $$250167 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804786E0 + .byte4 $$250168 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80478704 + .byte4 $$250169 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80478728 + .byte4 $$250170 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80478750 + .byte4 $$250171 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80478770 + .byte4 $$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: - .4byte 0x80559CB0 - .4byte 0x80559CB8 - .4byte 0x80559CC0 - .4byte 0x80478BB0 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 .global $$250132 $$250132: .asciz "DamageEtc" @@ -15613,17 +15613,17 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6lanzer23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .4byte 0x80478BF4 + .byte4 $$250137 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80478C14 + .byte4 $$250138 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80478C30 + .byte4 $$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: - .4byte 0x80559D88 - .4byte 0x80559D90 - .4byte 0x80559D98 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 .global $$250131 $$250131: .asciz "DamageEtc" @@ -15814,7 +15814,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .4byte 0x80479368 + .byte4 $$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 - .4byte 0x80479388 + .byte4 $$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: - .4byte 0x80559E10 - .4byte 0x804797C8 - .4byte 0x804797D4 - .4byte 0x804797E0 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 .global $$250132 $$250132: .asciz "DamageEtc" @@ -15968,12 +15968,12 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5nruff23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047980C + .byte4 $$250134 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80479840 + .byte4 $$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: - .4byte 0x80559E70 - .4byte 0x80559E78 - .4byte 0x80479E10 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 .global $$250128 $$250128: .asciz "ParasolLanding" @@ -16210,7 +16210,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6pierce23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x0000000A .4byte 0 .4byte 0 - .4byte 0x8047A3C4 + .byte4 $$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 - .4byte 0x8047A3E8 + .byte4 $$250135 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047A408 + .byte4 $$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: - .4byte 0x80559FD0 - .4byte 0x8047AC18 - .4byte 0x80559FD8 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$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: - .4byte 0x8055A070 - .4byte 0x8047B480 - .4byte 0x8047B490 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 .global $$250128 $$250128: .asciz "DamageEtc" @@ -16731,7 +16731,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy8searches23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .4byte 0x8047B778 + .byte4 $$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: - .4byte 0x8055A0C8 - .4byte 0x8055A0D0 - .4byte 0x8055A0D8 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 .global $$250131 $$250131: .asciz "DamageEtc" @@ -16806,7 +16806,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .4byte 0x8047BAC4 + .byte4 $$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 - .4byte 0x8047BAE0 + .byte4 $$250141 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047BB00 + .byte4 $$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 - .4byte 0x8047BB1C + .byte4 $$250143 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047BB3C + .byte4 $$250144 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047BB70 + .byte4 $$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: - .4byte 0x8055A138 - .4byte 0x8047C0A0 - .4byte 0x8055A140 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$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: - .4byte 0x8055A160 - .4byte 0x8047C388 - .4byte 0x8047C394 - .4byte 0x8047C3A0 - .4byte 0x8047C3B0 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 + .byte4 $$250126 .global $$250133 $$250133: .asciz "DamageEtc" @@ -17031,7 +17031,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy9sirkibble23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000006 .4byte 0 .4byte 0 - .4byte 0x8047C420 + .byte4 $$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 - .4byte 0x8047C814 + .byte4 $$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 - .4byte 0x8047C838 + .byte4 $$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: - .4byte 0x8055A200 - .4byte 0x8055A208 - .4byte 0x8055A210 - .4byte 0x8055A218 - .4byte 0x8055A220 - .4byte 0x8047CD38 - .4byte 0x8047CD44 - .4byte 0x8047CD50 - .4byte 0x8055A228 - .4byte 0x8055A230 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 + .byte4 $$250126 + .byte4 $$250127 + .byte4 $$250128 + .byte4 $$250129 + .byte4 $$250130 + .byte4 $$250131 .global $$250138 $$250138: .asciz "DamageEtc" @@ -17275,12 +17275,12 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6sodory23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .4byte 0x8047CDC4 + .byte4 $$250144 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047CDE4 + .byte4 $$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: - .4byte 0x8055A270 - .4byte 0x8047D060 - .4byte 0x8047D06C - .4byte 0x8047D078 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 .global $$250131 $$250131: .asciz "DamageEtc" @@ -17392,7 +17392,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6sparky23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .4byte 0x8047D0C8 + .byte4 $$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: - .4byte 0x8055A2C8 - .4byte 0x8055A2D0 - .4byte 0x8047D3F0 - .4byte 0x8055A2D8 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$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: - .4byte 0x8055A320 - .4byte 0x8047DBD8 - .4byte 0x8047DBE4 - .4byte 0x8047DBF0 - .4byte 0x8055A328 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 + .byte4 $$250126 .global $$250133 $$250133: .asciz "DamageEtc" @@ -17779,37 +17779,37 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy9waddledee23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000004 .4byte 0 .4byte 0 - .4byte 0x8047DCDC + .byte4 $$250157 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047DD04 + .byte4 $$250158 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047DD30 + .byte4 $$250159 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047DD58 + .byte4 $$250160 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047DD84 + .byte4 $$250161 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047DDB4 + .byte4 $$250162 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047DDE8 + .byte4 $$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 - .4byte 0x8047DE14 + .byte4 $$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 - .4byte 0x8047DE34 + .byte4 $$250165 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8047DE60 + .byte4 $$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: - .4byte 0x8055A398 - .4byte 0x8047E498 - .4byte 0x8047E4A4 - .4byte 0x8055A3A0 - .4byte 0x8055A3A8 - .4byte 0x8055A3B0 - .4byte 0x8055A3B8 - .4byte 0x8047E4B0 - .4byte 0x8047E4BC - .4byte 0x8055A3C0 - .4byte 0x8047E498 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 + .byte4 $$250126 + .byte4 $$250127 + .byte4 $$250128 + .byte4 $$250129 + .byte4 $$250130 + .byte4 $$250131 + .byte4 $$250123 .global $$250139 $$250139: .asciz "DamageEtc" @@ -18038,7 +18038,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy9waddledoo23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .4byte 0x8047E5B8 + .byte4 $$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 - .4byte 0x8047E5DC + .byte4 $$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: - .4byte 0x8055A438 - .4byte 0x8055A440 - .4byte 0x8055A448 - .4byte 0x8055A450 - .4byte 0x8055A458 - .4byte 0x8055A460 - .4byte 0x8055A468 - .4byte 0x8055A470 - .4byte 0x8055A478 - .4byte 0x8055A480 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 + .byte4 $$250126 + .byte4 $$250127 + .byte4 $$250128 + .byte4 $$250129 + .byte4 $$250130 + .byte4 $$250131 .global $$250135 $$250135: .asciz "DamageEtc" @@ -18263,7 +18263,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2: .4byte 0x00000002 .4byte 0 .4byte 0 - .4byte 0x8047EA80 + .byte4 $$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 - .4byte 0x8047EBDC + .byte4 $$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: - .4byte 0x8055C078 - .4byte 0x80493F58 - .4byte 0x8055C080 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$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: - .4byte 0x8055C090 - .4byte 0x80493FB8 - .4byte 0x8055C098 - .4byte 0x80493FC4 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$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: - .4byte 0x8055C0B8 - .4byte 0x80494030 - .4byte 0x8055C0C0 - .4byte 0x80494040 - .4byte 0x8049404C + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 + .byte4 $$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: - .4byte 0x8055C118 - .4byte 0x8055C120 - .4byte 0x804942D8 - .4byte 0x8055C128 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$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: - .4byte 0x8055C138 - .4byte 0x804943D0 - .4byte 0x804943DC + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$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: - .4byte 0x8055C148 - .4byte 0x80494458 - .4byte 0x80494464 - .4byte 0x80494470 - .4byte 0x8049447C + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 + .byte4 $$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: - .4byte 0x8055C160 - .4byte 0x804944F0 - .4byte 0x804944FC - .4byte 0x80494508 - .4byte 0x80494514 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 + .byte4 $$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: - .4byte 0x8055C1A8 - .4byte 0x8055C1B0 - .4byte 0x80494760 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$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: - .4byte 0x8055C260 - .4byte 0x8055C268 - .4byte 0x8055C270 - .4byte 0x80494AF0 - .4byte 0x8055C278 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$250124 + .byte4 $$250125 + .byte4 $$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: - .4byte 0x8055C290 - .4byte 0x80494B68 - .4byte 0x8055C298 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$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: - .4byte 0x8055C328 - .4byte 0x8055C330 - .4byte 0x8055C338 + .byte4 $$250122 + .byte4 $$250123 + .byte4 $$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: - .4byte 0x80466AB0 - .4byte 0x80466AB0 + .byte4 $$250161 + .byte4 $$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: - .4byte 0x80559180 + .byte4 $$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: - .4byte 0x80559288 - .4byte 0x80559290 + .byte4 $$250130 + .byte4 $$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: - .4byte 0x805592D0 + .byte4 $$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: - .4byte 0x805593E0 - .4byte 0x8046ABC0 + .byte4 $$250130 + .byte4 $$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: - .4byte 0x80559648 - .4byte 0x80559648 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x805596D8 - .4byte 0x80473CE8 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x80559718 - .4byte 0x80559720 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x80559738 - .4byte 0x80474258 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x80559770 - .4byte 0x80559778 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x805597A8 + .byte4 $$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: - .4byte 0x805597D0 - .4byte 0x805597D8 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x804752E0 - .4byte 0x804752E0 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x80559878 - .4byte 0x804754A8 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x805598B0 - .4byte 0x805598B0 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x80559930 + .byte4 $$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: - .4byte 0x80559978 - .4byte 0x80559980 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x805599A8 + .byte4 $$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: - .4byte 0x80559B50 - .4byte 0x80559B50 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x80559BC8 + .byte4 $$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: - .4byte 0x80559BF8 - .4byte 0x80559C00 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x80559D00 + .byte4 $$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: - .4byte 0x80559D40 + .byte4 $$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: - .4byte 0x80559D58 + .byte4 $$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: - .4byte 0x80559DD0 + .byte4 $$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: - .4byte 0x80559E48 - .4byte 0x80479BF8 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x80559EA0 - .4byte 0x8047A3A0 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x80559EE8 - .4byte 0x80559EF0 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x80559F88 + .byte4 $$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: - .4byte 0x80559F98 - .4byte 0x80559F98 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x8055A018 - .4byte 0x8047B010 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x8055A038 + .byte4 $$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: - .4byte 0x8055A0A0 + .byte4 $$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: - .4byte 0x8055A198 - .4byte 0x8047C7F0 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x8055A1D0 + .byte4 $$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: - .4byte 0x8055A2B8 - .4byte 0x8055A2B8 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x8055A2F0 + .byte4 $$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: - .4byte 0x8055A400 + .byte4 $$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: - .4byte 0x8055A4A8 + .byte4 $$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: - .4byte 0x8055A4C8 - .4byte 0x8055A4D0 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x8055C050 + .byte4 $$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: - .4byte 0x8055C0E0 + .byte4 $$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: - .4byte 0x80494210 + .byte4 $$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: - .4byte 0x8055C178 - .4byte 0x8055C180 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x8055C1C0 + .byte4 $$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: - .4byte 0x8055C1E0 - .4byte 0x80494988 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x8055C1F8 - .4byte 0x8055C200 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x8055C220 + .byte4 $$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: - .4byte 0x8055C238 + .byte4 $$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: - .4byte 0x8055C2B0 - .4byte 0x8055C2B8 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x8055C2D0 + .byte4 $$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: - .4byte 0x8055C2E8 + .byte4 $$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: - .4byte 0x8055C358 - .4byte 0x80494E50 + .byte4 $$250122 + .byte4 $$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: - .4byte 0x8055C370 - .4byte 0x8055C378 + .byte4 $$250122 + .byte4 $$250123 .global $$250126 $$250126: .asciz "Loop" @@ -21724,7 +21724,7 @@ $$250125: .balign 4 .global $$2LOCAL$$2CreateStar__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateStar__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .4byte 0x8055C3A0 + .byte4 $$250125 .global $$250570 $$250570: .asciz "TopL" @@ -21735,7 +21735,7 @@ $$250171: .asciz "TopL1x1" .global $$2LOCAL$$2CreateHeavy1x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy1x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .4byte 0x8055C3B8 + .byte4 $$250171 .4byte 0 .global $$250585 $$250585: @@ -21745,7 +21745,7 @@ $$250194: .asciz "TopL2x2" .global $$2LOCAL$$2CreateHeavy2x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy2x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .4byte 0x8055C3D0 + .byte4 $$250194 .4byte 0 .global $$250589 $$250589: @@ -21755,7 +21755,7 @@ $$250217: .asciz "TopL3x3" .global $$2LOCAL$$2CreateHeavy3x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy3x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .4byte 0x8055C3E8 + .byte4 $$250217 .4byte 0 .global $$250593 $$250593: @@ -21765,27 +21765,27 @@ $$250240: .asciz "TopL4x4" .global $$2LOCAL$$2CreateHeavy4x4__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy4x4__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .4byte 0x8055C400 + .byte4 $$250240 .4byte 0 .global $$250597 $$250597: .asciz "TopL4x4" .global $$2LOCAL$$2CreateHeavyA1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavyA1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .4byte 0x80495108 + .byte4 $$250263 .global $$2LOCAL$$2CreateHeavyB1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavyB1x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .4byte 0x80495134 + .byte4 $$250286 .global $$2LOCAL$$2CreateHeavy1x2x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy1x2x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .4byte 0x80495160 + .byte4 $$250309 .4byte 0 .global $$250332 $$250332: .asciz "TopL1x3" .global $$2LOCAL$$2CreateHeavy1x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy1x3__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .4byte 0x8055C428 + .byte4 $$250332 .4byte 0 .global $$250613 $$250613: @@ -21795,24 +21795,24 @@ $$250355: .asciz "TopL3x1" .global $$2LOCAL$$2CreateHeavy3x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy3x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .4byte 0x8055C440 + .byte4 $$250355 .4byte 0 .global $$250617 $$250617: .asciz "TopL3x1" .global $$2LOCAL$$2CreateHeavy2x4x4x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy2x4x4x2__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .4byte 0x804951AC + .byte4 $$250378 .global $$2LOCAL$$2CreateHeavy3x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames $$2LOCAL$$2CreateHeavy3x2x1__Q53scn4step6weapon13vacuumedblock9ModelDescFv$$2nodeNames: - .4byte 0x804951D8 + .byte4 $$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: - .4byte 0x8055C460 + .byte4 $$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: - .4byte 0x8023DAC8 ;# ptr + .byte4 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: - .4byte 0x80559160 + .byte4 $$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: - .4byte 0x805599B4 + .byte4 $$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: - .4byte 0x8055A4E0 + .byte4 $$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: - .4byte 0x8055C05C + .byte4 $$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: - .4byte 0x8055C0A0 + .byte4 $$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: - .4byte 0x8055C0C8 + .byte4 $$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: - .4byte 0x8055C150 + .byte4 $$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: - .4byte 0x8055C168 + .byte4 $$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: - .4byte 0x8055C1CC + .byte4 $$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: - .4byte 0x8055C210 + .byte4 $$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: - .4byte 0x8055C2B0 + .byte4 $$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: - .4byte 0x8055C2F4 + .byte4 $$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: - .4byte 0x8055C46C + .byte4 $$250124 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/ModelDescUtil.s b/asm/src/ModelDescUtil.s index d4f60079..b5cdc849 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: - .4byte 0x80420298 + .byte4 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: - .4byte 0x8055BD74 + .byte4 $$250143 diff --git a/asm/src/Monitor.s b/asm/src/Monitor.s index c8cc2f37..82b096f0 100644 --- a/asm/src/Monitor.s +++ b/asm/src/Monitor.s @@ -168,10 +168,10 @@ $$252078: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251937 $$251937: - .4byte 0x80481B38 + .byte4 $$251935 .global lbl_805629B4 lbl_805629B4: - .4byte 0x80481B44 + .byte4 $$251936 .global $$252079 $$252079: .4byte 0 diff --git a/asm/src/MoveGridGroup.s b/asm/src/MoveGridGroup.s index 14540f49..46787d57 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 - .4byte 0x801BB2B8 ;# ptr + .byte4 __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 11d86af0..acaea2f8 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 - .4byte 0x80414C48 - .4byte 0x80414C54 - .4byte 0x80414C60 - .4byte 0x80414C74 - .4byte 0x80414CD8 - .4byte 0x80414C88 - .4byte 0x80414C94 - .4byte 0x80414CA0 - .4byte 0x80414CB4 - .4byte 0x80414CC8 - .4byte 0x8055FB90 + .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 .global $$252675 $$252675: .4byte 0x801BBC00 ;# ptr diff --git a/asm/src/MoveGroupCtrl.s b/asm/src/MoveGroupCtrl.s index 4f253013..fa4898a1 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 - .4byte 0x8031775C - .4byte 0x80317AB8 - .4byte 0x80317B24 - .4byte 0x802F7CF8 - .4byte 0x802F7CF4 - .4byte 0x802F7CF0 + .byte4 __dt__Q53scn4step7gimmick13movegroupctrl13MoveGroupCtrlFv + .byte4 onSwitchOn__Q53scn4step7gimmick13movegroupctrl13MoveGroupCtrlFv + .byte4 onSwitchOff__Q53scn4step7gimmick13movegroupctrl13MoveGroupCtrlFv + .byte4 onSwitchToggle__Q43scn4step7gimmick14SwitchReceiverFv + .byte4 onSwitchOnFromSuperBeamSwitch__Q43scn4step7gimmick14SwitchReceiverFv + .byte4 checkDemoPos__Q43scn4step7gimmick14SwitchReceiverCFRQ33hel4math7Vector2 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257160 diff --git a/asm/src/MovieButtonContent.s b/asm/src/MovieButtonContent.s index 811decb9..4e5860f7 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: - .4byte 0x80558880 - .4byte 0x80558888 - .4byte 0x8055888C - .4byte 0x80558890 - .4byte 0x80558894 - .4byte 0x804624A8 - .4byte 0x805588A0 - .4byte 0x805588A8 - .4byte 0x804624B4 - .4byte 0x805588B0 - .4byte 0x804624C0 - .4byte 0x805588B8 - .4byte 0x805588C0 - .4byte 0x805588C8 - .4byte 0x804624CC - .4byte 0x804624D8 - .4byte 0x805588D0 - .4byte 0x805588D8 - .4byte 0x804624E4 - .4byte 0x805588E0 - .4byte 0x805588E8 - .4byte 0x805588F0 + .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 .global TABLE__Q43scn7history6detail32$$2unnamed$$2MovieButtonContent_cpp$$2 TABLE__Q43scn7history6detail32$$2unnamed$$2MovieButtonContent_cpp$$2: - .4byte 0x805588F8 - .4byte 0x80558888 - .4byte 0x805588A0 - .4byte 0x804624B4 - .4byte 0x805588F8 - .4byte 0x805588A8 - .4byte 0x804624A8 - .4byte 0x8055888C - .4byte 0x805588E0 - .4byte 0x80558880 - .4byte 0x805588B0 - .4byte 0x80558890 - .4byte 0x805588F8 - .4byte 0x805588F8 - .4byte 0x80558894 - .4byte 0x805588E8 - .4byte 0x804624CC - .4byte 0x80558888 - .4byte 0x804624C0 - .4byte 0x804624D8 - .4byte 0x805588C8 - .4byte 0x805588D0 - .4byte 0x805588F8 - .4byte 0x805588C0 - .4byte 0x805588F8 - .4byte 0x805588D8 - .4byte 0x804624E4 - .4byte 0x805588B8 - .4byte 0x805588F0 + .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 .global $$252003 $$252003: .asciz "history/Detail" diff --git a/asm/src/MovieKindUtil.s b/asm/src/MovieKindUtil.s index 59b66642..9e2f8161 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 - .4byte 0x801CED30 ;# ptr + .byte4 __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: - .4byte 0x8045CCE8 + .byte4 $$248726 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CCF8 + .byte4 $$248727 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CD10 + .byte4 $$248728 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CD24 + .byte4 $$248729 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CD38 + .byte4 $$248730 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CD48 + .byte4 $$248731 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CD60 + .byte4 $$248732 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CD70 + .byte4 $$248733 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CD84 + .byte4 $$248734 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CD94 + .byte4 $$248735 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CDA8 + .byte4 $$248736 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CDB8 + .byte4 $$248737 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CDD0 + .byte4 $$248738 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CDE8 + .byte4 $$248739 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CDFC + .byte4 $$248740 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CE10 + .byte4 $$248741 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CE24 + .byte4 $$248742 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CE38 + .byte4 $$248743 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CE48 + .byte4 $$248744 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CE60 + .byte4 $$248745 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CE78 + .byte4 $$248746 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CE88 + .byte4 $$248747 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CEA0 + .byte4 $$248748 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CEB0 + .byte4 $$248749 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CEC0 + .byte4 $$248750 .4byte 0x3F800000 .4byte 0 - .4byte 0x8045CED0 + .byte4 $$248751 .4byte 0x3F800000 .4byte 0 diff --git a/asm/src/MoviePlayer.s b/asm/src/MoviePlayer.s index 7b71eeda..f7a320fd 100644 --- a/asm/src/MoviePlayer.s +++ b/asm/src/MoviePlayer.s @@ -924,10 +924,10 @@ $$250331: .4byte 0x3F800000 .global $$249607 $$249607: - .4byte 0x801CEDC0 ;# ptr + .byte4 MoDebug__3movFPvPCc .global lbl_8055FC14 lbl_8055FC14: - .4byte 0x801CEDAC ;# ptr + .byte4 MoError__3movFPvPCc .global $$250385 $$250385: .4byte 0x3B800000 diff --git a/asm/src/MovieWindow.s b/asm/src/MovieWindow.s index 886208f0..38ad7cf1 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: - .4byte 0x80558910 - .4byte 0x80462610 - .4byte 0x80462620 - .4byte 0x80462638 - .4byte 0x80558910 - .4byte 0x80462650 - .4byte 0x80462668 - .4byte 0x80462680 - .4byte 0x80462690 - .4byte 0x804626A8 - .4byte 0x804626BC - .4byte 0x804626D8 - .4byte 0x80558910 - .4byte 0x80558910 - .4byte 0x804626E8 - .4byte 0x804626FC - .4byte 0x80462714 - .4byte 0x80558910 - .4byte 0x80462730 - .4byte 0x80462748 - .4byte 0x80462760 - .4byte 0x80462774 - .4byte 0x80558910 - .4byte 0x8046278C - .4byte 0x80558910 - .4byte 0x804627A0 - .4byte 0x804627B8 - .4byte 0x804627D4 - .4byte 0x80558910 + .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 .global $$254931 $$254931: .asciz "MovieWindow" diff --git a/asm/src/MovieYuv.s b/asm/src/MovieYuv.s index 4c4d4d0c..8f466a27 100644 --- a/asm/src/MovieYuv.s +++ b/asm/src/MovieYuv.s @@ -623,11 +623,11 @@ getImage__Q23mov8MovieYuvFPv: __vt__Q23mov8MovieYuv: .4byte 0 .4byte 0 - .4byte 0x801D0670 ;# ptr - .4byte 0x801D0DEC ;# ptr - .4byte 0x801D0DB8 ;# ptr - .4byte 0x801D0AC0 ;# ptr - .4byte 0x801D0B7C ;# ptr + .byte4 __dt__Q23mov8MovieYuvFv + .byte4 getImage__Q23mov8MovieYuvFPv + .byte4 setupRender__Q23mov8MovieYuvCFv + .byte4 restoreRender__Q23mov8MovieYuvCFv + .byte4 setupTexObjs__Q23mov8MovieYuvCFP9_GXTexObj .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/NANDErrorMenu.s b/asm/src/NANDErrorMenu.s index 2aa7a8d5..e8f8b3cc 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: - .4byte 0x80452EE0 + .byte4 $$251882 .global $$253132 $$253132: .asciz "%s%s%s" diff --git a/asm/src/NandThread.s b/asm/src/NandThread.s index 1c1a75f9..9bd02e22 100644 --- a/asm/src/NandThread.s +++ b/asm/src/NandThread.s @@ -1649,49 +1649,49 @@ lbl_801D3020: SaveFiles__4nand: .4byte 0 .4byte 0x0000F0A0 - .4byte 0x8045D2B8 + .byte4 $$249991 .4byte 0x00000001 .4byte 0x000007D8 - .4byte 0x8045D2C4 + .byte4 $$249992 .4byte 0x00000001 .4byte 0x00071C00 - .4byte 0x8045D2D4 + .byte4 $$249993 .4byte 0x00000001 .4byte 0x00071C00 - .4byte 0x8045D2E0 + .byte4 $$249994 .4byte 0x00000001 .4byte 0x00071C00 - .4byte 0x8045D2EC + .byte4 $$249995 .4byte 0x00000002 .4byte 0x00002000 - .4byte 0x8045D2F8 + .byte4 $$249996 .4byte 0x00000002 .4byte 0x00002040 - .4byte 0x8045D308 + .byte4 $$249997 .4byte 0x00000002 .4byte 0x00002020 - .4byte 0x8045D318 + .byte4 $$249998 .4byte 0x00000002 .4byte 0x00008020 - .4byte 0x8045D324 + .byte4 $$249999 .4byte 0x00000002 .4byte 0x00004000 - .4byte 0x8045D334 + .byte4 $$250000 .4byte 0x00000002 .4byte 0x0000F788 - .4byte 0x8045D340 + .byte4 $$250001 .4byte 0x00000002 .4byte 0x00011788 - .4byte 0x8045D350 + .byte4 $$250002 .4byte 0x00000002 .4byte 0x00004260 - .4byte 0x8045D360 + .byte4 $$250003 .4byte 0x00000002 .4byte 0x0005FD20 - .4byte 0x8045D370 + .byte4 $$250004 .4byte 0x00000002 .4byte 0x00065D20 - .4byte 0x8045D37C + .byte4 $$250005 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1772,7 +1772,7 @@ $$249989: .balign 4 .global TMP_DIRECTORY__4nand TMP_DIRECTORY__4nand: - .4byte 0x80557638 + .byte4 $$249989 .global $$251560 $$251560: .asciz "Nand" diff --git a/asm/src/NextArrowPanel.s b/asm/src/NextArrowPanel.s index 88da6f97..ad4837b4 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: - .4byte 0x8055B680 - .4byte 0x8055B688 - .4byte 0x8055B690 - .4byte 0x8055B694 + .byte4 $$253076 + .byte4 $$253077 + .byte4 $$253078 + .byte4 $$253079 .global $$253090 $$253090: - .4byte 0x8055B680 - .4byte 0x8055B688 - .4byte 0x8055B690 - .4byte 0x8055B694 + .byte4 $$253076 + .byte4 $$253077 + .byte4 $$253078 + .byte4 $$253079 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253551 diff --git a/asm/src/Nururi.s b/asm/src/Nururi.s index 3a00f487..d56fa362 100644 --- a/asm/src/Nururi.s +++ b/asm/src/Nururi.s @@ -963,7 +963,7 @@ mode__Q43scn4step4hero6NururiFv: __vt__Q26nururi6Nururi: .4byte 0 .4byte 0 - .4byte 0x801D3510 ;# ptr + .byte4 __dt__Q26nururi6NururiFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/ObjCollReact.s b/asm/src/ObjCollReact.s index 664d36ef..adc592e6 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 - .4byte 0x8028C028 ;# ptr - .4byte 0x8028BF88 ;# ptr + .byte4 __dt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadExtreme$$4PQ43scn4step5enemy5Enemy$$4Ul$$1Fv + .byte4 create__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadExtreme$$4PQ43scn4step5enemy5Enemy$$4Ul$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage14StateDeadSuper$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage14StateDeadSuper$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x8028C024 ;# ptr - .4byte 0x8028BFA8 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage14StateDeadSuper$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage14StateDeadSuper$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateDamageWingToss$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateDamageWingToss$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x8028C020 ;# ptr - .4byte 0x8028BFC4 ;# ptr + .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateDamageWingToss$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateDamageWingToss$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage17StateDamageNormal$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage17StateDamageNormal$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x8028C01C ;# ptr - .4byte 0x8028BFE0 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage17StateDamageNormal$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage17StateDamageNormal$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageExtreme$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageExtreme$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x8028C018 ;# ptr - .4byte 0x8028BFFC ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageExtreme$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x80350838 - .4byte 0x803506F4 + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage20StateSuperTeamAttack$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage20StateSuperTeamAttack$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateGuard$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateGuard$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80350834 - .4byte 0x80350710 + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateGuard$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateGuard$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateHover$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateHover$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80350830 - .4byte 0x8035072C + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateHover$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateHover$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8035082C - .4byte 0x80350748 + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 - .4byte 0x80350828 - .4byte 0x803506D4 + .byte4 __dt__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero6damage12StateExtreme11DamageLevel$$1Fv + .byte4 create__Q24util144StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6damage12StateExtreme$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero6damage12StateExtreme11DamageLevel$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv2$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv2$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80350824 - .4byte 0x80350768 + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv2$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv2$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv1$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv1$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80350820 - .4byte 0x80350784 + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv1$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv1$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateBodyHit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateBodyHit$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8035081C - .4byte 0x803507A0 + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateBodyHit$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateBodyHit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv2$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv2$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80350818 - .4byte 0x803507BC + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv2$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv2$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv3$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv3$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80350814 - .4byte 0x803507D8 + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv3$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12StateFireLv3$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv3$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv3$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80350810 - .4byte 0x803507F4 + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv3$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 b66a3e9f..1b4bf170 100644 --- a/asm/src/ObjInfoImpl.s +++ b/asm/src/ObjInfoImpl.s @@ -347,15 +347,15 @@ state__Q43scn4step4hero11ObjInfoImplCFv: __vt__Q43scn4step4boss11ObjInfoImpl: .4byte 0 .4byte 0 - .4byte 0x80233610 ;# ptr - .4byte 0x80233690 ;# ptr - .4byte 0x802336B8 ;# ptr - .4byte 0x802336E0 ;# ptr - .4byte 0x802336E8 ;# ptr - .4byte 0x802336F0 ;# ptr - .4byte 0x80233718 ;# ptr - .4byte 0x80233720 ;# ptr - .4byte 0x80233748 ;# ptr + .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 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -398,15 +398,15 @@ $$255469: __vt__Q43scn4step4hero11ObjInfoImpl: .4byte 0 .4byte 0 - .4byte 0x8035088C - .4byte 0x8035090C - .4byte 0x80350A04 - .4byte 0x80350A2C - .4byte 0x80350A34 - .4byte 0x80350A3C - .4byte 0x80350A64 - .4byte 0x80350A6C - .4byte 0x80350A94 + .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 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254747 diff --git a/asm/src/ObjStop.s b/asm/src/ObjStop.s index 490cc5e4..82cde08b 100644 --- a/asm/src/ObjStop.s +++ b/asm/src/ObjStop.s @@ -897,11 +897,11 @@ onStopPowerfulFinished__Q43scn4step6weapon7ObjStopFRCQ25ostop5Actor: __vt__Q43scn4step4boss7ObjStop: .4byte 0 .4byte 0 - .4byte 0x802337D4 ;# ptr - .4byte 0x80233878 ;# ptr - .4byte 0x802338BC ;# ptr - .4byte 0x80233914 ;# ptr - .4byte 0x80233978 ;# ptr + .byte4 __dt__Q43scn4step4boss7ObjStopFv + .byte4 onStopNormalStarted__Q43scn4step4boss7ObjStopFRCQ25ostop5Actor + .byte4 onStopNormalFinished__Q43scn4step4boss7ObjStopFRCQ25ostop5Actor + .byte4 onStopPowerfulStarted__Q43scn4step4boss7ObjStopFRCQ25ostop5Actor + .byte4 onStopPowerfulFinished__Q43scn4step4boss7ObjStopFRCQ25ostop5Actor .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -909,11 +909,11 @@ __vt__Q43scn4step4boss7ObjStop: __vt__Q43scn4step5enemy7ObjStop: .4byte 0 .4byte 0 - .4byte 0x8028C090 ;# ptr - .4byte 0x8028C114 ;# ptr - .4byte 0x8028C164 ;# ptr - .4byte 0x8028C1C8 ;# ptr - .4byte 0x8028C208 ;# ptr + .byte4 __dt__Q43scn4step5enemy7ObjStopFv + .byte4 onStopNormalStarted__Q43scn4step5enemy7ObjStopFRCQ25ostop5Actor + .byte4 onStopNormalFinished__Q43scn4step5enemy7ObjStopFRCQ25ostop5Actor + .byte4 onStopPowerfulStarted__Q43scn4step5enemy7ObjStopFRCQ25ostop5Actor + .byte4 onStopPowerfulFinished__Q43scn4step5enemy7ObjStopFRCQ25ostop5Actor .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -921,11 +921,11 @@ __vt__Q43scn4step5enemy7ObjStop: __vt__Q43scn4step4hero7ObjStop: .4byte 0 .4byte 0 - .4byte 0x80350B24 - .4byte 0x80350C40 - .4byte 0x80350C84 - .4byte 0x80350CDC - .4byte 0x80350D40 + .byte4 __dt__Q43scn4step4hero7ObjStopFv + .byte4 onStopNormalStarted__Q43scn4step4hero7ObjStopFRCQ25ostop5Actor + .byte4 onStopNormalFinished__Q43scn4step4hero7ObjStopFRCQ25ostop5Actor + .byte4 onStopPowerfulStarted__Q43scn4step4hero7ObjStopFRCQ25ostop5Actor + .byte4 onStopPowerfulFinished__Q43scn4step4hero7ObjStopFRCQ25ostop5Actor .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -933,11 +933,11 @@ __vt__Q43scn4step4hero7ObjStop: __vt__Q43scn4step4item7ObjStop: .4byte 0 .4byte 0 - .4byte 0x803C4E90 - .4byte 0x803C4F14 - .4byte 0x803C4F58 - .4byte 0x803C4FB0 - .4byte 0x803C5008 + .byte4 __dt__Q43scn4step4item7ObjStopFv + .byte4 onStopNormalStarted__Q43scn4step4item7ObjStopFRCQ25ostop5Actor + .byte4 onStopNormalFinished__Q43scn4step4item7ObjStopFRCQ25ostop5Actor + .byte4 onStopPowerfulStarted__Q43scn4step4item7ObjStopFRCQ25ostop5Actor + .byte4 onStopPowerfulFinished__Q43scn4step4item7ObjStopFRCQ25ostop5Actor .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -945,9 +945,9 @@ __vt__Q43scn4step4item7ObjStop: __vt__Q43scn4step6weapon7ObjStop: .4byte 0 .4byte 0 - .4byte 0x803D7CB8 - .4byte 0x803D7D44 - .4byte 0x803D7D88 - .4byte 0x803D7DE0 - .4byte 0x803D7E3C + .byte4 __dt__Q43scn4step6weapon7ObjStopFv + .byte4 onStopNormalStarted__Q43scn4step6weapon7ObjStopFRCQ25ostop5Actor + .byte4 onStopNormalFinished__Q43scn4step6weapon7ObjStopFRCQ25ostop5Actor + .byte4 onStopPowerfulStarted__Q43scn4step6weapon7ObjStopFRCQ25ostop5Actor + .byte4 onStopPowerfulFinished__Q43scn4step6weapon7ObjStopFRCQ25ostop5Actor .4byte 0 diff --git a/asm/src/OperatorNewDelete.s b/asm/src/OperatorNewDelete.s index 7b855922..512a7b9e 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 - .4byte 0x801BF734 ;# ptr + .byte4 __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 48d65ea1..4ff8addb 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 - .4byte 0x8020DFFC ;# ptr + .byte4 __sinit_$$3Package_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$253252 @@ -959,12 +959,12 @@ $$253256: __vt__Q33scn7history7Package: .4byte 0 .4byte 0 - .4byte 0x8020D6B0 ;# ptr - .4byte 0x8020DD50 ;# ptr - .4byte 0x800E9D20 ;# ptr - .4byte 0x800E9D30 ;# ptr - .4byte 0x800EC990 ;# ptr - .4byte 0x800EC9A0 ;# ptr + .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 0 .4byte 0 .4byte 0 diff --git a/asm/src/PackageButtonContent.s b/asm/src/PackageButtonContent.s index f3f59f54..92ceb9e9 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: - .4byte 0x805589F0 - .4byte 0x805589F8 - .4byte 0x805589FC - .4byte 0x80558A00 - .4byte 0x80558A04 - .4byte 0x80462A78 - .4byte 0x80558A10 - .4byte 0x80558A18 - .4byte 0x80462A84 - .4byte 0x80558A20 - .4byte 0x80462A90 - .4byte 0x80558A28 - .4byte 0x80558A30 - .4byte 0x80558A38 - .4byte 0x80462A9C - .4byte 0x80462AA8 - .4byte 0x80558A40 - .4byte 0x80558A48 - .4byte 0x80558A50 - .4byte 0x80558A58 - .4byte 0x80462AB4 - .4byte 0x80558A60 + .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 .global TABLE__Q43scn7history6detail34$$2unnamed$$2PackageButtonContent_cpp$$2 TABLE__Q43scn7history6detail34$$2unnamed$$2PackageButtonContent_cpp$$2: - .4byte 0x80558A68 - .4byte 0x805589F8 - .4byte 0x80558A10 - .4byte 0x80462A84 - .4byte 0x80558A68 - .4byte 0x80558A18 - .4byte 0x80462A78 - .4byte 0x805589FC - .4byte 0x80558A58 - .4byte 0x805589F0 - .4byte 0x80558A20 - .4byte 0x80558A00 - .4byte 0x80558A68 - .4byte 0x80558A68 - .4byte 0x80558A04 - .4byte 0x80558A50 - .4byte 0x80462A9C - .4byte 0x805589F8 - .4byte 0x80462A90 - .4byte 0x80462AA8 - .4byte 0x80558A38 - .4byte 0x80558A40 - .4byte 0x80558A68 - .4byte 0x80558A30 - .4byte 0x80558A68 - .4byte 0x80558A48 - .4byte 0x80462AB4 - .4byte 0x80558A28 - .4byte 0x80558A60 + .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 .global $$252003 $$252003: .asciz "history/Detail" diff --git a/asm/src/PackageWindow.s b/asm/src/PackageWindow.s index 3029b4a5..9af5f3a7 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 - .4byte 0x80219E54 ;# ptr + .byte4 __sinit_$$3PackageWindow_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$255641 @@ -2136,12 +2136,12 @@ $$256102: __vt__Q43scn7history6detail13PackageWindow: .4byte 0 .4byte 0 - .4byte 0x802187C8 ;# ptr - .4byte 0x80218A70 ;# ptr - .4byte 0x800E9D20 ;# ptr - .4byte 0x800E9D30 ;# ptr - .4byte 0x800EC990 ;# ptr - .4byte 0x800EC9A0 ;# ptr + .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 0 .4byte 0 .4byte 0 diff --git a/asm/src/PageAbility.s b/asm/src/PageAbility.s index 2bb4ca42..2485d486 100644 --- a/asm/src/PageAbility.s +++ b/asm/src/PageAbility.s @@ -226,12 +226,12 @@ $$252592: __vt__Q25pause11PageAbility: .4byte 0 .4byte 0 - .4byte 0x801DC6BC ;# ptr - .4byte 0x801DC64C ;# ptr - .4byte 0x801DC6A8 ;# ptr - .4byte 0x801DC6AC ;# ptr - .4byte 0x801DC6B4 ;# ptr - .4byte 0x801DC6B8 ;# ptr + .byte4 __dt__Q25pause11PageAbilityFv + .byte4 pageFrameTitle__Q25pause11PageAbilityCFv + .byte4 pageMainLayout__Q25pause11PageAbilityFv + .byte4 pageProcAnim__Q25pause11PageAbilityFv + .byte4 pageProcHID__Q25pause11PageAbilityFv + .byte4 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 8a6cb32c..f4eda044 100644 --- a/asm/src/PageCommand.s +++ b/asm/src/PageCommand.s @@ -553,12 +553,12 @@ $$252960: __vt__Q25pause11PageCommand: .4byte 0 .4byte 0 - .4byte 0x801DCDF0 ;# ptr - .4byte 0x801DCD28 ;# ptr - .4byte 0x801DCD80 ;# ptr - .4byte 0x801DCD88 ;# ptr - .4byte 0x801DCDE8 ;# ptr - .4byte 0x801DCDEC ;# ptr + .byte4 __dt__Q25pause11PageCommandFv + .byte4 pageFrameTitle__Q25pause11PageCommandCFv + .byte4 pageMainLayout__Q25pause11PageCommandFv + .byte4 pageProcAnim__Q25pause11PageCommandFv + .byte4 pageProcHID__Q25pause11PageCommandFv + .byte4 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 d86bd701..2b47e86d 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: - .4byte 0x8055FCC0 + .byte4 T_ENTRIES_STAGE__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 .4byte 0x00000002 - .4byte 0x8055FCC8 + .byte4 T_ENTRIES_LEVELMAP__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 .4byte 0x00000002 - .4byte 0x80415438 + .byte4 T_ENTRIES_CHALLENGE__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 .4byte 0x00000003 - .4byte 0x8055FCD0 + .byte4 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: - .4byte 0x8045D8E8 - .4byte 0x8045D8F4 - .4byte 0x8045D8F4 - .4byte 0x8045D900 - .4byte 0x8045D914 - .4byte 0x805578D8 - .4byte 0x805578D8 - .4byte 0x8045D8F4 - .4byte 0x8045D924 + .byte4 $$252145 + .byte4 $$252146 + .byte4 $$252146 + .byte4 $$252147 + .byte4 $$252148 + .byte4 $$252149 + .byte4 $$252149 + .byte4 $$252146 + .byte4 $$252150 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -936,12 +936,12 @@ $$253492: __vt__Q25pause11PageDropout: .4byte 0 .4byte 0 - .4byte 0x801DD928 ;# ptr - .4byte 0x801DD44C ;# ptr - .4byte 0x801DD458 ;# ptr - .4byte 0x801DD45C ;# ptr - .4byte 0x801DD4C4 ;# ptr - .4byte 0x801DD4F4 ;# ptr + .byte4 __dt__Q25pause11PageDropoutFv + .byte4 pageFrameTitle__Q25pause11PageDropoutCFv + .byte4 pageMainLayout__Q25pause11PageDropoutFv + .byte4 pageProcAnim__Q25pause11PageDropoutFv + .byte4 pageProcHID__Q25pause11PageDropoutFv + .byte4 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 663498ef..df9af045 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: - .4byte 0x80557908 + .byte4 $$252167 .global T_FIX_NODE_NAME__Q25pause25$$2unnamed$$2PageManager_cpp$$2 T_FIX_NODE_NAME__Q25pause25$$2unnamed$$2PageManager_cpp$$2: - .4byte 0x8045DA78 + .byte4 $$252168 diff --git a/asm/src/Parasol.s b/asm/src/Parasol.s index 5bf45859..c4eb87ce 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: - .4byte 0x8055B240 + .byte4 $$248740 .4byte 0 - .4byte 0x8055B248 + .byte4 $$248741 .4byte 0 - .4byte 0x8048B390 + .byte4 $$248742 .4byte 0 - .4byte 0x8048B39C + .byte4 $$248743 .4byte 0 - .4byte 0x8048B3A8 + .byte4 $$248744 .4byte 0 - .4byte 0x8055B250 + .byte4 $$248745 .4byte 0 - .4byte 0x8055B258 + .byte4 $$248746 .4byte 0 - .4byte 0x8055B260 + .byte4 $$248747 .4byte 0 - .4byte 0x8048B3B4 + .byte4 $$248748 .4byte 0 - .4byte 0x8055B268 + .byte4 $$248749 .4byte 0 - .4byte 0x8048B3C0 + .byte4 $$248750 .4byte 0 - .4byte 0x8048B3CC + .byte4 $$248751 .4byte 0 - .4byte 0x8048B3DC + .byte4 $$248752 .4byte 0 - .4byte 0x8048B3F0 + .byte4 $$248753 .4byte 0 - .4byte 0x8048B400 + .byte4 $$248754 .4byte 0 - .4byte 0x8055B270 + .byte4 $$248755 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -413,27 +413,27 @@ $$257637: __vt__Q53scn4step4hero7parasol7Parasol: .4byte 0 .4byte 0 - .4byte 0x803925A4 - .4byte 0x80392630 - .4byte 0x8032B7A0 - .4byte 0x8032B7A4 - .4byte 0x8032B7A8 - .4byte 0x80392738 - .4byte 0x80392870 - .4byte 0x8032B7B4 - .4byte 0x8032B7B8 - .4byte 0x8032B7BC - .4byte 0x8032B7C0 - .4byte 0x8032B7C4 - .4byte 0x8032B7C8 - .4byte 0x8032B7CC - .4byte 0x8032B7D0 - .4byte 0x8032B7D4 - .4byte 0x8032B7D8 - .4byte 0x80392850 - .4byte 0x8032B7E0 - .4byte 0x8032B7E4 - .4byte 0x8032B7E8 + .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 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 @@ -447,8 +447,8 @@ $$248733: .balign 4 .global $$2LOCAL$$2ParasolModel__Q53scn4step4hero9modeldesc7ParasolFv$$2names$$21 $$2LOCAL$$2ParasolModel__Q53scn4step4hero9modeldesc7ParasolFv$$2names$$21: - .4byte 0x8055B228 - .4byte 0x8055B230 + .byte4 $$248732 + .byte4 $$248733 .global $$248740 $$248740: .asciz "Carry" diff --git a/asm/src/PauseManager.s b/asm/src/PauseManager.s index e96b3c55..25032863 100644 --- a/asm/src/PauseManager.s +++ b/asm/src/PauseManager.s @@ -146,5 +146,5 @@ lbl_80277988: __vt__Q43scn4step4core12PauseManager: .4byte 0 .4byte 0 - .4byte 0x8021F370 ;# ptr - .4byte 0x8027790C ;# ptr + .byte4 __dt__Q43scn4step4core12PauseManagerFv + .byte4 onResultDecided__Q43scn4step4core12PauseManagerFRCQ25pause5Pause diff --git a/asm/src/PerformanceController.s b/asm/src/PerformanceController.s index 37c7bd98..704204d6 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 - .4byte 0x8017A9D4 ;# ptr + .byte4 __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 e4412ced..b4741dc9 100644 --- a/asm/src/PermEffect.s +++ b/asm/src/PermEffect.s @@ -348,9 +348,9 @@ onStopPowerfulFinished__Q43scn4step4core10PermEffectFRCQ25ostop5Actor: __vt__Q43scn4step4core10PermEffect: .4byte 0 .4byte 0 - .4byte 0x8027814C ;# ptr - .4byte 0x80278270 ;# ptr - .4byte 0x80278280 ;# ptr - .4byte 0x80278290 ;# ptr - .4byte 0x802782D0 ;# ptr + .byte4 __dt__Q43scn4step4core10PermEffectFv + .byte4 onStopNormalStarted__Q43scn4step4core10PermEffectFRCQ25ostop5Actor + .byte4 onStopNormalFinished__Q43scn4step4core10PermEffectFRCQ25ostop5Actor + .byte4 onStopPowerfulStarted__Q43scn4step4core10PermEffectFRCQ25ostop5Actor + .byte4 onStopPowerfulFinished__Q43scn4step4core10PermEffectFRCQ25ostop5Actor .4byte 0 diff --git a/asm/src/PlayerWindow.s b/asm/src/PlayerWindow.s index d5c4e6c8..b7d2838b 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: - .4byte 0x80495B90 - .4byte 0x80495B9C - .4byte 0x80495BB0 + .byte4 $$251655 + .byte4 $$251656 + .byte4 $$251657 .global $$252109 $$252109: .asciz "grandmenu/Main" diff --git a/asm/src/Point2.s b/asm/src/Point2.s index 0b63e831..c80b0279 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 - .4byte 0x8019EC6C ;# ptr + .byte4 __sinit_$$3Point2_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249826 diff --git a/asm/src/Product.s b/asm/src/Product.s index 12992814..f59ab375 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 - .4byte 0x8021A024 ;# ptr + .byte4 __sinit_$$3Product_cpp .section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$249032 diff --git a/asm/src/ProgressCtrl.s b/asm/src/ProgressCtrl.s index 428d1094..dad399fa 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 - .4byte 0x8023F8A0 ;# ptr - .4byte 0x8023F864 ;# ptr + .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateLoseFly$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateLoseFly$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateWinFly$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateWinFly$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8023F89C ;# ptr - .4byte 0x8023F880 ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateWinFly$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 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 f816d001..662863dc 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 - .4byte 0x80185DD0 ;# ptr - .4byte 0x80184EBC ;# ptr - .4byte 0x80186588 ;# ptr - .4byte 0x80186538 ;# ptr - .4byte 0x801864E0 ;# ptr - .4byte 0x80185294 ;# ptr - .4byte 0x80185304 ;# ptr - .4byte 0x8018644C ;# ptr - .4byte 0x801863FC ;# ptr - .4byte 0x801863A4 ;# ptr - .4byte 0x801852B0 ;# ptr - .4byte 0x80185320 ;# ptr - .4byte 0x80186310 ;# ptr - .4byte 0x801862C0 ;# ptr - .4byte 0x80186268 ;# ptr - .4byte 0x801852CC ;# ptr - .4byte 0x8018533C ;# ptr - .4byte 0x801861C8 ;# ptr - .4byte 0x80186178 ;# ptr - .4byte 0x80186120 ;# ptr - .4byte 0x801852E8 ;# ptr - .4byte 0x80185358 ;# ptr - .4byte 0x80185C38 ;# ptr - .4byte 0x80185F48 ;# ptr + .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 .global __vt__Q34nw4r2ef37MemoryManagerTmp$$0Q34nw4r2ef8Particle$$1 __vt__Q34nw4r2ef37MemoryManagerTmp$$0Q34nw4r2ef8Particle$$1: .4byte 0 .4byte 0 - .4byte 0x80186258 ;# ptr + .byte4 AssignObjectID__Q34nw4r2ef37MemoryManagerTmp$$0Q34nw4r2ef8Particle$$1FPv .global __vt__Q34nw4r2ef45MemoryManagerTmp$$0Q34nw4r2ef15ParticleManager$$1 __vt__Q34nw4r2ef45MemoryManagerTmp$$0Q34nw4r2ef15ParticleManager$$1: .4byte 0 .4byte 0 - .4byte 0x801863A0 ;# ptr + .byte4 AssignObjectID__Q34nw4r2ef45MemoryManagerTmp$$0Q34nw4r2ef15ParticleManager$$1FPv .global __vt__Q34nw4r2ef36MemoryManagerTmp$$0Q34nw4r2ef7Emitter$$1 __vt__Q34nw4r2ef36MemoryManagerTmp$$0Q34nw4r2ef7Emitter$$1: .4byte 0 .4byte 0 - .4byte 0x801864DC ;# ptr + .byte4 AssignObjectID__Q34nw4r2ef36MemoryManagerTmp$$0Q34nw4r2ef7Emitter$$1FPv .global __vt__Q34nw4r2ef35MemoryManagerTmp$$0Q34nw4r2ef6Effect$$1 __vt__Q34nw4r2ef35MemoryManagerTmp$$0Q34nw4r2ef6Effect$$1: .4byte 0 .4byte 0 - .4byte 0x80186618 ;# ptr + .byte4 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 4545a314..0ecb9f41 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 - .4byte 0x803D3328 + .byte4 __dt__Q43scn4step6vacuum12ReceiverBaseFv .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80236568 ;# ptr - .4byte 0x80236564 ;# ptr - .4byte 0x80236560 ;# ptr - .4byte 0x8023655C ;# ptr - .4byte 0x80236554 ;# ptr - .4byte 0x80236550 ;# ptr - .4byte 0x8023654C ;# ptr - .4byte 0x80236548 ;# ptr - .4byte 0x80236544 ;# ptr - .4byte 0x80236540 ;# ptr - .4byte 0x80236558 ;# ptr - .4byte 0x803D33A8 + .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 .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 4a24d500..5709d773 100644 --- a/asm/src/Regset.s +++ b/asm/src/Regset.s @@ -2374,12 +2374,12 @@ $$251264: __vt__Q26mintvm6Regset: .4byte 0 .4byte 0 - .4byte 0x801C0838 ;# ptr + .byte4 __dt__Q26mintvm6RegsetFv .global __vt__Q26mintvm8RNObject __vt__Q26mintvm8RNObject: .4byte 0 .4byte 0 - .4byte 0x801C0928 ;# ptr + .byte4 __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 e348cc0d..aa0247b8 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: - .4byte 0x80453020 + .byte4 $$251961 .4byte 0 diff --git a/asm/src/ResourceFileName.s b/asm/src/ResourceFileName.s index af081870..5437d0de 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: - .4byte 0x80456930 + .byte4 $$248726 .global LAYOUT_FRA_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2 LAYOUT_FRA_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: - .4byte 0x80456944 + .byte4 $$248728 .global LAYOUT_SPA_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2 LAYOUT_SPA_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: - .4byte 0x80456958 + .byte4 $$248729 .global MESSAGE_NORMAL_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2 MESSAGE_NORMAL_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: - .4byte 0x8045696C + .byte4 $$248732 .global MESSAGE_WARNING_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2 MESSAGE_WARNING_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: - .4byte 0x80456980 + .byte4 $$248733 .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global CONFIG_FILENAME__Q23hbm16ResourceFileName CONFIG_FILENAME__Q23hbm16ResourceFileName: - .4byte 0x80456990 + .byte4 $$248734 .global SPEAKER_SE_FILENAME__Q23hbm16ResourceFileName SPEAKER_SE_FILENAME__Q23hbm16ResourceFileName: - .4byte 0x804569A0 + .byte4 $$248735 .global SE_FILENAME__Q23hbm16ResourceFileName SE_FILENAME__Q23hbm16ResourceFileName: - .4byte 0x804569B4 + .byte4 $$248736 .4byte 0 diff --git a/asm/src/Result.s b/asm/src/Result.s index dcb4c310..c3220f0b 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: - .4byte 0x804908D0 - .4byte 0x804908E4 - .4byte 0x804908FC - .4byte 0x80490914 - .4byte 0x80490928 - .4byte 0x8049093C - .4byte 0x80490950 - .4byte 0x80490964 - .4byte 0x80490978 + .byte4 $$253563 + .byte4 $$253564 + .byte4 $$253565 + .byte4 $$253566 + .byte4 $$253567 + .byte4 $$253568 + .byte4 $$253569 + .byte4 $$253570 + .byte4 $$253571 .global $$257484 $$257484: .asciz "masterresult/Main" diff --git a/asm/src/ResultLyt.s b/asm/src/ResultLyt.s index 0ac10d41..b0993961 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: - .4byte 0x8045F0F8 - .4byte 0x8045F10C - .4byte 0x8045F124 - .4byte 0x8045F138 - .4byte 0x8045F14C - .4byte 0x8045F160 - .4byte 0x8045F174 - .4byte 0x8045F188 - .4byte 0x8045F1A0 + .byte4 $$253950 + .byte4 $$253951 + .byte4 $$253952 + .byte4 $$253953 + .byte4 $$253954 + .byte4 $$253955 + .byte4 $$253956 + .byte4 $$253957 + .byte4 $$253958 .global $$258204 $$258204: .asciz "challengeresult/Main" diff --git a/asm/src/Rumble.s b/asm/src/Rumble.s index 673b8a7e..f0d4486f 100644 --- a/asm/src/Rumble.s +++ b/asm/src/Rumble.s @@ -106,15 +106,15 @@ $$252003: __vt__Q33scn19challengefileselect6Rumble: .4byte 0 .4byte 0 - .4byte 0x801E43F0 ;# ptr - .4byte 0x801E43A0 ;# ptr - .4byte 0x801E43A4 ;# ptr - .4byte 0x801E43B4 ;# ptr - .4byte 0x801E43C0 ;# ptr - .4byte 0x801E43CC ;# ptr - .4byte 0x801E43D8 ;# ptr - .4byte 0x801E43DC ;# ptr - .4byte 0x801E43E4 ;# ptr + .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 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/RumbleResource.s b/asm/src/RumbleResource.s index fa56dd1c..db2d6f52 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: - .4byte 0x80456F40 - .4byte 0x80456F5C + .byte4 $$248751 + .byte4 $$248752 diff --git a/asm/src/Runner.s b/asm/src/Runner.s index aab20635..05d1db4d 100644 --- a/asm/src/Runner.s +++ b/asm/src/Runner.s @@ -1885,7 +1885,7 @@ $$253157: __vt__Q26mintvm6Runner: .4byte 0 .4byte 0 - .4byte 0x801C07C0 ;# ptr + .byte4 __dt__Q26mintvm6RunnerFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SDKAllocator.s b/asm/src/SDKAllocator.s index e2f8cc57..8c971cb8 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: - .4byte 0x801BF778 ;# ptr - .4byte 0x801BF794 ;# ptr + .byte4 Alloc__Q23mem12SDKAllocatorFP12MEMAllocatorUl + .byte4 Free__Q23mem12SDKAllocatorFP12MEMAllocatorPv diff --git a/asm/src/SceneAnime.s b/asm/src/SceneAnime.s index a71ed7c7..577d2db9 100644 --- a/asm/src/SceneAnime.s +++ b/asm/src/SceneAnime.s @@ -482,19 +482,19 @@ $$252939: __vt__Q33scn5anime10SceneAnime: .4byte 0 .4byte 0 - .4byte 0x801E2F7C ;# ptr - .4byte 0x801E2E08 ;# ptr - .4byte 0x801E2E9C ;# ptr - .4byte 0x801E2E74 ;# ptr - .4byte 0x801E2EC4 ;# ptr - .4byte 0x801E2EEC ;# ptr - .4byte 0x801E2F24 ;# ptr + .byte4 GetRuntimeTypeInfo__Q33scn5anime10SceneAnimeCFv + .byte4 __dt__Q33scn5anime10SceneAnimeFv + .byte4 updateMain__Q33scn5anime10SceneAnimeFv + .byte4 updateUseGPU__Q33scn5anime10SceneAnimeFv + .byte4 updateDebug__Q33scn5anime10SceneAnimeFv + .byte4 draw__Q33scn5anime10SceneAnimeFRCQ23scn11DrawReqInfo + .byte4 isSceneEnd__Q33scn5anime10SceneAnimeCFv .global __vt__Q23scn6IScene __vt__Q23scn6IScene: .4byte 0 .4byte 0 - .4byte 0x801E2F80 ;# ptr - .4byte 0x80175B68 ;# ptr + .byte4 GetRuntimeTypeInfo__Q23scn6ISceneCFv + .byte4 __dt__Q23scn6ISceneFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneChallengeFileSelect.s b/asm/src/SceneChallengeFileSelect.s index 315943e7..f0e57381 100644 --- a/asm/src/SceneChallengeFileSelect.s +++ b/asm/src/SceneChallengeFileSelect.s @@ -5191,67 +5191,67 @@ $$265584: $$265585: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80400920 + .byte4 setColor__Q23sfx4FadeFRC8_GXColor .global $$265586 $$265586: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80400908 + .byte4 setFadeOut__Q23sfx4FadeFUl .global $$265587 $$265587: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x804007C4 + .byte4 update__Q23sfx4FadeFv .global $$265588 $$265588: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8040096C + .byte4 isEnd__Q23sfx4FadeCFv .global $$265589 $$265589: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801E42F4 ;# ptr + .byte4 isBackEnd__Q33scn19challengefileselect5FrameCFv .global $$265590 $$265590: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80400920 + .byte4 setColor__Q23sfx4FadeFRC8_GXColor .global $$265591 $$265591: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80400908 + .byte4 setFadeOut__Q23sfx4FadeFUl .global $$265592 $$265592: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x804007C4 + .byte4 update__Q23sfx4FadeFv .global $$265593 $$265593: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8040096C + .byte4 isEnd__Q23sfx4FadeCFv .global $$265594 $$265594: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80400920 + .byte4 setColor__Q23sfx4FadeFRC8_GXColor .global $$265595 $$265595: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80400908 + .byte4 setFadeOut__Q23sfx4FadeFUl .global $$265596 $$265596: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x804007C4 + .byte4 update__Q23sfx4FadeFv .global $$265597 $$265597: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8040096C + .byte4 isEnd__Q23sfx4FadeCFv .global $$265598 $$265598: .4byte 0 @@ -5261,17 +5261,17 @@ $$265598: $$265599: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801E3950 ;# ptr + .byte4 close__Q33scn19challengefileselect13DeleteConfirmFv .global $$265600 $$265600: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801E398C ;# ptr + .byte4 closed__Q33scn19challengefileselect13DeleteConfirmCFv .global $$265601 $$265601: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801A7C10 ;# ptr + .byte4 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 - .4byte 0x801E91F0 ;# ptr - .4byte 0x801E8934 ;# ptr - .4byte 0x801E8974 ;# ptr - .4byte 0x801E8990 ;# ptr + .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 .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 - .4byte 0x801E91EC ;# ptr - .4byte 0x801E89C8 ;# ptr - .4byte 0x801E8A08 ;# ptr - .4byte 0x801E8A24 ;# ptr + .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 .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 - .4byte 0x801E91E8 ;# ptr - .4byte 0x801E8A58 ;# ptr - .4byte 0x801E8A98 ;# ptr - .4byte 0x801E8AB4 ;# ptr + .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 .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 - .4byte 0x801E91E4 ;# ptr - .4byte 0x801E8AE8 ;# ptr - .4byte 0x801E8B28 ;# ptr - .4byte 0x801E8B44 ;# ptr + .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 .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 - .4byte 0x801E91E0 ;# ptr - .4byte 0x801E8B84 ;# ptr - .4byte 0x801E8BC4 ;# ptr - .4byte 0x801E8BE0 ;# ptr + .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 .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 - .4byte 0x801E91DC ;# ptr - .4byte 0x801E8C28 ;# ptr - .4byte 0x801E8C68 ;# ptr - .4byte 0x801E8C84 ;# ptr + .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 .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 - .4byte 0x801E9180 ;# ptr - .4byte 0x801E8C88 ;# ptr - .4byte 0x801E8CC8 ;# ptr - .4byte 0x801E8CE4 ;# ptr + .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 .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 - .4byte 0x801E9124 ;# ptr - .4byte 0x801E8D24 ;# ptr - .4byte 0x801E8D64 ;# ptr - .4byte 0x801E8D80 ;# ptr + .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 .global __vt__Q43std3tr16detail20function_base$$0PFv_b$$1 __vt__Q43std3tr16detail20function_base$$0PFv_b$$1: .4byte 0 .4byte 0 - .4byte 0x801A6E88 ;# ptr + .byte4 __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 - .4byte 0x801E90B8 ;# ptr - .4byte 0x801E8DC8 ;# ptr - .4byte 0x801E8E08 ;# ptr - .4byte 0x801E8E24 ;# ptr + .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 .global __vt__Q43std3tr16detail20function_base$$0PFv_v$$1 __vt__Q43std3tr16detail20function_base$$0PFv_v$$1: .4byte 0 .4byte 0 - .4byte 0x80015030 ;# ptr + .byte4 __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 - .4byte 0x801E8930 ;# ptr - .4byte 0x801E5C6C ;# ptr - .4byte 0x801E5E00 ;# ptr - .4byte 0x801E5DF8 ;# ptr - .4byte 0x801E8218 ;# ptr - .4byte 0x801E821C ;# ptr - .4byte 0x801E82D4 ;# ptr + .byte4 GetRuntimeTypeInfo__Q33scn19challengefileselect24SceneChallengeFileSelectCFv + .byte4 __dt__Q33scn19challengefileselect24SceneChallengeFileSelectFv + .byte4 updateMain__Q33scn19challengefileselect24SceneChallengeFileSelectFv + .byte4 updateUseGPU__Q33scn19challengefileselect24SceneChallengeFileSelectFv + .byte4 updateDebug__Q33scn19challengefileselect24SceneChallengeFileSelectFv + .byte4 draw__Q33scn19challengefileselect24SceneChallengeFileSelectFRCQ23scn11DrawReqInfo + .byte4 isSceneEnd__Q33scn19challengefileselect24SceneChallengeFileSelectCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneChallengeResult.s b/asm/src/SceneChallengeResult.s index 691e37c6..d857a683 100644 --- a/asm/src/SceneChallengeResult.s +++ b/asm/src/SceneChallengeResult.s @@ -829,13 +829,13 @@ $$254440: __vt__Q33scn15challengeresult20SceneChallengeResult: .4byte 0 .4byte 0 - .4byte 0x801F10BC ;# ptr - .4byte 0x801F0D5C ;# ptr - .4byte 0x801F0F24 ;# ptr - .4byte 0x801F0F20 ;# ptr - .4byte 0x801F1028 ;# ptr - .4byte 0x801F102C ;# ptr - .4byte 0x801F107C ;# ptr + .byte4 GetRuntimeTypeInfo__Q33scn15challengeresult20SceneChallengeResultCFv + .byte4 __dt__Q33scn15challengeresult20SceneChallengeResultFv + .byte4 updateMain__Q33scn15challengeresult20SceneChallengeResultFv + .byte4 updateUseGPU__Q33scn15challengeresult20SceneChallengeResultFv + .byte4 updateDebug__Q33scn15challengeresult20SceneChallengeResultFv + .byte4 draw__Q33scn15challengeresult20SceneChallengeResultFRCQ23scn11DrawReqInfo + .byte4 isSceneEnd__Q33scn15challengeresult20SceneChallengeResultCFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254439 diff --git a/asm/src/SceneChallengeTitle.s b/asm/src/SceneChallengeTitle.s index ca40d691..3a8fe270 100644 --- a/asm/src/SceneChallengeTitle.s +++ b/asm/src/SceneChallengeTitle.s @@ -492,13 +492,13 @@ $$252720: __vt__Q33scn14challengetitle19SceneChallengeTitle: .4byte 0 .4byte 0 - .4byte 0x801EFBBC ;# ptr - .4byte 0x801EFA0C ;# ptr - .4byte 0x801EFAA0 ;# ptr - .4byte 0x801EFA78 ;# ptr - .4byte 0x801EFAF4 ;# ptr - .4byte 0x801EFB1C ;# ptr - .4byte 0x801EFB44 ;# ptr + .byte4 GetRuntimeTypeInfo__Q33scn14challengetitle19SceneChallengeTitleCFv + .byte4 __dt__Q33scn14challengetitle19SceneChallengeTitleFv + .byte4 updateMain__Q33scn14challengetitle19SceneChallengeTitleFv + .byte4 updateUseGPU__Q33scn14challengetitle19SceneChallengeTitleFv + .byte4 updateDebug__Q33scn14challengetitle19SceneChallengeTitleFv + .byte4 draw__Q33scn14challengetitle19SceneChallengeTitleFRCQ23scn11DrawReqInfo + .byte4 isSceneEnd__Q33scn14challengetitle19SceneChallengeTitleCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneChallengeTutorial.s b/asm/src/SceneChallengeTutorial.s index c3eabc6f..384f0464 100644 --- a/asm/src/SceneChallengeTutorial.s +++ b/asm/src/SceneChallengeTutorial.s @@ -676,13 +676,13 @@ $$253523: __vt__Q33scn17challengetutorial22SceneChallengeTutorial: .4byte 0 .4byte 0 - .4byte 0x801F7044 ;# ptr - .4byte 0x801F6E00 ;# ptr - .4byte 0x801F6E98 ;# ptr - .4byte 0x801F6E94 ;# ptr - .4byte 0x801F6FF4 ;# ptr - .4byte 0x801F6FF8 ;# ptr - .4byte 0x801F7030 ;# ptr + .byte4 GetRuntimeTypeInfo__Q33scn17challengetutorial22SceneChallengeTutorialCFv + .byte4 __dt__Q33scn17challengetutorial22SceneChallengeTutorialFv + .byte4 updateMain__Q33scn17challengetutorial22SceneChallengeTutorialFv + .byte4 updateUseGPU__Q33scn17challengetutorial22SceneChallengeTutorialFv + .byte4 updateDebug__Q33scn17challengetutorial22SceneChallengeTutorialFv + .byte4 draw__Q33scn17challengetutorial22SceneChallengeTutorialFRCQ23scn11DrawReqInfo + .byte4 isSceneEnd__Q33scn17challengetutorial22SceneChallengeTutorialCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneComic.s b/asm/src/SceneComic.s index 1e3f0dea..b2e9f1b9 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: - .4byte 0x80460358 - .4byte 0x80460368 - .4byte 0x80460378 + .byte4 $$251709 + .byte4 $$251710 + .byte4 $$251711 .global $$252094 $$252094: .asciz "ComicCommon.dn" @@ -320,13 +320,13 @@ $$252099: __vt__Q33scn5comic10SceneComic: .4byte 0 .4byte 0 - .4byte 0x802006DC ;# ptr - .4byte 0x80200598 ;# ptr - .4byte 0x8020062C ;# ptr - .4byte 0x80200604 ;# ptr - .4byte 0x80200654 ;# ptr - .4byte 0x8020067C ;# ptr - .4byte 0x802006B4 ;# ptr + .byte4 GetRuntimeTypeInfo__Q33scn5comic10SceneComicCFv + .byte4 __dt__Q33scn5comic10SceneComicFv + .byte4 updateMain__Q33scn5comic10SceneComicFv + .byte4 updateUseGPU__Q33scn5comic10SceneComicFv + .byte4 updateDebug__Q33scn5comic10SceneComicFv + .byte4 draw__Q33scn5comic10SceneComicFRCQ23scn11DrawReqInfo + .byte4 isSceneEnd__Q33scn5comic10SceneComicCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneGrandMenu.s b/asm/src/SceneGrandMenu.s index 6e5ea738..35d58f2a 100644 --- a/asm/src/SceneGrandMenu.s +++ b/asm/src/SceneGrandMenu.s @@ -449,13 +449,13 @@ $$249820: __vt__Q33scn9grandmenu14SceneGrandMenu: .4byte 0 .4byte 0 - .4byte 0x803F4548 - .4byte 0x803F43EC - .4byte 0x803F4480 - .4byte 0x803F4458 - .4byte 0x803F44A8 - .4byte 0x803F44D0 - .4byte 0x803F44F8 + .byte4 GetRuntimeTypeInfo__Q33scn9grandmenu14SceneGrandMenuCFv + .byte4 __dt__Q33scn9grandmenu14SceneGrandMenuFv + .byte4 updateMain__Q33scn9grandmenu14SceneGrandMenuFv + .byte4 updateUseGPU__Q33scn9grandmenu14SceneGrandMenuFv + .byte4 updateDebug__Q33scn9grandmenu14SceneGrandMenuFv + .byte4 draw__Q33scn9grandmenu14SceneGrandMenuFRCQ23scn11DrawReqInfo + .byte4 isSceneEnd__Q33scn9grandmenu14SceneGrandMenuCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneGrandTitle.s b/asm/src/SceneGrandTitle.s index c1a32447..83ead605 100644 --- a/asm/src/SceneGrandTitle.s +++ b/asm/src/SceneGrandTitle.s @@ -452,13 +452,13 @@ $$252625: __vt__Q33scn10grandtitle15SceneGrandTitle: .4byte 0 .4byte 0 - .4byte 0x8020630C ;# ptr - .4byte 0x802061B0 ;# ptr - .4byte 0x80206244 ;# ptr - .4byte 0x8020621C ;# ptr - .4byte 0x8020626C ;# ptr - .4byte 0x80206294 ;# ptr - .4byte 0x802062BC ;# ptr + .byte4 GetRuntimeTypeInfo__Q33scn10grandtitle15SceneGrandTitleCFv + .byte4 __dt__Q33scn10grandtitle15SceneGrandTitleFv + .byte4 updateMain__Q33scn10grandtitle15SceneGrandTitleFv + .byte4 updateUseGPU__Q33scn10grandtitle15SceneGrandTitleFv + .byte4 updateDebug__Q33scn10grandtitle15SceneGrandTitleFv + .byte4 draw__Q33scn10grandtitle15SceneGrandTitleFRCQ23scn11DrawReqInfo + .byte4 isSceneEnd__Q33scn10grandtitle15SceneGrandTitleCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneHistory.s b/asm/src/SceneHistory.s index ea76630c..693a0fbb 100644 --- a/asm/src/SceneHistory.s +++ b/asm/src/SceneHistory.s @@ -322,13 +322,13 @@ $$254221: __vt__Q33scn7history12SceneHistory: .4byte 0 .4byte 0 - .4byte 0x8020EA80 ;# ptr - .4byte 0x8020E8A4 ;# ptr - .4byte 0x8020E938 ;# ptr - .4byte 0x8020E910 ;# ptr - .4byte 0x8020E960 ;# ptr - .4byte 0x8020E988 ;# ptr - .4byte 0x8020E9B0 ;# ptr + .byte4 GetRuntimeTypeInfo__Q33scn7history12SceneHistoryCFv + .byte4 __dt__Q33scn7history12SceneHistoryFv + .byte4 updateMain__Q33scn7history12SceneHistoryFv + .byte4 updateUseGPU__Q33scn7history12SceneHistoryFv + .byte4 updateDebug__Q33scn7history12SceneHistoryFv + .byte4 draw__Q33scn7history12SceneHistoryFRCQ23scn11DrawReqInfo + .byte4 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 b02152bd..162a11aa 100644 --- a/asm/src/SceneInit.s +++ b/asm/src/SceneInit.s @@ -647,13 +647,13 @@ $$253298: __vt__Q33scn4init9SceneInit: .4byte 0 .4byte 0 - .4byte 0x8021C058 ;# ptr - .4byte 0x8021B9E0 ;# ptr - .4byte 0x8021BA98 ;# ptr - .4byte 0x8021BA94 ;# ptr - .4byte 0x8021BFBC ;# ptr - .4byte 0x8021BFC0 ;# ptr - .4byte 0x8021C004 ;# ptr + .byte4 GetRuntimeTypeInfo__Q33scn4init9SceneInitCFv + .byte4 __dt__Q33scn4init9SceneInitFv + .byte4 updateMain__Q33scn4init9SceneInitFv + .byte4 updateUseGPU__Q33scn4init9SceneInitFv + .byte4 updateDebug__Q33scn4init9SceneInitFv + .byte4 draw__Q33scn4init9SceneInitFRCQ23scn11DrawReqInfo + .byte4 isSceneEnd__Q33scn4init9SceneInitCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/ScenePackageList.s b/asm/src/ScenePackageList.s index 2b71917c..02547cab 100644 --- a/asm/src/ScenePackageList.s +++ b/asm/src/ScenePackageList.s @@ -285,13 +285,13 @@ $$252053: __vt__Q33scn11packagelist16ScenePackageList: .4byte 0 .4byte 0 - .4byte 0x8021CCC4 ;# ptr - .4byte 0x8021CB90 ;# ptr - .4byte 0x8021CC24 ;# ptr - .4byte 0x8021CBFC ;# ptr - .4byte 0x8021CC4C ;# ptr - .4byte 0x8021CC74 ;# ptr - .4byte 0x8021CC9C ;# ptr + .byte4 GetRuntimeTypeInfo__Q33scn11packagelist16ScenePackageListCFv + .byte4 __dt__Q33scn11packagelist16ScenePackageListFv + .byte4 updateMain__Q33scn11packagelist16ScenePackageListFv + .byte4 updateUseGPU__Q33scn11packagelist16ScenePackageListFv + .byte4 updateDebug__Q33scn11packagelist16ScenePackageListFv + .byte4 draw__Q33scn11packagelist16ScenePackageListFRCQ23scn11DrawReqInfo + .byte4 isSceneEnd__Q33scn11packagelist16ScenePackageListCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneStaffCredit.s b/asm/src/SceneStaffCredit.s index 6d616661..02e9ed46 100644 --- a/asm/src/SceneStaffCredit.s +++ b/asm/src/SceneStaffCredit.s @@ -341,13 +341,13 @@ $$252497: __vt__Q33scn11staffcredit16SceneStaffCredit: .4byte 0 .4byte 0 - .4byte 0x803F9FD4 - .4byte 0x803F9D88 - .4byte 0x803F9E1C - .4byte 0x803F9DF4 - .4byte 0x803F9E44 - .4byte 0x803F9E6C - .4byte 0x803F9E94 + .byte4 GetRuntimeTypeInfo__Q33scn11staffcredit16SceneStaffCreditCFv + .byte4 __dt__Q33scn11staffcredit16SceneStaffCreditFv + .byte4 updateMain__Q33scn11staffcredit16SceneStaffCreditFv + .byte4 updateUseGPU__Q33scn11staffcredit16SceneStaffCreditFv + .byte4 updateDebug__Q33scn11staffcredit16SceneStaffCreditFv + .byte4 draw__Q33scn11staffcredit16SceneStaffCreditFRCQ23scn11DrawReqInfo + .byte4 isSceneEnd__Q33scn11staffcredit16SceneStaffCreditCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneStep.s b/asm/src/SceneStep.s index dbd6d4d8..cd7921ff 100644 --- a/asm/src/SceneStep.s +++ b/asm/src/SceneStep.s @@ -554,13 +554,13 @@ $$252732: __vt__Q33scn4step9SceneStep: .4byte 0 .4byte 0 - .4byte 0x80221E74 ;# ptr - .4byte 0x80221D04 ;# ptr - .4byte 0x80221D98 ;# ptr - .4byte 0x80221D70 ;# ptr - .4byte 0x80221DC0 ;# ptr - .4byte 0x80221DE8 ;# ptr - .4byte 0x80221E10 ;# ptr + .byte4 GetRuntimeTypeInfo__Q33scn4step9SceneStepCFv + .byte4 __dt__Q33scn4step9SceneStepFv + .byte4 updateMain__Q33scn4step9SceneStepFv + .byte4 updateUseGPU__Q33scn4step9SceneStepFv + .byte4 updateDebug__Q33scn4step9SceneStepFv + .byte4 draw__Q33scn4step9SceneStepFRCQ23scn11DrawReqInfo + .byte4 isSceneEnd__Q33scn4step9SceneStepCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneStrap.s b/asm/src/SceneStrap.s index 2ff28cb3..da52860a 100644 --- a/asm/src/SceneStrap.s +++ b/asm/src/SceneStrap.s @@ -572,13 +572,13 @@ $$253027: __vt__Q33scn5strap10SceneStrap: .4byte 0 .4byte 0 - .4byte 0x803F2830 - .4byte 0x803F2384 - .4byte 0x803F2418 - .4byte 0x803F2414 - .4byte 0x803F27A0 - .4byte 0x803F27A4 - .4byte 0x803F281C + .byte4 GetRuntimeTypeInfo__Q33scn5strap10SceneStrapCFv + .byte4 __dt__Q33scn5strap10SceneStrapFv + .byte4 updateMain__Q33scn5strap10SceneStrapFv + .byte4 updateUseGPU__Q33scn5strap10SceneStrapFv + .byte4 updateDebug__Q33scn5strap10SceneStrapFv + .byte4 draw__Q33scn5strap10SceneStrapFRCQ23scn11DrawReqInfo + .byte4 isSceneEnd__Q33scn5strap10SceneStrapCFv .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/SceneVC.s b/asm/src/SceneVC.s index aa086627..33cc600d 100644 --- a/asm/src/SceneVC.s +++ b/asm/src/SceneVC.s @@ -175,13 +175,13 @@ lbl_803F2B00: __vt__Q33scn2vc7SceneVC: .4byte 0 .4byte 0 - .4byte 0x803F2AAC - .4byte 0x803F2AB0 - .4byte 0x803F29FC - .4byte 0x803F29D4 - .4byte 0x803F2A24 - .4byte 0x803F2A4C - .4byte 0x803F2A84 + .byte4 GetRuntimeTypeInfo__Q33scn2vc7SceneVCCFv + .byte4 __dt__Q33scn2vc7SceneVCFv + .byte4 updateMain__Q33scn2vc7SceneVCFv + .byte4 updateUseGPU__Q33scn2vc7SceneVCFv + .byte4 updateDebug__Q33scn2vc7SceneVCFv + .byte4 draw__Q33scn2vc7SceneVCFRCQ23scn11DrawReqInfo + .byte4 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 0104ca0f..a85144ba 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 - .4byte 0x801C3D00 ;# ptr + .byte4 setRandomFrame__Q28mintglue26Scn__ChallengeTitle__CharaFv .global $$256077 $$256077: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C3CDC ;# ptr + .byte4 flashReset__Q28mintglue26Scn__ChallengeTitle__CharaFv .global $$256082 $$256082: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C3C98 ;# ptr + .byte4 flashStart__Q28mintglue26Scn__ChallengeTitle__CharaFUlb .global $$256098 $$256098: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C3C74 ;# ptr + .byte4 clearSubAnim__Q28mintglue26Scn__ChallengeTitle__CharaFv .global $$256103 $$256103: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C3C50 ;# ptr + .byte4 setSubAnim__Q28mintglue26Scn__ChallengeTitle__CharaFv .global $$256108 $$256108: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C3C1C ;# ptr + .byte4 setVisibility__Q28mintglue26Scn__ChallengeTitle__CharaFb .global $$256111 $$256111: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C3BF8 ;# ptr + .byte4 createEquip__Q28mintglue26Scn__ChallengeTitle__CharaFv .global $$256116 $$256116: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C3BD4 ;# ptr + .byte4 releaseEffect__Q28mintglue26Scn__ChallengeTitle__CharaFv .global $$256121 $$256121: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C3B90 ;# ptr + .byte4 effectRequestN__Q28mintglue26Scn__ChallengeTitle__CharaFUlPCc .global $$256127 $$256127: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C3B6C ;# ptr + .byte4 isAnimLooped__Q28mintglue26Scn__ChallengeTitle__CharaFv .global $$256141 $$256141: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C3AC4 ;# ptr + .byte4 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 e5503e9e..c77e2a77 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 - .4byte 0x801C42A8 ;# ptr + .byte4 setVisibility__Q28mintglue22Scn__GrandTitle__BlockFb .global $$254989 $$254989: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C4218 ;# ptr + .byte4 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 e8de7a5f..00add9cf 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 - .4byte 0x801C4EE8 ;# ptr + .byte4 isCelebrateAnimPlayed__Q28mintglue22Scn__GrandTitle__CharaFv .global $$256126 $$256126: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C4EA4 ;# ptr + .byte4 setLoopAnim__Q28mintglue22Scn__GrandTitle__CharaFPCcPCc .global $$256131 $$256131: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C4E80 ;# ptr + .byte4 stopWalkSE__Q28mintglue22Scn__GrandTitle__CharaFv .global $$256139 $$256139: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C4E34 ;# ptr + .byte4 requestWalkSE__Q28mintglue22Scn__GrandTitle__CharaFUlUli .global $$256142 $$256142: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C4E10 ;# ptr + .byte4 flashReset__Q28mintglue22Scn__GrandTitle__CharaFv .global $$256147 $$256147: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C4DDC ;# ptr + .byte4 flashStart__Q28mintglue22Scn__GrandTitle__CharaFUl .global $$256150 $$256150: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C4DA8 ;# ptr + .byte4 setBlockVisibility__Q28mintglue22Scn__GrandTitle__CharaFb .global $$256158 $$256158: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C4D74 ;# ptr + .byte4 setVisibility__Q28mintglue22Scn__GrandTitle__CharaFb .global $$256163 $$256163: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C4D50 ;# ptr + .byte4 resetEffect__Q28mintglue22Scn__GrandTitle__CharaFv .global $$256168 $$256168: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C4D0C ;# ptr + .byte4 effectWarpRequestN__Q28mintglue22Scn__GrandTitle__CharaFUlPCc .global $$256176 $$256176: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C4CC8 ;# ptr + .byte4 effectForeRequestN__Q28mintglue22Scn__GrandTitle__CharaFUlPCc .global $$256181 $$256181: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C4C84 ;# ptr + .byte4 effectRequestN__Q28mintglue22Scn__GrandTitle__CharaFUlPCc .global $$256186 $$256186: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C4C60 ;# ptr + .byte4 isAnimLooped__Q28mintglue22Scn__GrandTitle__CharaFv .global $$256191 $$256191: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801C4BB8 ;# ptr + .byte4 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 9a3e311c..ec804781 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: - .4byte 0x80459E10 + .byte4 $$248751 .4byte 0 diff --git a/asm/src/ScriptCallback.s b/asm/src/ScriptCallback.s index e33f0d89..cd406844 100644 --- a/asm/src/ScriptCallback.s +++ b/asm/src/ScriptCallback.s @@ -250,27 +250,27 @@ onScriptExecPost__Q43scn4step6weapon14ScriptCallbackFRCQ24gobj6Script: __vt__Q43scn4step4boss14ScriptCallback: .4byte 0 .4byte 0 - .4byte 0x80233FE4 ;# ptr - .4byte 0x80234060 ;# ptr - .4byte 0x802340B0 ;# ptr - .4byte 0x802340B8 ;# ptr + .byte4 __dt__Q43scn4step4boss14ScriptCallbackFv + .byte4 onScriptRequested__Q43scn4step4boss14ScriptCallbackFRCQ24gobj6ScriptUlUl + .byte4 onScriptExecPre__Q43scn4step4boss14ScriptCallbackFRCQ24gobj6Script + .byte4 onScriptExecPost__Q43scn4step4boss14ScriptCallbackFRCQ24gobj6Script .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy14ScriptCallback __vt__Q43scn4step5enemy14ScriptCallback: .4byte 0 .4byte 0 - .4byte 0x8028DA5C ;# ptr - .4byte 0x8028DAD8 ;# ptr - .4byte 0x8028DB04 ;# ptr - .4byte 0x8028DB10 ;# ptr + .byte4 __dt__Q43scn4step5enemy14ScriptCallbackFv + .byte4 onScriptRequested__Q43scn4step5enemy14ScriptCallbackFRCQ24gobj6ScriptUlUl + .byte4 onScriptExecPre__Q43scn4step5enemy14ScriptCallbackFRCQ24gobj6Script + .byte4 onScriptExecPost__Q43scn4step5enemy14ScriptCallbackFRCQ24gobj6Script .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon14ScriptCallback __vt__Q43scn4step6weapon14ScriptCallback: .4byte 0 .4byte 0 - .4byte 0x803D88B8 - .4byte 0x803D8934 - .4byte 0x803D8938 - .4byte 0x803D893C + .byte4 __dt__Q43scn4step6weapon14ScriptCallbackFv + .byte4 onScriptRequested__Q43scn4step6weapon14ScriptCallbackFRCQ24gobj6ScriptUlUl + .byte4 onScriptExecPre__Q43scn4step6weapon14ScriptCallbackFRCQ24gobj6Script + .byte4 onScriptExecPost__Q43scn4step6weapon14ScriptCallbackFRCQ24gobj6Script diff --git a/asm/src/Scroll.s b/asm/src/Scroll.s index ddc6cc09..f2156fa0 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 - .4byte 0x8020F2A4 ;# ptr + .byte4 __sinit_$$3Scroll_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253103 diff --git a/asm/src/SearchAttack.s b/asm/src/SearchAttack.s index 317b9d54..b1d21aba 100644 --- a/asm/src/SearchAttack.s +++ b/asm/src/SearchAttack.s @@ -517,5 +517,5 @@ getCollidedAttackTargetGimmick__Q25ocoll12SearchAttackCFUl: __vt__Q25ocoll12SearchAttack: .4byte 0 .4byte 0 - .4byte 0x801D8548 ;# ptr + .byte4 __dt__Q25ocoll12SearchAttackFv .4byte 0 diff --git a/asm/src/SearchHit.s b/asm/src/SearchHit.s index 3dd53a92..bc55b394 100644 --- a/asm/src/SearchHit.s +++ b/asm/src/SearchHit.s @@ -466,5 +466,5 @@ getCollidedHitOwnerUid__Q25ocoll9SearchHitCFUl: __vt__Q25ocoll9SearchHit: .4byte 0 .4byte 0 - .4byte 0x801D8FCC ;# ptr + .byte4 __dt__Q25ocoll9SearchHitFv .4byte 0 diff --git a/asm/src/SelectButtonContent.s b/asm/src/SelectButtonContent.s index 4bbf1b13..07335cc0 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: - .4byte 0x80558AF0 - .4byte 0x80558AF8 - .4byte 0x80558AFC - .4byte 0x80558B00 - .4byte 0x80558B04 - .4byte 0x80462DC8 - .4byte 0x80558B10 - .4byte 0x80558B18 - .4byte 0x80462DD4 - .4byte 0x80558B20 - .4byte 0x80462DE0 - .4byte 0x80558B28 - .4byte 0x80558B30 - .4byte 0x80558B38 - .4byte 0x80462DEC - .4byte 0x80462DF8 - .4byte 0x80558B40 - .4byte 0x80558B48 - .4byte 0x80558B50 - .4byte 0x80558B58 - .4byte 0x80462E04 - .4byte 0x80558B60 - .4byte 0x80558B68 - .4byte 0x80558B70 - .4byte 0x80558B78 - .4byte 0x80558B80 - .4byte 0x80462E10 - .4byte 0x80558B88 - .4byte 0x80558B8C + .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 .global TABLE__Q43scn7history6detail33$$2unnamed$$2SelectButtonContent_cpp$$2 TABLE__Q43scn7history6detail33$$2unnamed$$2SelectButtonContent_cpp$$2: - .4byte 0x80558B90 - .4byte 0x80558AF8 - .4byte 0x80558B10 - .4byte 0x80462DD4 - .4byte 0x80558B90 - .4byte 0x80558B18 - .4byte 0x80462DC8 - .4byte 0x80558AFC - .4byte 0x80558B58 - .4byte 0x80558AF0 - .4byte 0x80558B20 - .4byte 0x80558B00 - .4byte 0x80558B90 - .4byte 0x80558B90 - .4byte 0x80558B04 - .4byte 0x80558B50 - .4byte 0x80462DEC - .4byte 0x80558B60 - .4byte 0x80462DE0 - .4byte 0x80462DF8 - .4byte 0x80558B38 - .4byte 0x80558B40 - .4byte 0x80558B90 - .4byte 0x80558B30 - .4byte 0x80558B90 - .4byte 0x80558B48 - .4byte 0x80462E04 - .4byte 0x80558B28 - .4byte 0x80558B68 + .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 .global ICON_PANE_TABLE__Q43scn7history6detail33$$2unnamed$$2SelectButtonContent_cpp$$2 ICON_PANE_TABLE__Q43scn7history6detail33$$2unnamed$$2SelectButtonContent_cpp$$2: .4byte 0 - .4byte 0x80558B98 - .4byte 0x80558B98 + .byte4 $$251577 + .byte4 $$251577 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80558B98 + .byte4 $$251577 .4byte 0 - .4byte 0x80558B98 + .byte4 $$251577 .4byte 0 - .4byte 0x80558B98 + .byte4 $$251577 .4byte 0 .4byte 0 - .4byte 0x80558B98 + .byte4 $$251577 .4byte 0 .4byte 0 - .4byte 0x80558B9C + .byte4 $$251578 .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/Sequence.s b/asm/src/Sequence.s index c1435eda..0159a5d6 100644 --- a/asm/src/Sequence.s +++ b/asm/src/Sequence.s @@ -1583,63 +1583,63 @@ __dt__Q34info8sequence11CommandWaitFv: $$255949: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x801A67CC ;# ptr + .byte4 reset__Q34info8sequence7CommandFv .global __vt__Q34info8sequence11CommandWait __vt__Q34info8sequence11CommandWait: .4byte 0 .4byte 0 - .4byte 0x801A7018 ;# ptr - .4byte 0x801A696C ;# ptr - .4byte 0x801A6924 ;# ptr + .byte4 __dt__Q34info8sequence11CommandWaitFv + .byte4 start__Q34info8sequence11CommandWaitFv + .byte4 proc__Q34info8sequence11CommandWaitFv .global __vt__Q34info8sequence11CommandProc __vt__Q34info8sequence11CommandProc: .4byte 0 .4byte 0 - .4byte 0x801A6FAC ;# ptr - .4byte 0x801A6914 ;# ptr - .4byte 0x801A6974 ;# ptr + .byte4 __dt__Q34info8sequence11CommandProcFv + .byte4 start__Q34info8sequence7CommandFv + .byte4 proc__Q34info8sequence11CommandProcFv .global __vt__Q34info8sequence15CommandInterval __vt__Q34info8sequence15CommandInterval: .4byte 0 .4byte 0 - .4byte 0x801A6F34 ;# ptr - .4byte 0x801A6ACC ;# ptr - .4byte 0x801A6A00 ;# ptr + .byte4 __dt__Q34info8sequence15CommandIntervalFv + .byte4 start__Q34info8sequence15CommandIntervalFv + .byte4 proc__Q34info8sequence15CommandIntervalFv .global __vt__Q34info8sequence11CommandCall __vt__Q34info8sequence11CommandCall: .4byte 0 .4byte 0 - .4byte 0x801A6EC8 ;# ptr - .4byte 0x801A6B24 ;# ptr - .4byte 0x801A5C68 ;# ptr + .byte4 __dt__Q34info8sequence11CommandCallFv + .byte4 start__Q34info8sequence11CommandCallFv + .byte4 proc__Q34info8sequence7CommandFv .global __vt__Q34util17Delegate$$0Fv_v$$464$$112DelegateHeap __vt__Q34util17Delegate$$0Fv_v$$464$$112DelegateHeap: .4byte 0 .4byte 0 - .4byte 0x801A649C ;# ptr - .4byte 0x801A6C08 ;# ptr - .4byte 0x801A6C10 ;# ptr + .byte4 __dt__Q34util17Delegate$$0Fv_v$$464$$112DelegateHeapFv + .byte4 allocatorAlloc__Q34util17Delegate$$0Fv_v$$464$$112DelegateHeapFUll + .byte4 allocatorFree__Q34util17Delegate$$0Fv_v$$464$$112DelegateHeapFPv .global __vt__Q34util17Delegate$$0Fv_b$$464$$112DelegateHeap __vt__Q34util17Delegate$$0Fv_b$$464$$112DelegateHeap: .4byte 0 .4byte 0 - .4byte 0x801A6080 ;# ptr - .4byte 0x801A6C14 ;# ptr - .4byte 0x801A6C18 ;# ptr + .byte4 __dt__Q34util17Delegate$$0Fv_b$$464$$112DelegateHeapFv + .byte4 allocatorAlloc__Q34util17Delegate$$0Fv_b$$464$$112DelegateHeapFUll + .byte4 allocatorFree__Q34util17Delegate$$0Fv_b$$464$$112DelegateHeapFPv .global __vt__Q34info8sequence11CommandAnim __vt__Q34info8sequence11CommandAnim: .4byte 0 .4byte 0 - .4byte 0x801A6BAC ;# ptr - .4byte 0x801A6B9C ;# ptr - .4byte 0x801A6B5C ;# ptr + .byte4 __dt__Q34info8sequence11CommandAnimFv + .byte4 start__Q34info8sequence11CommandAnimFv + .byte4 proc__Q34info8sequence11CommandAnimFv .global __vt__Q34info8sequence7Command __vt__Q34info8sequence7Command: .4byte 0 .4byte 0 - .4byte 0x801A5DAC ;# ptr - .4byte 0x801A6914 ;# ptr - .4byte 0x801A5C68 ;# ptr + .byte4 __dt__Q34info8sequence7CommandFv + .byte4 start__Q34info8sequence7CommandFv + .byte4 proc__Q34info8sequence7CommandFv .global $$256161 $$256161: .asciz "bad_function_call" diff --git a/asm/src/SequenceChallengeRoot.s b/asm/src/SequenceChallengeRoot.s index 02c6fcdf..6a905614 100644 --- a/asm/src/SequenceChallengeRoot.s +++ b/asm/src/SequenceChallengeRoot.s @@ -980,13 +980,13 @@ GetRuntimeTypeInfo__Q23seq21SequenceChallengeRootCFv: __vt__Q23seq21SequenceChallengeRoot: .4byte 0 .4byte 0 - .4byte 0x803FD984 - .4byte 0x803FCECC - .4byte 0x803FCF38 - .4byte 0x803FCFD4 - .4byte 0x803FD180 - .4byte 0x803FD198 - .4byte 0x803FD510 + .byte4 GetRuntimeTypeInfo__Q23seq21SequenceChallengeRootCFv + .byte4 __dt__Q23seq21SequenceChallengeRootFv + .byte4 nextAction__Q23seq21SequenceChallengeRootCFv + .byte4 createChildSequence__Q23seq21SequenceChallengeRootCFv + .byte4 onChildSequenceEnd__Q23seq21SequenceChallengeRootFRQ23seq9ISequence + .byte4 createScene__Q23seq21SequenceChallengeRootCFv + .byte4 onSceneEnd__Q23seq21SequenceChallengeRootFRQ23scn6IScene .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/SequenceChallengeTitleRoot.s b/asm/src/SequenceChallengeTitleRoot.s index 55c6b0b1..3d8c71f8 100644 --- a/asm/src/SequenceChallengeTitleRoot.s +++ b/asm/src/SequenceChallengeTitleRoot.s @@ -508,13 +508,13 @@ __dt__Q23seq26SequenceChallengeTitleRootFv: __vt__Q23seq26SequenceChallengeTitleRoot: .4byte 0 .4byte 0 - .4byte 0x803FE020 - .4byte 0x803FE024 - .4byte 0x803FDB24 - .4byte 0x803FDB94 - .4byte 0x803FDD44 - .4byte 0x803FDE08 - .4byte 0x803FDF24 + .byte4 GetRuntimeTypeInfo__Q23seq26SequenceChallengeTitleRootCFv + .byte4 __dt__Q23seq26SequenceChallengeTitleRootFv + .byte4 nextAction__Q23seq26SequenceChallengeTitleRootCFv + .byte4 createChildSequence__Q23seq26SequenceChallengeTitleRootCFv + .byte4 onChildSequenceEnd__Q23seq26SequenceChallengeTitleRootFRQ23seq9ISequence + .byte4 createScene__Q23seq26SequenceChallengeTitleRootCFv + .byte4 onSceneEnd__Q23seq26SequenceChallengeTitleRootFRQ23scn6IScene .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/SequenceFirstDemo.s b/asm/src/SequenceFirstDemo.s index 5d68753d..081ea203 100644 --- a/asm/src/SequenceFirstDemo.s +++ b/asm/src/SequenceFirstDemo.s @@ -208,11 +208,11 @@ GetRuntimeTypeInfo__Q23seq17SequenceFirstDemoCFv: __vt__Q23seq17SequenceFirstDemo: .4byte 0 .4byte 0 - .4byte 0x803FE2C0 - .4byte 0x803FE0F4 - .4byte 0x803FE0F8 - .4byte 0x803FE128 - .4byte 0x803FE270 - .4byte 0x803FE288 - .4byte 0x803FE2BC + .byte4 GetRuntimeTypeInfo__Q23seq17SequenceFirstDemoCFv + .byte4 __dt__Q23seq17SequenceFirstDemoFv + .byte4 nextAction__Q23seq17SequenceFirstDemoCFv + .byte4 createChildSequence__Q23seq17SequenceFirstDemoCFv + .byte4 onChildSequenceEnd__Q23seq17SequenceFirstDemoFRQ23seq9ISequence + .byte4 createScene__Q23seq17SequenceFirstDemoCFv + .byte4 onSceneEnd__Q23seq17SequenceFirstDemoFRQ23scn6IScene .4byte 0 diff --git a/asm/src/SequenceGrandMenu.s b/asm/src/SequenceGrandMenu.s index 8b610d7e..c5d4c16c 100644 --- a/asm/src/SequenceGrandMenu.s +++ b/asm/src/SequenceGrandMenu.s @@ -358,13 +358,13 @@ GetRuntimeTypeInfo__Q23seq17SequenceGrandMenuCFv: __vt__Q23seq17SequenceGrandMenu: .4byte 0 .4byte 0 - .4byte 0x803FE74C - .4byte 0x803FE418 - .4byte 0x803FE41C - .4byte 0x803FE460 - .4byte 0x803FE538 - .4byte 0x803FE544 - .4byte 0x803FE614 + .byte4 GetRuntimeTypeInfo__Q23seq17SequenceGrandMenuCFv + .byte4 __dt__Q23seq17SequenceGrandMenuFv + .byte4 nextAction__Q23seq17SequenceGrandMenuCFv + .byte4 createChildSequence__Q23seq17SequenceGrandMenuCFv + .byte4 onChildSequenceEnd__Q23seq17SequenceGrandMenuFRQ23seq9ISequence + .byte4 createScene__Q23seq17SequenceGrandMenuCFv + .byte4 onSceneEnd__Q23seq17SequenceGrandMenuFRQ23scn6IScene .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/SequenceHistory.s b/asm/src/SequenceHistory.s index 36cd118b..d3d26885 100644 --- a/asm/src/SequenceHistory.s +++ b/asm/src/SequenceHistory.s @@ -368,11 +368,11 @@ __dt__Q23seq15SequenceHistoryFv: __vt__Q23seq15SequenceHistory: .4byte 0 .4byte 0 - .4byte 0x803FEC18 - .4byte 0x803FEC1C - .4byte 0x803FE7C0 - .4byte 0x803FE808 - .4byte 0x803FE86C - .4byte 0x803FE870 - .4byte 0x803FEA34 + .byte4 GetRuntimeTypeInfo__Q23seq15SequenceHistoryCFv + .byte4 __dt__Q23seq15SequenceHistoryFv + .byte4 nextAction__Q23seq15SequenceHistoryCFv + .byte4 createChildSequence__Q23seq15SequenceHistoryCFv + .byte4 onChildSequenceEnd__Q23seq15SequenceHistoryFRQ23seq9ISequence + .byte4 createScene__Q23seq15SequenceHistoryCFv + .byte4 onSceneEnd__Q23seq15SequenceHistoryFRQ23scn6IScene .4byte 0 diff --git a/asm/src/SequenceLvMapRoot.s b/asm/src/SequenceLvMapRoot.s index efd9e174..6b582f90 100644 --- a/asm/src/SequenceLvMapRoot.s +++ b/asm/src/SequenceLvMapRoot.s @@ -605,11 +605,11 @@ GetRuntimeTypeInfo__Q23seq17SequenceLvMapRootCFv: __vt__Q23seq17SequenceLvMapRoot: .4byte 0 .4byte 0 - .4byte 0x803FF420 - .4byte 0x803FEF48 - .4byte 0x803FEF4C - .4byte 0x803FEF7C - .4byte 0x803FF184 - .4byte 0x803FF1A8 - .4byte 0x803FF1AC + .byte4 GetRuntimeTypeInfo__Q23seq17SequenceLvMapRootCFv + .byte4 __dt__Q23seq17SequenceLvMapRootFv + .byte4 nextAction__Q23seq17SequenceLvMapRootCFv + .byte4 createChildSequence__Q23seq17SequenceLvMapRootCFv + .byte4 onChildSequenceEnd__Q23seq17SequenceLvMapRootFRQ23seq9ISequence + .byte4 createScene__Q23seq17SequenceLvMapRootCFv + .byte4 onSceneEnd__Q23seq17SequenceLvMapRootFRQ23scn6IScene .4byte 0 diff --git a/asm/src/SequenceProductRoot.s b/asm/src/SequenceProductRoot.s index adf92d02..94bc638a 100644 --- a/asm/src/SequenceProductRoot.s +++ b/asm/src/SequenceProductRoot.s @@ -404,13 +404,13 @@ __dt__Q23seq19SequenceProductRootFv: __vt__Q23seq19SequenceProductRoot: .4byte 0 .4byte 0 - .4byte 0x803FF964 - .4byte 0x803FF968 - .4byte 0x803FF554 - .4byte 0x803FF584 - .4byte 0x803FF5E8 - .4byte 0x803FF604 - .4byte 0x803FF7D8 + .byte4 GetRuntimeTypeInfo__Q23seq19SequenceProductRootCFv + .byte4 __dt__Q23seq19SequenceProductRootFv + .byte4 nextAction__Q23seq19SequenceProductRootCFv + .byte4 createChildSequence__Q23seq19SequenceProductRootCFv + .byte4 onChildSequenceEnd__Q23seq19SequenceProductRootFRQ23seq9ISequence + .byte4 createScene__Q23seq19SequenceProductRootCFv + .byte4 onSceneEnd__Q23seq19SequenceProductRootFRQ23scn6IScene .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/SequenceRoot.s b/asm/src/SequenceRoot.s index 09e4937e..00eca678 100644 --- a/asm/src/SequenceRoot.s +++ b/asm/src/SequenceRoot.s @@ -92,11 +92,11 @@ lbl_803FFA40: __vt__Q23seq12SequenceRoot: .4byte 0 .4byte 0 - .4byte 0x803FF9FC - .4byte 0x803FFA00 - .4byte 0x803FF984 - .4byte 0x803FF988 - .4byte 0x803FF9F0 - .4byte 0x803FF9F4 - .4byte 0x803FF9F8 + .byte4 GetRuntimeTypeInfo__Q23seq12SequenceRootCFv + .byte4 __dt__Q23seq12SequenceRootFv + .byte4 nextAction__Q23seq12SequenceRootCFv + .byte4 createChildSequence__Q23seq12SequenceRootCFv + .byte4 onChildSequenceEnd__Q23seq12SequenceRootFRQ23seq9ISequence + .byte4 createScene__Q23seq12SequenceRootCFv + .byte4 onSceneEnd__Q23seq12SequenceRootFRQ23scn6IScene .4byte 0 diff --git a/asm/src/SequenceStaffCredit.s b/asm/src/SequenceStaffCredit.s index c14538bb..d2ef2f72 100644 --- a/asm/src/SequenceStaffCredit.s +++ b/asm/src/SequenceStaffCredit.s @@ -133,11 +133,11 @@ GetRuntimeTypeInfo__Q23seq19SequenceStaffCreditCFv: __vt__Q23seq19SequenceStaffCredit: .4byte 0 .4byte 0 - .4byte 0x803FFDA8 - .4byte 0x803FFCD4 - .4byte 0x803FFCD8 - .4byte 0x803FFD08 - .4byte 0x803FFD0C - .4byte 0x803FFD10 - .4byte 0x803FFD90 + .byte4 GetRuntimeTypeInfo__Q23seq19SequenceStaffCreditCFv + .byte4 __dt__Q23seq19SequenceStaffCreditFv + .byte4 nextAction__Q23seq19SequenceStaffCreditCFv + .byte4 createChildSequence__Q23seq19SequenceStaffCreditCFv + .byte4 onChildSequenceEnd__Q23seq19SequenceStaffCreditFRQ23seq9ISequence + .byte4 createScene__Q23seq19SequenceStaffCreditCFv + .byte4 onSceneEnd__Q23seq19SequenceStaffCreditFRQ23scn6IScene .4byte 0 diff --git a/asm/src/SequenceStep.s b/asm/src/SequenceStep.s index fb8ea76b..2ed06a7e 100644 --- a/asm/src/SequenceStep.s +++ b/asm/src/SequenceStep.s @@ -488,13 +488,13 @@ __dt__Q23seq12SequenceStepFv: __vt__Q23seq12SequenceStep: .4byte 0 .4byte 0 - .4byte 0x80400438 - .4byte 0x8040043C - .4byte 0x8040021C - .4byte 0x80400234 - .4byte 0x80400268 - .4byte 0x8040026C - .4byte 0x804002E8 + .byte4 GetRuntimeTypeInfo__Q23seq12SequenceStepCFv + .byte4 __dt__Q23seq12SequenceStepFv + .byte4 nextAction__Q23seq12SequenceStepCFv + .byte4 createChildSequence__Q23seq12SequenceStepCFv + .byte4 onChildSequenceEnd__Q23seq12SequenceStepFRQ23seq9ISequence + .byte4 createScene__Q23seq12SequenceStepCFv + .byte4 onSceneEnd__Q23seq12SequenceStepFRQ23scn6IScene .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/SequenceVC.s b/asm/src/SequenceVC.s index c558d60a..bdf36ff0 100644 --- a/asm/src/SequenceVC.s +++ b/asm/src/SequenceVC.s @@ -83,11 +83,11 @@ __dt__Q23seq10SequenceVCFv: __vt__Q23seq10SequenceVC: .4byte 0 .4byte 0 - .4byte 0x80400508 - .4byte 0x8040050C - .4byte 0x80400460 - .4byte 0x80400478 - .4byte 0x8040047C - .4byte 0x80400480 - .4byte 0x804004FC + .byte4 GetRuntimeTypeInfo__Q23seq10SequenceVCCFv + .byte4 __dt__Q23seq10SequenceVCFv + .byte4 nextAction__Q23seq10SequenceVCCFv + .byte4 createChildSequence__Q23seq10SequenceVCCFv + .byte4 onChildSequenceEnd__Q23seq10SequenceVCFRQ23seq9ISequence + .byte4 createScene__Q23seq10SequenceVCCFv + .byte4 onSceneEnd__Q23seq10SequenceVCFRQ23scn6IScene .4byte 0 diff --git a/asm/src/Shadow.s b/asm/src/Shadow.s index db559ab9..791f68c3 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: - .4byte 0x8045EE68 + .byte4 $$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: - .4byte 0x80460A78 + .byte4 $$252146 .global $$252859 $$252859: .asciz "Shadow" diff --git a/asm/src/Shake.s b/asm/src/Shake.s index 679f7a1c..b5e07cd1 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 - .4byte 0x80560D48 + .byte4 T_SHAKE_OFFS_TABLE_SSS__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 .4byte 0x00000002 - .4byte 0x80560D50 + .byte4 T_SHAKE_OFFS_TABLE_SS__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 .4byte 0x00000004 - .4byte 0x80417988 + .byte4 T_SHAKE_OFFS_TABLE_S__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 .4byte 0x00000004 - .4byte 0x80417998 + .byte4 T_SHAKE_OFFS_TABLE_M__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 .4byte 0x00000006 - .4byte 0x804179A8 + .byte4 T_SHAKE_OFFS_TABLE_L__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 .4byte 0x0000000C - .4byte 0x804179C0 + .byte4 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 0db5c1bf..7716aff6 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: - .4byte 0x8055A860 - .4byte 0x8055A868 - .4byte 0x8055A870 - .4byte 0x8055A878 - .4byte 0x8055A880 - .4byte 0x8055A888 - .4byte 0x8055A890 + .byte4 $$260970 + .byte4 $$260971 + .byte4 $$260972 + .byte4 $$260973 + .byte4 $$260974 + .byte4 $$260975 + .byte4 $$260976 .4byte 0 .global $$261005 $$261005: - .4byte 0x8055A860 - .4byte 0x8055A898 - .4byte 0x8055A8A0 - .4byte 0x80482244 - .4byte 0x8055A8A8 - .4byte 0x8055A8B0 - .4byte 0x80482250 - .4byte 0x8055A8B8 - .4byte 0x8055A8C0 - .4byte 0x80482260 - .4byte 0x80482270 - .4byte 0x8048227C - .4byte 0x80482288 - .4byte 0x80482270 - .4byte 0x80482294 - .4byte 0x8055A8A8 - .4byte 0x8055A898 - .4byte 0x804822A0 - .4byte 0x804822AC - .4byte 0x8055A878 - .4byte 0x8055A8A0 - .4byte 0x8055A8C8 - .4byte 0x804822B8 - .4byte 0x804822C8 - .4byte 0x804822D8 - .4byte 0x804822E8 - .4byte 0x804822F8 - .4byte 0x8055A8D0 - .4byte 0x8055A8D8 - .4byte 0x8055A860 - .4byte 0x8055A8E0 - .4byte 0x8055A8E8 + .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 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$264598 @@ -3899,7 +3899,7 @@ $$264599: $$264706: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80320420 + .byte4 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 - .4byte 0x80322C78 - .4byte 0x80322B04 - .4byte 0x80322B44 - .4byte 0x80322B60 + .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 .global __vt__Q43std3tr16detail25function_base$$0PFPCcPCc_v$$1 __vt__Q43std3tr16detail25function_base$$0PFPCcPCc_v$$1: .4byte 0 .4byte 0 - .4byte 0x803201B8 + .byte4 __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 - .4byte 0x80320214 - .4byte 0x803227B8 - .4byte 0x803227BC + .byte4 __dt__Q34util22Delegate$$0FPCcPCc_v$$464$$112DelegateHeapFv + .byte4 allocatorAlloc__Q34util22Delegate$$0FPCcPCc_v$$464$$112DelegateHeapFUll + .byte4 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 5210c9e3..998927e4 100644 --- a/asm/src/Shooting.s +++ b/asm/src/Shooting.s @@ -44,5 +44,5 @@ __dt__Q53scn4step7gimmick8shooting8ShootingFv: __vt__Q53scn4step7gimmick8shooting8Shooting: .4byte 0 .4byte 0 - .4byte 0x8032303C + .byte4 __dt__Q53scn4step7gimmick8shooting8ShootingFv .4byte 0 diff --git a/asm/src/ShuffleManager.s b/asm/src/ShuffleManager.s index c1b25de8..c11b4edc 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 - .4byte 0x8055B358 - .4byte 0x8055B360 + .byte4 $$252280 + .byte4 $$252281 .4byte 0x00000002 - .4byte 0x8055B368 - .4byte 0x8055B370 + .byte4 $$252282 + .byte4 $$252283 .4byte 0x00000003 - .4byte 0x8055B378 - .4byte 0x8055B380 + .byte4 $$252284 + .byte4 $$252285 .4byte 0x00000004 - .4byte 0x8055B388 - .4byte 0x8055B390 + .byte4 $$252286 + .byte4 $$252287 .4byte 0x00000005 - .4byte 0x8055B398 - .4byte 0x8055B3A0 + .byte4 $$252288 + .byte4 $$252289 .4byte 0x00000006 - .4byte 0x8055B3A8 - .4byte 0x8055B3B0 + .byte4 $$252290 + .byte4 $$252291 .4byte 0x00000007 - .4byte 0x8055B3B8 - .4byte 0x8055B3C0 + .byte4 $$252292 + .byte4 $$252293 .4byte 0x00000008 - .4byte 0x8055B3C8 - .4byte 0x8055B3D0 + .byte4 $$252294 + .byte4 $$252295 .4byte 0x00000009 - .4byte 0x8055B3D8 - .4byte 0x8055B3E0 + .byte4 $$252296 + .byte4 $$252297 .4byte 0x0000000A - .4byte 0x8055B3E8 - .4byte 0x8055B3F0 + .byte4 $$252298 + .byte4 $$252299 .4byte 0x0000000B - .4byte 0x8055B3F8 - .4byte 0x8055B400 + .byte4 $$252300 + .byte4 $$252301 .4byte 0x0000000C - .4byte 0x8055B408 - .4byte 0x8055B410 + .byte4 $$252302 + .byte4 $$252303 .4byte 0x0000000D - .4byte 0x8048CE30 - .4byte 0x8048CE3C + .byte4 $$252304 + .byte4 $$252305 .4byte 0x0000000E - .4byte 0x8055B418 - .4byte 0x8055B420 + .byte4 $$252306 + .byte4 $$252307 .4byte 0x0000000F - .4byte 0x8055B428 - .4byte 0x8055B430 + .byte4 $$252308 + .byte4 $$252309 .4byte 0x00000010 - .4byte 0x8055B438 - .4byte 0x8055B440 + .byte4 $$252310 + .byte4 $$252311 .4byte 0x00000011 - .4byte 0x8055B448 - .4byte 0x8055B450 + .byte4 $$252312 + .byte4 $$252313 .4byte 0x00000012 - .4byte 0x8055B458 - .4byte 0x8055B45C + .byte4 $$252314 + .byte4 $$252315 .4byte 0x00000013 - .4byte 0x8055B460 - .4byte 0x8055B468 + .byte4 $$252316 + .byte4 $$252317 .4byte 0x00000014 - .4byte 0x8055B470 - .4byte 0x8055B478 + .byte4 $$252318 + .byte4 $$252319 .4byte 0x00000015 - .4byte 0x8055B480 - .4byte 0x8055B488 + .byte4 $$252320 + .byte4 $$252321 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 diff --git a/asm/src/Shutter.s b/asm/src/Shutter.s index d4ebf289..ce91c11f 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: - .4byte 0x8055A8F0 - .4byte 0x8055A8F4 - .4byte 0x8055A8FC - .4byte 0x8055A904 + .byte4 $$253500 + .byte4 $$253501 + .byte4 $$253502 + .byte4 $$253503 .global $$256118 $$256118: .asciz "step/gimmick/Shutter" @@ -2093,12 +2093,12 @@ $$256218: __vt__Q53scn4step7gimmick7shutter7Shutter: .4byte 0 .4byte 0 - .4byte 0x80323894 - .4byte 0x80323E08 - .4byte 0x80323E20 - .4byte 0x80323E38 - .4byte 0x80323E84 - .4byte 0x80323EC0 + .byte4 __dt__Q53scn4step7gimmick7shutter7ShutterFv + .byte4 onSwitchOn__Q53scn4step7gimmick7shutter7ShutterFv + .byte4 onSwitchOff__Q53scn4step7gimmick7shutter7ShutterFv + .byte4 onSwitchToggle__Q53scn4step7gimmick7shutter7ShutterFv + .byte4 onSwitchOnFromSuperBeamSwitch__Q53scn4step7gimmick7shutter7ShutterFv + .byte4 checkDemoPos__Q53scn4step7gimmick7shutter7ShutterCFRQ33hel4math7Vector2 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253500 diff --git a/asm/src/Smash.s b/asm/src/Smash.s index 0e488267..0240f3bc 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: - .4byte 0x8048E6E0 - .4byte 0x8048E720 - .4byte 0x8048E768 - .4byte 0x8048E7A8 - .4byte 0x8048E7E8 - .4byte 0x8048E828 - .4byte 0x8048E864 - .4byte 0x8048E8A8 - .4byte 0x8048E8EC - .4byte 0x8048E928 - .4byte 0x8048E968 - .4byte 0x8048E9A8 - .4byte 0x8048E9E8 - .4byte 0x8048EA28 - .4byte 0x8048EA6C - .4byte 0x8048EAB4 + .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 .global $$257442 $$257442: .asciz "HrStoneBody" @@ -730,27 +730,27 @@ $$257571: __vt__Q53scn4step4hero5smash5Smash: .4byte 0 .4byte 0 - .4byte 0x803A05BC - .4byte 0x803A06CC - .4byte 0x8032B7A0 - .4byte 0x8032B7A4 - .4byte 0x8032B7A8 - .4byte 0x803A0864 - .4byte 0x803A09C8 - .4byte 0x8032B7B4 - .4byte 0x8032B7B8 - .4byte 0x8032B7BC - .4byte 0x8032B7C0 - .4byte 0x8032B7C4 - .4byte 0x8032B7C8 - .4byte 0x8032B7CC - .4byte 0x8032B7D0 - .4byte 0x8032B7D4 - .4byte 0x8032B7D8 - .4byte 0x8032B7DC - .4byte 0x8032B7E0 - .4byte 0x8032B7E4 - .4byte 0x8032B7E8 + .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 .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 815290f5..33015a72 100644 --- a/asm/src/SoundManager.s +++ b/asm/src/SoundManager.s @@ -600,7 +600,7 @@ $$250548: __vt__Q23snd12SoundManager: .4byte 0 .4byte 0 - .4byte 0x80403150 + .byte4 __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 1188241c..3b0023b2 100644 --- a/asm/src/Spark.s +++ b/asm/src/Spark.s @@ -1175,27 +1175,27 @@ $$259458: __vt__Q53scn4step4hero5spark5Spark: .4byte 0 .4byte 0 - .4byte 0x8038CE2C - .4byte 0x8038CEDC - .4byte 0x8032B7A0 - .4byte 0x8032B7A4 - .4byte 0x8032B7A8 - .4byte 0x8038D02C - .4byte 0x8038D3B8 - .4byte 0x8032B7B4 - .4byte 0x8032B7B8 - .4byte 0x8032B7BC - .4byte 0x8032B7C0 - .4byte 0x8038D138 - .4byte 0x8038D13C - .4byte 0x8032B7CC - .4byte 0x8032B7D0 - .4byte 0x8032B7D4 - .4byte 0x8032B7D8 - .4byte 0x8038D140 - .4byte 0x8032B7E0 - .4byte 0x8038D328 - .4byte 0x8032B7E8 + .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 .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: - .4byte 0x8055B278 - .4byte 0x8048B430 + .byte4 $$248732 + .byte4 $$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: - .4byte 0x8055B290 + .byte4 $$248766 .4byte 0 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/StaffCredit.s b/asm/src/StaffCredit.s index 136b65e0..a0101257 100644 --- a/asm/src/StaffCredit.s +++ b/asm/src/StaffCredit.s @@ -221,15 +221,15 @@ $$252124: __vt__Q33scn19challengefileselect11StaffCredit: .4byte 0 .4byte 0 - .4byte 0x801E5938 ;# ptr - .4byte 0x801E9324 ;# ptr - .4byte 0x801E935C ;# ptr - .4byte 0x801E936C ;# ptr - .4byte 0x801E9378 ;# ptr - .4byte 0x801E9384 ;# ptr - .4byte 0x801E9390 ;# ptr - .4byte 0x801E9394 ;# ptr - .4byte 0x801E939C ;# ptr + .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 0 .4byte 0 .4byte 0 diff --git a/asm/src/StaffRoll.s b/asm/src/StaffRoll.s index d291e4a6..f57805c6 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: - .4byte 0x80496048 + .byte4 $$251814 .4byte 0 - .4byte 0x80496054 + .byte4 $$251815 .4byte 0 - .4byte 0x80496068 + .byte4 $$251816 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80496080 + .byte4 $$251817 .4byte 0 - .4byte 0x80496090 + .byte4 $$251818 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8049609C + .byte4 $$251819 .4byte 0 - .4byte 0x8055C628 + .byte4 $$251820 .4byte 0x00000001 - .4byte 0x804960AC + .byte4 $$251821 .4byte 0x00000001 .4byte 0 .4byte 0 - .4byte 0x804960B8 + .byte4 $$251822 .4byte 0x00000001 .4byte 0 .4byte 0 @@ -2277,23 +2277,23 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8055C630 + .byte4 $$251823 .4byte 0x00000001 - .4byte 0x804960CC + .byte4 $$251824 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804960D8 + .byte4 $$251825 .4byte 0x00000001 - .4byte 0x804960E8 + .byte4 $$251826 .4byte 0x00000001 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804960FC + .byte4 $$251827 .4byte 0x00000001 .4byte 0 .4byte 0 @@ -2301,15 +2301,15 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80496108 + .byte4 $$251828 .4byte 0x00000001 - .4byte 0x8055C638 + .byte4 $$251829 .4byte 0x00000001 - .4byte 0x80496118 + .byte4 $$251830 .4byte 0x00000001 .4byte 0 .4byte 0 - .4byte 0x8055C640 + .byte4 $$251831 .4byte 0x00000001 .4byte 0 .4byte 0 @@ -2317,7 +2317,7 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80496128 + .byte4 $$251832 .4byte 0x00000001 .4byte 0 .4byte 0 @@ -2325,15 +2325,15 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8049613C + .byte4 $$251833 .4byte 0 - .4byte 0x80496158 + .byte4 $$251834 .4byte 0x00000001 - .4byte 0x80496168 + .byte4 $$251835 .4byte 0 - .4byte 0x80496180 + .byte4 $$251836 .4byte 0x00000001 - .4byte 0x8049618C + .byte4 $$251837 .4byte 0x00000002 .4byte 0 .4byte 0 @@ -2341,7 +2341,7 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x8049619C + .byte4 $$251838 .4byte 0x00000001 .4byte 0 .4byte 0 @@ -2349,7 +2349,7 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804961B0 + .byte4 $$251839 .4byte 0x00000001 .4byte 0 .4byte 0 @@ -2357,7 +2357,7 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804961C4 + .byte4 $$251840 .4byte 0 .4byte 0 .4byte 0 @@ -2365,7 +2365,7 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804961D0 + .byte4 $$251841 .4byte 0 .4byte 0 .4byte 0 @@ -2373,7 +2373,7 @@ POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x804961E0 + .byte4 $$251842 .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/src/Stage.s b/asm/src/Stage.s index efd8dc31..4984ef2b 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 - .4byte 0x80210A5C ;# ptr + .byte4 __sinit_$$3Stage_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global $$254734 diff --git a/asm/src/StateAbilityCrash.s b/asm/src/StateAbilityCrash.s index 5c718a8d..60fcfe13 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 - .4byte 0x80375874 - .4byte 0x80375858 + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage17StateAbilityCrash$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage17StateAbilityCrash$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6damage17StateAbilityCrash __vt__Q53scn4step4hero6damage17StateAbilityCrash: .4byte 0 .4byte 0 - .4byte 0x8037572C - .4byte 0x803757E8 - .4byte 0x803757EC - .4byte 0x8035550C - .4byte 0x80375854 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6damage17StateAbilityCrashFv + .byte4 procAnim__Q53scn4step4hero6damage17StateAbilityCrashFv + .byte4 procMove__Q53scn4step4hero6damage17StateAbilityCrashFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6damage17StateAbilityCrashFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateAgony.s b/asm/src/StateAgony.s index 59b6888e..7fde475d 100644 --- a/asm/src/StateAgony.s +++ b/asm/src/StateAgony.s @@ -330,12 +330,12 @@ __dt__Q53scn4step5enemy6flamer10StateAgonyFv: __vt__Q53scn4step5enemy6flamer10StateAgony: .4byte 0 .4byte 0 - .4byte 0x802B2878 ;# ptr - .4byte 0x802B2484 ;# ptr - .4byte 0x802B27E8 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6flamer10StateAgonyFv + .byte4 procAnim__Q53scn4step5enemy6flamer10StateAgonyFv + .byte4 procMove__Q53scn4step5enemy6flamer10StateAgonyFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257328 diff --git a/asm/src/StateAim.s b/asm/src/StateAim.s index a7fde849..5408aff0 100644 --- a/asm/src/StateAim.s +++ b/asm/src/StateAim.s @@ -515,24 +515,24 @@ __dt__Q53scn4step5enemy6shotzo8StateAimFv: __vt__Q53scn4step5enemy7gigatzo8StateAim: .4byte 0 .4byte 0 - .4byte 0x802B7A3C ;# ptr - .4byte 0x802B7AB8 ;# ptr - .4byte 0x802B7C44 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B7CDC ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7gigatzo8StateAimFv + .byte4 procAnim__Q53scn4step5enemy7gigatzo8StateAimFv + .byte4 procMove__Q53scn4step5enemy7gigatzo8StateAimFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7gigatzo8StateAimFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo8StateAim __vt__Q53scn4step5enemy6shotzo8StateAim: .4byte 0 .4byte 0 - .4byte 0x802E0AAC ;# ptr - .4byte 0x802E08EC ;# ptr - .4byte 0x802E09CC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E0A6C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6shotzo8StateAimFv + .byte4 procAnim__Q53scn4step5enemy6shotzo8StateAimFv + .byte4 procMove__Q53scn4step5enemy6shotzo8StateAimFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6shotzo8StateAimFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256000 diff --git a/asm/src/StateAirJump.s b/asm/src/StateAirJump.s index d045bd3e..8ff1eb56 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 - .4byte 0x8035E880 - .4byte 0x8035E864 + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateAirJump$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateAirJump$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common12StateAirJump __vt__Q53scn4step4hero6common12StateAirJump: .4byte 0 .4byte 0 - .4byte 0x8035E6A4 - .4byte 0x8035E700 - .4byte 0x8035E7E0 - .4byte 0x8035550C - .4byte 0x8035E804 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common12StateAirJumpFv + .byte4 procAnim__Q53scn4step4hero6common12StateAirJumpFv + .byte4 procMove__Q53scn4step4hero6common12StateAirJumpFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common12StateAirJumpFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateAirSpin.s b/asm/src/StateAirSpin.s index 6d4c7234..dadd3e8f 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 - .4byte 0x803A0F9C - .4byte 0x803A0F80 + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash12StateAirSpin$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash12StateAirSpin$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5smash12StateAirSpin __vt__Q53scn4step4hero5smash12StateAirSpin: .4byte 0 .4byte 0 - .4byte 0x803A0E4C - .4byte 0x803A0ECC - .4byte 0x803A0F78 - .4byte 0x8035550C - .4byte 0x803A0F7C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5smash12StateAirSpinFv + .byte4 procAnim__Q53scn4step4hero5smash12StateAirSpinFv + .byte4 procMove__Q53scn4step4hero5smash12StateAirSpinFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5smash12StateAirSpinFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateAllStageClear.s b/asm/src/StateAllStageClear.s index a93f18c7..f4ab6f62 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 - .4byte 0x80378CAC - .4byte 0x80378C8C + .byte4 __dt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChangeGrade$$4PQ43scn4step4hero4Hero$$4i$$1Fv + .byte4 create__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChangeGrade$$4PQ43scn4step4hero4Hero$$4i$$1Fv .global __vt__Q53scn4step4hero7gimmick18StateAllStageClear __vt__Q53scn4step4hero7gimmick18StateAllStageClear: .4byte 0 .4byte 0 - .4byte 0x80378A68 - .4byte 0x80378AF8 - .4byte 0x80378C84 - .4byte 0x8035550C - .4byte 0x80378C88 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick18StateAllStageClearFv + .byte4 procAnim__Q53scn4step4hero7gimmick18StateAllStageClearFv + .byte4 procMove__Q53scn4step4hero7gimmick18StateAllStageClearFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick18StateAllStageClearFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateAngerChase.s b/asm/src/StateAngerChase.s index dae0280a..add262af 100644 --- a/asm/src/StateAngerChase.s +++ b/asm/src/StateAngerChase.s @@ -578,12 +578,12 @@ lbl_802DA688: __vt__Q53scn4step5enemy6scarfy15StateAngerChase: .4byte 0 .4byte 0 - .4byte 0x802D9FDC ;# ptr - .4byte 0x802D9FE0 ;# ptr - .4byte 0x802DA278 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6scarfy15StateAngerChaseFv + .byte4 procAnim__Q53scn4step5enemy6scarfy15StateAngerChaseFv + .byte4 procMove__Q53scn4step5enemy6scarfy15StateAngerChaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257207 diff --git a/asm/src/StateAnyWhereIn.s b/asm/src/StateAnyWhereIn.s index 24666557..b0b329d2 100644 --- a/asm/src/StateAnyWhereIn.s +++ b/asm/src/StateAnyWhereIn.s @@ -699,13 +699,13 @@ lbl_8035F2AC: __vt__Q53scn4step4hero6common15StateAnyWhereIn: .4byte 0 .4byte 0 - .4byte 0x8035E9E8 - .4byte 0x8035EC44 - .4byte 0x8035ED38 - .4byte 0x8035550C - .4byte 0x8035EFB8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common15StateAnyWhereInFv + .byte4 procAnim__Q53scn4step4hero6common15StateAnyWhereInFv + .byte4 procMove__Q53scn4step4hero6common15StateAnyWhereInFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common15StateAnyWhereInFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/StateAppear.s b/asm/src/StateAppear.s index 8b208b71..425aae73 100644 --- a/asm/src/StateAppear.s +++ b/asm/src/StateAppear.s @@ -1203,72 +1203,72 @@ $$257483: __vt__Q53scn4step4boss6common11StateAppear: .4byte 0 .4byte 0 - .4byte 0x80244738 ;# ptr - .4byte 0x80244814 ;# ptr - .4byte 0x80244AE0 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80244AE4 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6common11StateAppearFv + .byte4 procAnim__Q53scn4step4boss6common11StateAppearFv + .byte4 procMove__Q53scn4step4boss6common11StateAppearFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common11StateAppearFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah11StateAppear$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah11StateAppear$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8024BA6C ;# ptr - .4byte 0x8024BA50 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss10creditroah11StateAppear __vt__Q53scn4step4boss10creditroah11StateAppear: .4byte 0 .4byte 0 - .4byte 0x8024B9DC ;# ptr - .4byte 0x8024B9E0 ;# ptr - .4byte 0x8024BA08 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024BA4C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss10creditroah11StateAppearFv + .byte4 procAnim__Q53scn4step4boss10creditroah11StateAppearFv + .byte4 procMove__Q53scn4step4boss10creditroah11StateAppearFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss10creditroah11StateAppearFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateWait$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateWait$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8025CAF8 ;# ptr - .4byte 0x8025CADC ;# ptr + .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateWait$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateWait$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6whispy11StateAppear __vt__Q53scn4step4boss6whispy11StateAppear: .4byte 0 .4byte 0 - .4byte 0x8025C988 ;# ptr - .4byte 0x8025C98C ;# ptr - .4byte 0x8025CA80 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025CA84 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy11StateAppearFv + .byte4 procAnim__Q53scn4step4boss6whispy11StateAppearFv + .byte4 procMove__Q53scn4step4boss6whispy11StateAppearFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy11StateAppearFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4como11StateAppear __vt__Q53scn4step5enemy4como11StateAppear: .4byte 0 .4byte 0 - .4byte 0x802A77B8 ;# ptr - .4byte 0x802A75BC ;# ptr - .4byte 0x802A7680 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A77B4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy4como11StateAppearFv + .byte4 procAnim__Q53scn4step5enemy4como11StateAppearFv + .byte4 procMove__Q53scn4step5enemy4como11StateAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4como11StateAppearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11whispyapple11StateAppear __vt__Q53scn4step5enemy11whispyapple11StateAppear: .4byte 0 .4byte 0 - .4byte 0x802F1210 ;# ptr - .4byte 0x802F128C ;# ptr - .4byte 0x802F1330 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802F1334 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11whispyapple11StateAppearFv + .byte4 procAnim__Q53scn4step5enemy11whispyapple11StateAppearFv + .byte4 procMove__Q53scn4step5enemy11whispyapple11StateAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11whispyapple11StateAppearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257435 diff --git a/asm/src/StateApproach.s b/asm/src/StateApproach.s index 2f2002b6..c30817d1 100644 --- a/asm/src/StateApproach.s +++ b/asm/src/StateApproach.s @@ -138,10 +138,10 @@ lbl_803C7448: __vt__Q53scn4step4item5state13StateApproach: .4byte 0 .4byte 0 - .4byte 0x803C7408 - .4byte 0x803C72E4 - .4byte 0x803C72E8 - .4byte 0x803C5204 + .byte4 __dt__Q53scn4step4item5state13StateApproachFv + .byte4 procAnim__Q53scn4step4item5state13StateApproachFv + .byte4 procMove__Q53scn4step4item5state13StateApproachFv + .byte4 procFixPos__Q43scn4step4item9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255066 diff --git a/asm/src/StateAreaMapDemoFirstPlay.s b/asm/src/StateAreaMapDemoFirstPlay.s index 51697a7f..6921c7f3 100644 --- a/asm/src/StateAreaMapDemoFirstPlay.s +++ b/asm/src/StateAreaMapDemoFirstPlay.s @@ -162,11 +162,11 @@ procFixPos__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv: __vt__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay: .4byte 0 .4byte 0 - .4byte 0x80378D74 - .4byte 0x80378E04 - .4byte 0x80378ED0 - .4byte 0x8035550C - .4byte 0x80378ED4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv + .byte4 procAnim__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv + .byte4 procMove__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateAttack.s b/asm/src/StateAttack.s index 0e1c8137..0d68a26b 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 - .4byte 0x80244C0C ;# ptr - .4byte 0x80244C10 ;# ptr - .4byte 0x80244E7C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80244EB4 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6common11StateAttackFv + .byte4 procAnim__Q53scn4step4boss6common11StateAttackFv + .byte4 procMove__Q53scn4step4boss6common11StateAttackFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common11StateAttackFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss13watergalboros11StateAttack __vt__Q53scn4step4boss13watergalboros11StateAttack: .4byte 0 .4byte 0 - .4byte 0x80259F30 ;# ptr - .4byte 0x80259F34 ;# ptr - .4byte 0x8025A05C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025A0B0 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss13watergalboros11StateAttackFv + .byte4 procAnim__Q53scn4step4boss13watergalboros11StateAttackFv + .byte4 procMove__Q53scn4step4boss13watergalboros11StateAttackFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss13watergalboros11StateAttackFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble10StateCatch$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble10StateCatch$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8026164C ;# ptr - .4byte 0x80261630 ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble10StateCatch$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble10StateCatch$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9zankibble11StateAttack __vt__Q53scn4step4boss9zankibble11StateAttack: .4byte 0 .4byte 0 - .4byte 0x80260ED8 ;# ptr - .4byte 0x80260F98 ;# ptr - .4byte 0x80261210 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80261264 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9zankibble11StateAttackFv + .byte4 procAnim__Q53scn4step4boss9zankibble11StateAttackFv + .byte4 procMove__Q53scn4step4boss9zankibble11StateAttackFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9zankibble11StateAttackFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight11StateAttack __vt__Q53scn4step5enemy11bladeknight11StateAttack: .4byte 0 .4byte 0 - .4byte 0x8029764C ;# ptr - .4byte 0x80297650 ;# ptr - .4byte 0x802976A8 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80297818 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11bladeknight11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy11bladeknight11StateAttackFv + .byte4 procMove__Q53scn4step5enemy11bladeknight11StateAttackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11bladeknight11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5bowby11StateAttack __vt__Q53scn4step5enemy5bowby11StateAttack: .4byte 0 .4byte 0 - .4byte 0x8029E98C ;# ptr - .4byte 0x8029EA0C ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5bowby11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy5bowby11StateAttackFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 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 - .4byte 0x802A3310 ;# ptr - .4byte 0x802A32E8 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8cappyhat10StateThrow$$4PQ43scn4step5enemy5Enemy$$4Ux$$1Fv + .byte4 create__Q24util99StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8cappyhat10StateThrow$$4PQ43scn4step5enemy5Enemy$$4Ux$$1Fv .global __vt__Q53scn4step5enemy5cappy11StateAttack __vt__Q53scn4step5enemy5cappy11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802A330C ;# ptr - .4byte 0x802A2F08 ;# ptr - .4byte 0x802A306C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A32C4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5cappy11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy5cappy11StateAttackFv + .byte4 procMove__Q53scn4step5enemy5cappy11StateAttackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5cappy11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly11StateAttack __vt__Q53scn4step5enemy6chilly11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802A6450 ;# ptr - .4byte 0x802A64D8 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A660C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6chilly11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy6chilly11StateAttackFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6chilly11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4elec11StateAttack __vt__Q53scn4step5enemy4elec11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802AFD98 ;# ptr - .4byte 0x802AFE14 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy4elec11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy4elec11StateAttackFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer11StateAttack __vt__Q53scn4step5enemy6flamer11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802B2934 ;# ptr - .4byte 0x802B2A1C ;# ptr - .4byte 0x802B2BB4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B2E0C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6flamer11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy6flamer11StateAttackFv + .byte4 procMove__Q53scn4step5enemy6flamer11StateAttackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6flamer11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5foley11StateAttack __vt__Q53scn4step5enemy5foley11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802B4CC8 ;# ptr - .4byte 0x802B4CCC ;# ptr - .4byte 0x802B4EE8 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B4F9C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5foley11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy5foley11StateAttackFv + .byte4 procMove__Q53scn4step5enemy5foley11StateAttackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5foley11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gemra11StateAttack __vt__Q53scn4step5enemy5gemra11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802B632C ;# ptr - .4byte 0x802B63DC ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5gemra11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy5gemra11StateAttackFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7gigatzo11StateAttack __vt__Q53scn4step5enemy7gigatzo11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802B7F6C ;# ptr - .4byte 0x802B7FE8 ;# ptr - .4byte 0x802B81A4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B8270 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7gigatzo11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy7gigatzo11StateAttackFv + .byte4 procMove__Q53scn4step5enemy7gigatzo11StateAttackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7gigatzo11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6juckle11StateAttack __vt__Q53scn4step5enemy6juckle11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802BBC74 ;# ptr - .4byte 0x802BB8EC ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6juckle11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy6juckle11StateAttackFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe10StateHadou$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe10StateHadou$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C0178 ;# ptr - .4byte 0x802C00FC ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe10StateHadou$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe10StateHadou$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateVulcan$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateVulcan$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C0174 ;# ptr - .4byte 0x802C0118 ;# ptr + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateVulcan$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateVulcan$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateRising$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateRising$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C0170 ;# ptr - .4byte 0x802C0134 ;# ptr + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateRising$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateRising$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateSpin$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateSpin$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C016C ;# ptr - .4byte 0x802C0150 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateSpin$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateSpin$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10knucklejoe11StateAttack __vt__Q53scn4step5enemy10knucklejoe11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802BFE8C ;# ptr - .4byte 0x802BFF08 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C00F8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10knucklejoe11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy10knucklejoe11StateAttackFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10knucklejoe11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer11StateAttack __vt__Q53scn4step5enemy6lanzer11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802C2398 ;# ptr - .4byte 0x802C2440 ;# ptr - .4byte 0x802C24AC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C25D0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6lanzer11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy6lanzer11StateAttackFv + .byte4 procMove__Q53scn4step5enemy6lanzer11StateAttackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6lanzer11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C39A4 ;# ptr - .4byte 0x802C3984 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6leafan11StateAttack __vt__Q53scn4step5enemy6leafan11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802C39A0 ;# ptr - .4byte 0x802C36C8 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C38E8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6leafan11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy6leafan11StateAttackFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6leafan11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateIdling$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateIdling$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C6748 ;# ptr - .4byte 0x802C672C ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateIdling$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateIdling$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8needlous11StateAttack __vt__Q53scn4step5enemy8needlous11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802C6350 ;# ptr - .4byte 0x802C63C8 ;# ptr - .4byte 0x802C6424 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C64DC ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8needlous11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy8needlous11StateAttackFv + .byte4 procMove__Q53scn4step5enemy8needlous11StateAttackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy8needlous11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802D3DE0 ;# ptr - .4byte 0x802D3DC4 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5rocky11StateAttack __vt__Q53scn4step5enemy5rocky11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802D3C68 ;# ptr - .4byte 0x802D3C6C ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D3D28 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5rocky11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy5rocky11StateAttackFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5rocky11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8searches11StateAttack __vt__Q53scn4step5enemy8searches11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802DC110 ;# ptr - .4byte 0x802DBF44 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8searches11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy8searches11StateAttackFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9sirkibble11StateAttack __vt__Q53scn4step5enemy9sirkibble11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802E1884 ;# ptr - .4byte 0x802E1888 ;# ptr - .4byte 0x802E1958 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E195C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9sirkibble11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy9sirkibble11StateAttackFv + .byte4 procMove__Q53scn4step5enemy9sirkibble11StateAttackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9sirkibble11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory11StateAttack __vt__Q53scn4step5enemy6sodory11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802E56B4 ;# ptr - .4byte 0x802E577C ;# ptr - .4byte 0x802E5D48 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E5DEC ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6sodory11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy6sodory11StateAttackFv + .byte4 procMove__Q53scn4step5enemy6sodory11StateAttackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6sodory11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sparky11StateAttack __vt__Q53scn4step5enemy6sparky11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802E6FBC ;# ptr - .4byte 0x802E7038 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E7100 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6sparky11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy6sparky11StateAttackFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6sparky11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage11StateAttack __vt__Q53scn4step5enemy9tsukikage11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802EB36C ;# ptr - .4byte 0x802EB1C4 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EB2C8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9tsukikage11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy9tsukikage11StateAttackFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9tsukikage11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledoo11StateAttack __vt__Q53scn4step5enemy9waddledoo11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802EFCB4 ;# ptr - .4byte 0x802EFCAC ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EFCB0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledoo11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy9waddledoo11StateAttackFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9waddledoo11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10watergalbo11StateAttack __vt__Q53scn4step5enemy10watergalbo11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802F0330 ;# ptr - .4byte 0x802F03B0 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802F067C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10watergalbo11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy10watergalbo11StateAttackFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10watergalbo11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6whippy11StateAttack __vt__Q53scn4step5enemy6whippy11StateAttack: .4byte 0 .4byte 0 - .4byte 0x802F0968 ;# ptr - .4byte 0x802F09DC ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802F0B6C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6whippy11StateAttackFv + .byte4 procAnim__Q53scn4step5enemy6whippy11StateAttackFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6whippy11StateAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14StateAttackEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14StateAttackEnd$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8038E074 - .4byte 0x8038E038 + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14StateAttackEnd$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14StateAttackEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark11StateAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark11StateAttack$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8038E070 - .4byte 0x8038E054 + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark11StateAttack$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark11StateAttack$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5spark11StateAttack __vt__Q53scn4step4hero5spark11StateAttack: .4byte 0 .4byte 0 - .4byte 0x8038DDE0 - .4byte 0x8038DEBC - .4byte 0x8038DFE8 - .4byte 0x8035550C - .4byte 0x8038DFEC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5spark11StateAttackFv + .byte4 procAnim__Q53scn4step4hero5spark11StateAttackFv + .byte4 procMove__Q53scn4step4hero5spark11StateAttackFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5spark11StateAttackFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateAttack1Way.s b/asm/src/StateAttack1Way.s index e3802b3c..97afee40 100644 --- a/asm/src/StateAttack1Way.s +++ b/asm/src/StateAttack1Way.s @@ -242,12 +242,12 @@ __dt__Q53scn4step5enemy6owgulf15StateAttack1WayFv: __vt__Q53scn4step5enemy6owgulf15StateAttack1Way: .4byte 0 .4byte 0 - .4byte 0x802CA368 ;# ptr - .4byte 0x802CA100 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6owgulf15StateAttack1WayFv + .byte4 procAnim__Q53scn4step5enemy6owgulf15StateAttack1WayFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255607 diff --git a/asm/src/StateAttack3Way.s b/asm/src/StateAttack3Way.s index dde30289..1d95385b 100644 --- a/asm/src/StateAttack3Way.s +++ b/asm/src/StateAttack3Way.s @@ -267,12 +267,12 @@ __dt__Q53scn4step5enemy6owgulf15StateAttack3WayFv: __vt__Q53scn4step5enemy6owgulf15StateAttack3Way: .4byte 0 .4byte 0 - .4byte 0x802CA728 ;# ptr - .4byte 0x802CA468 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6owgulf15StateAttack3WayFv + .byte4 procAnim__Q53scn4step5enemy6owgulf15StateAttack3WayFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255579 diff --git a/asm/src/StateAttackBreath.s b/asm/src/StateAttackBreath.s index 3c8d8c02..816b2755 100644 --- a/asm/src/StateAttackBreath.s +++ b/asm/src/StateAttackBreath.s @@ -159,9 +159,9 @@ lbl_802BA944: __vt__Q53scn4step5enemy7hothead17StateAttackBreath: .4byte 0 .4byte 0 - .4byte 0x802BA7B0 ;# ptr - .4byte 0x802BA7B4 ;# ptr - .4byte 0x802BA8BC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802BA8C0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7hothead17StateAttackBreathFv + .byte4 procAnim__Q53scn4step5enemy7hothead17StateAttackBreathFv + .byte4 procMove__Q53scn4step5enemy7hothead17StateAttackBreathFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7hothead17StateAttackBreathFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateAttackEnd.s b/asm/src/StateAttackEnd.s index 146fca24..afe256ff 100644 --- a/asm/src/StateAttackEnd.s +++ b/asm/src/StateAttackEnd.s @@ -140,11 +140,11 @@ procFixPos__Q53scn4step4hero5spark14StateAttackEndFv: __vt__Q53scn4step4hero5spark14StateAttackEnd: .4byte 0 .4byte 0 - .4byte 0x8038E110 - .4byte 0x8038E1A4 - .4byte 0x8038E204 - .4byte 0x8035550C - .4byte 0x8038E208 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5spark14StateAttackEndFv + .byte4 procAnim__Q53scn4step4hero5spark14StateAttackEndFv + .byte4 procMove__Q53scn4step4hero5spark14StateAttackEndFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5spark14StateAttackEndFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateAttackJoint.s b/asm/src/StateAttackJoint.s index d064ec3b..b5bb4095 100644 --- a/asm/src/StateAttackJoint.s +++ b/asm/src/StateAttackJoint.s @@ -52,9 +52,9 @@ procFixPos__Q53scn4step4boss13watergalboros16StateAttackJointFv: __vt__Q53scn4step4boss13watergalboros16StateAttackJoint: .4byte 0 .4byte 0 - .4byte 0x8025A120 ;# ptr - .4byte 0x8025A124 ;# ptr - .4byte 0x8025A128 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025A12C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss13watergalboros16StateAttackJointFv + .byte4 procAnim__Q53scn4step4boss13watergalboros16StateAttackJointFv + .byte4 procMove__Q53scn4step4boss13watergalboros16StateAttackJointFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss13watergalboros16StateAttackJointFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateAttackOver.s b/asm/src/StateAttackOver.s index 273f569f..19716301 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 - .4byte 0x8038E778 - .4byte 0x8038E73C + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark18StateAttackOverEnd$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark18StateAttackOverEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark15StateAttackOver$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark15StateAttackOver$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8038E774 - .4byte 0x8038E758 + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark15StateAttackOver$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark15StateAttackOver$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5spark15StateAttackOver __vt__Q53scn4step4hero5spark15StateAttackOver: .4byte 0 .4byte 0 - .4byte 0x8038E3F4 - .4byte 0x8038E49C - .4byte 0x8038E5A8 - .4byte 0x8035550C - .4byte 0x8038E5AC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5spark15StateAttackOverFv + .byte4 procAnim__Q53scn4step4hero5spark15StateAttackOverFv + .byte4 procMove__Q53scn4step4hero5spark15StateAttackOverFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5spark15StateAttackOverFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateAttackOverEnd.s b/asm/src/StateAttackOverEnd.s index e8bea52f..e7a8c708 100644 --- a/asm/src/StateAttackOverEnd.s +++ b/asm/src/StateAttackOverEnd.s @@ -84,11 +84,11 @@ procFixPos__Q53scn4step4hero5spark18StateAttackOverEndFv: __vt__Q53scn4step4hero5spark18StateAttackOverEnd: .4byte 0 .4byte 0 - .4byte 0x8038E7E8 - .4byte 0x8038E868 - .4byte 0x8038E86C - .4byte 0x8035550C - .4byte 0x8038E870 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5spark18StateAttackOverEndFv + .byte4 procAnim__Q53scn4step4hero5spark18StateAttackOverEndFv + .byte4 procMove__Q53scn4step4hero5spark18StateAttackOverEndFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5spark18StateAttackOverEndFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateAttackShot.s b/asm/src/StateAttackShot.s index 8f98dc6f..372f9de8 100644 --- a/asm/src/StateAttackShot.s +++ b/asm/src/StateAttackShot.s @@ -354,12 +354,12 @@ reqWeapon__Q53scn4step5enemy7hothead15StateAttackShotFv: __vt__Q53scn4step5enemy7hothead15StateAttackShot: .4byte 0 .4byte 0 - .4byte 0x802BA9E8 ;# ptr - .4byte 0x802BAA64 ;# ptr - .4byte 0x802BABA4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802BABA8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7hothead15StateAttackShotFv + .byte4 procAnim__Q53scn4step5enemy7hothead15StateAttackShotFv + .byte4 procMove__Q53scn4step5enemy7hothead15StateAttackShotFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7hothead15StateAttackShotFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257616 diff --git a/asm/src/StateAttackUnder.s b/asm/src/StateAttackUnder.s index 019d8352..6c1b50ed 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 - .4byte 0x8038EDCC - .4byte 0x8038ED90 + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark19StateAttackUnderEnd$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark19StateAttackUnderEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark16StateAttackUnder$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark16StateAttackUnder$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8038EDC8 - .4byte 0x8038EDAC + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark16StateAttackUnder$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark16StateAttackUnder$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5spark16StateAttackUnder __vt__Q53scn4step4hero5spark16StateAttackUnder: .4byte 0 .4byte 0 - .4byte 0x8038EA34 - .4byte 0x8038EADC - .4byte 0x8038EBE8 - .4byte 0x8035550C - .4byte 0x8038EBEC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5spark16StateAttackUnderFv + .byte4 procAnim__Q53scn4step4hero5spark16StateAttackUnderFv + .byte4 procMove__Q53scn4step4hero5spark16StateAttackUnderFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5spark16StateAttackUnderFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateAttackUnderEnd.s b/asm/src/StateAttackUnderEnd.s index 38c64796..26f7138e 100644 --- a/asm/src/StateAttackUnderEnd.s +++ b/asm/src/StateAttackUnderEnd.s @@ -84,11 +84,11 @@ procFixPos__Q53scn4step4hero5spark19StateAttackUnderEndFv: __vt__Q53scn4step4hero5spark19StateAttackUnderEnd: .4byte 0 .4byte 0 - .4byte 0x8038EE3C - .4byte 0x8038EEBC - .4byte 0x8038EEC0 - .4byte 0x8035550C - .4byte 0x8038EEC4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5spark19StateAttackUnderEndFv + .byte4 procAnim__Q53scn4step4hero5spark19StateAttackUnderEndFv + .byte4 procMove__Q53scn4step4hero5spark19StateAttackUnderEndFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5spark19StateAttackUnderEndFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateBack.s b/asm/src/StateBack.s index 20f8de89..5ebb2838 100644 --- a/asm/src/StateBack.s +++ b/asm/src/StateBack.s @@ -394,24 +394,24 @@ procFixPos__Q53scn4step5enemy8dubiorjr9StateBackFv: __vt__Q53scn4step5enemy4como9StateBack: .4byte 0 .4byte 0 - .4byte 0x802A7A58 ;# ptr - .4byte 0x802A7830 ;# ptr - .4byte 0x802A7834 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A79BC ;# ptr - .4byte 0x802A79C0 ;# ptr + .byte4 __dt__Q53scn4step5enemy4como9StateBackFv + .byte4 procAnim__Q53scn4step5enemy4como9StateBackFv + .byte4 procMove__Q53scn4step5enemy4como9StateBackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4como9StateBackFv + .byte4 procObjCollReact__Q53scn4step5enemy4como9StateBackFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8dubiorjr9StateBack __vt__Q53scn4step5enemy8dubiorjr9StateBack: .4byte 0 .4byte 0 - .4byte 0x802AE560 ;# ptr - .4byte 0x802AE564 ;# ptr - .4byte 0x802AE58C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802AE5E0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8dubiorjr9StateBackFv + .byte4 procAnim__Q53scn4step5enemy8dubiorjr9StateBackFv + .byte4 procMove__Q53scn4step5enemy8dubiorjr9StateBackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy8dubiorjr9StateBackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255315 diff --git a/asm/src/StateBackCircle.s b/asm/src/StateBackCircle.s index d0ad8154..a942d97f 100644 --- a/asm/src/StateBackCircle.s +++ b/asm/src/StateBackCircle.s @@ -367,12 +367,12 @@ lbl_802F2B28: __vt__Q53scn4step5enemy15zankibblecutter15StateBackCircle: .4byte 0 .4byte 0 - .4byte 0x802F26E0 ;# ptr - .4byte 0x802F26E4 ;# ptr - .4byte 0x802F26E8 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802F285C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy15zankibblecutter15StateBackCircleFv + .byte4 procAnim__Q53scn4step5enemy15zankibblecutter15StateBackCircleFv + .byte4 procMove__Q53scn4step5enemy15zankibblecutter15StateBackCircleFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy15zankibblecutter15StateBackCircleFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256131 diff --git a/asm/src/StateBase.s b/asm/src/StateBase.s index c538fc97..d2f01be8 100644 --- a/asm/src/StateBase.s +++ b/asm/src/StateBase.s @@ -281,37 +281,37 @@ lbl_803D89A8: __vt__Q43scn4step4boss9StateBase: .4byte 0 .4byte 0 - .4byte 0x80234508 ;# ptr - .4byte 0x802344F4 ;# ptr - .4byte 0x802344F8 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80234500 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q43scn4step4boss9StateBaseFv + .byte4 procAnim__Q43scn4step4boss9StateBaseFv + .byte4 procMove__Q43scn4step4boss9StateBaseFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q43scn4step4boss9StateBaseFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy9StateBase __vt__Q43scn4step5enemy9StateBase: .4byte 0 .4byte 0 - .4byte 0x8028DDEC ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q43scn4step5enemy9StateBaseFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero9StateBase __vt__Q43scn4step4hero9StateBase: .4byte 0 .4byte 0 - .4byte 0x8035551C - .4byte 0x80355504 - .4byte 0x80355508 - .4byte 0x8035550C - .4byte 0x80355510 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q43scn4step4hero9StateBaseFv + .byte4 procAnim__Q43scn4step4hero9StateBaseFv + .byte4 procMove__Q43scn4step4hero9StateBaseFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q43scn4step4hero9StateBaseFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -319,19 +319,19 @@ __vt__Q43scn4step4hero9StateBase: __vt__Q43scn4step4item9StateBase: .4byte 0 .4byte 0 - .4byte 0x803C5208 - .4byte 0x803C51FC - .4byte 0x803C5200 - .4byte 0x803C5204 + .byte4 __dt__Q43scn4step4item9StateBaseFv + .byte4 procAnim__Q43scn4step4item9StateBaseFv + .byte4 procMove__Q43scn4step4item9StateBaseFv + .byte4 procFixPos__Q43scn4step4item9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon9StateBase __vt__Q43scn4step6weapon9StateBase: .4byte 0 .4byte 0 - .4byte 0x803D8968 - .4byte 0x803D8954 - .4byte 0x803D8958 - .4byte 0x803D895C - .4byte 0x803D8960 - .4byte 0x803D8964 + .byte4 __dt__Q43scn4step6weapon9StateBaseFv + .byte4 procAnim__Q43scn4step6weapon9StateBaseFv + .byte4 procMove__Q43scn4step6weapon9StateBaseFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q43scn4step6weapon9StateBaseFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv diff --git a/asm/src/StateBodyHit.s b/asm/src/StateBodyHit.s index 0cc1a172..3bf6424e 100644 --- a/asm/src/StateBodyHit.s +++ b/asm/src/StateBodyHit.s @@ -179,13 +179,13 @@ lbl_80375AC0: __vt__Q53scn4step4hero6damage12StateBodyHit: .4byte 0 .4byte 0 - .4byte 0x803758C0 - .4byte 0x80375938 - .4byte 0x80375998 - .4byte 0x8035550C - .4byte 0x80375A00 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6damage12StateBodyHitFv + .byte4 procAnim__Q53scn4step4hero6damage12StateBodyHitFv + .byte4 procMove__Q53scn4step4hero6damage12StateBodyHitFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6damage12StateBodyHitFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateBomb.s b/asm/src/StateBomb.s index f8b75c04..8ad3d7df 100644 --- a/asm/src/StateBomb.s +++ b/asm/src/StateBomb.s @@ -270,9 +270,9 @@ lbl_80238104: __vt__Q53scn4step4boss7bonkers9StateBomb: .4byte 0 .4byte 0 - .4byte 0x80237E54 ;# ptr - .4byte 0x80237EB0 ;# ptr - .4byte 0x80237F6C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80237FC0 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss7bonkers9StateBombFv + .byte4 procAnim__Q53scn4step4boss7bonkers9StateBombFv + .byte4 procMove__Q53scn4step4boss7bonkers9StateBombFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss7bonkers9StateBombFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateBombStart.s b/asm/src/StateBombStart.s index 2a72222e..3429e2b2 100644 --- a/asm/src/StateBombStart.s +++ b/asm/src/StateBombStart.s @@ -68,9 +68,9 @@ procFixPos__Q53scn4step4boss7bonkers14StateBombStartFv: __vt__Q53scn4step4boss7bonkers14StateBombStart: .4byte 0 .4byte 0 - .4byte 0x802381AC ;# ptr - .4byte 0x802381B0 ;# ptr - .4byte 0x802381FC ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80238200 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss7bonkers14StateBombStartFv + .byte4 procAnim__Q53scn4step4boss7bonkers14StateBombStartFv + .byte4 procMove__Q53scn4step4boss7bonkers14StateBombStartFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss7bonkers14StateBombStartFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateBossDemoStart.s b/asm/src/StateBossDemoStart.s index cf67463d..262feddc 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 - .4byte 0x803A2C20 - .4byte 0x803A2C04 + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo17StateBossDemoWait$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo17StateBossDemoWait$$4PQ43scn4step4hero4Hero$$1Fv diff --git a/asm/src/StateBossDemoWait.s b/asm/src/StateBossDemoWait.s index 4f2d162a..31334c15 100644 --- a/asm/src/StateBossDemoWait.s +++ b/asm/src/StateBossDemoWait.s @@ -1140,13 +1140,13 @@ $$260245: __vt__Q53scn4step4hero8bossdemo17StateBossDemoWait: .4byte 0 .4byte 0 - .4byte 0x803A2F6C - .4byte 0x803A3054 - .4byte 0x803A343C - .4byte 0x8035550C - .4byte 0x803A38C4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero8bossdemo17StateBossDemoWaitFv + .byte4 procAnim__Q53scn4step4hero8bossdemo17StateBossDemoWaitFv + .byte4 procMove__Q53scn4step4hero8bossdemo17StateBossDemoWaitFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero8bossdemo17StateBossDemoWaitFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateBound.s b/asm/src/StateBound.s index 8293ded8..043829b9 100644 --- a/asm/src/StateBound.s +++ b/asm/src/StateBound.s @@ -687,22 +687,22 @@ lbl_803C7884: __vt__Q53scn4step5enemy10stareffect10StateBound: .4byte 0 .4byte 0 - .4byte 0x802E7FF8 ;# ptr - .4byte 0x802E80BC ;# ptr - .4byte 0x802E8154 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E81D4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10stareffect10StateBoundFv + .byte4 procAnim__Q53scn4step5enemy10stareffect10StateBoundFv + .byte4 procMove__Q53scn4step5enemy10stareffect10StateBoundFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10stareffect10StateBoundFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state10StateBound __vt__Q53scn4step4item5state10StateBound: .4byte 0 .4byte 0 - .4byte 0x803C7578 - .4byte 0x803C760C - .4byte 0x803C7648 - .4byte 0x803C76BC + .byte4 __dt__Q53scn4step4item5state10StateBoundFv + .byte4 procAnim__Q53scn4step4item5state10StateBoundFv + .byte4 procMove__Q53scn4step4item5state10StateBoundFv + .byte4 procFixPos__Q53scn4step4item5state10StateBoundFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257606 diff --git a/asm/src/StateBound1.s b/asm/src/StateBound1.s index 77cb91ba..7b4daf84 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 - .4byte 0x802F17C8 ;# ptr - .4byte 0x802F17A4 ;# ptr + .byte4 __dt__Q24util106StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple14StateBoundNear$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv + .byte4 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 - .4byte 0x802F17C4 ;# ptr - .4byte 0x802F1780 ;# ptr + .byte4 __dt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound2$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1Fv + .byte4 create__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound2$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1Fv .global __vt__Q53scn4step5enemy11whispyapple11StateBound1 __vt__Q53scn4step5enemy11whispyapple11StateBound1: .4byte 0 .4byte 0 - .4byte 0x802F13E4 ;# ptr - .4byte 0x802F13E8 ;# ptr - .4byte 0x802F1494 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802F15C8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11whispyapple11StateBound1Fv + .byte4 procAnim__Q53scn4step5enemy11whispyapple11StateBound1Fv + .byte4 procMove__Q53scn4step5enemy11whispyapple11StateBound1Fv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11whispyapple11StateBound1Fv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256704 diff --git a/asm/src/StateBound2.s b/asm/src/StateBound2.s index 40cae8cb..6249d066 100644 --- a/asm/src/StateBound2.s +++ b/asm/src/StateBound2.s @@ -224,12 +224,12 @@ lbl_802F1AC4: __vt__Q53scn4step5enemy11whispyapple11StateBound2: .4byte 0 .4byte 0 - .4byte 0x802F18B8 ;# ptr - .4byte 0x802F18BC ;# ptr - .4byte 0x802F1968 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802F19C0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11whispyapple11StateBound2Fv + .byte4 procAnim__Q53scn4step5enemy11whispyapple11StateBound2Fv + .byte4 procMove__Q53scn4step5enemy11whispyapple11StateBound2Fv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11whispyapple11StateBound2Fv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256621 diff --git a/asm/src/StateBoundNear.s b/asm/src/StateBoundNear.s index 48262d46..10a6d488 100644 --- a/asm/src/StateBoundNear.s +++ b/asm/src/StateBoundNear.s @@ -291,12 +291,12 @@ lbl_802F1EC8: __vt__Q53scn4step5enemy11whispyapple14StateBoundNear: .4byte 0 .4byte 0 - .4byte 0x802F1C40 ;# ptr - .4byte 0x802F1C44 ;# ptr - .4byte 0x802F1D58 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802F1DB0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11whispyapple14StateBoundNearFv + .byte4 procAnim__Q53scn4step5enemy11whispyapple14StateBoundNearFv + .byte4 procMove__Q53scn4step5enemy11whispyapple14StateBoundNearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11whispyapple14StateBoundNearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256802 diff --git a/asm/src/StateCall.s b/asm/src/StateCall.s index c6e49edb..ab3a6b95 100644 --- a/asm/src/StateCall.s +++ b/asm/src/StateCall.s @@ -536,12 +536,12 @@ lbl_8024DFD4: __vt__Q53scn4step4boss6dubior9StateCall: .4byte 0 .4byte 0 - .4byte 0x8024D89C ;# ptr - .4byte 0x8024D8A0 ;# ptr - .4byte 0x8024D95C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024D9B0 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6dubior9StateCallFv + .byte4 procAnim__Q53scn4step4boss6dubior9StateCallFv + .byte4 procMove__Q53scn4step4boss6dubior9StateCallFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6dubior9StateCallFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256053 diff --git a/asm/src/StateCallback.s b/asm/src/StateCallback.s index 5d46049d..45ce8c98 100644 --- a/asm/src/StateCallback.s +++ b/asm/src/StateCallback.s @@ -376,37 +376,37 @@ __dt__Q43scn4step6weapon13StateCallbackFv: __vt__Q43scn4step4boss13StateCallback: .4byte 0 .4byte 0 - .4byte 0x8022BF84 ;# ptr - .4byte 0x80234580 ;# ptr + .byte4 __dt__Q43scn4step4boss13StateCallbackFv + .byte4 onStateChanged__Q43scn4step4boss13StateCallbackFRCQ24util13IStateChanger .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy13StateCallback __vt__Q43scn4step5enemy13StateCallback: .4byte 0 .4byte 0 - .4byte 0x80286D4C ;# ptr - .4byte 0x8028DE5C ;# ptr + .byte4 __dt__Q43scn4step5enemy13StateCallbackFv + .byte4 onStateChanged__Q43scn4step5enemy13StateCallbackFRCQ24util13IStateChanger .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero13StateCallback __vt__Q43scn4step4hero13StateCallback: .4byte 0 .4byte 0 - .4byte 0x8033C720 - .4byte 0x8035558C + .byte4 __dt__Q43scn4step4hero13StateCallbackFv + .byte4 onStateChanged__Q43scn4step4hero13StateCallbackFRCQ24util13IStateChanger .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4item13StateCallback __vt__Q43scn4step4item13StateCallback: .4byte 0 .4byte 0 - .4byte 0x803C1C90 - .4byte 0x803C5278 + .byte4 __dt__Q43scn4step4item13StateCallbackFv + .byte4 onStateChanged__Q43scn4step4item13StateCallbackFRCQ24util13IStateChanger .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon13StateCallback __vt__Q43scn4step6weapon13StateCallback: .4byte 0 .4byte 0 - .4byte 0x803D8A00 - .4byte 0x803D89D8 + .byte4 __dt__Q43scn4step6weapon13StateCallbackFv + .byte4 onStateChanged__Q43scn4step6weapon13StateCallbackFRCQ24util13IStateChanger diff --git a/asm/src/StateCapture.s b/asm/src/StateCapture.s index 5bd6d371..830b02cb 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 - .4byte 0x8025A434 ;# ptr - .4byte 0x8025A414 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1Fv + .byte4 create__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1Fv .global __vt__Q53scn4step4boss13watergalboros12StateCapture __vt__Q53scn4step4boss13watergalboros12StateCapture: .4byte 0 .4byte 0 - .4byte 0x8025A244 ;# ptr - .4byte 0x8025A248 ;# ptr - .4byte 0x8025A40C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025A410 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss13watergalboros12StateCaptureFv + .byte4 procAnim__Q53scn4step4boss13watergalboros12StateCaptureFv + .byte4 procMove__Q53scn4step4boss13watergalboros12StateCaptureFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss13watergalboros12StateCaptureFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateChewing$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateChewing$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8025CC0C ;# ptr - .4byte 0x8025CBF0 ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateChewing$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateChewing$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6whispy12StateCapture __vt__Q53scn4step4boss6whispy12StateCapture: .4byte 0 .4byte 0 - .4byte 0x8025CB4C ;# ptr - .4byte 0x8025CB50 ;# ptr - .4byte 0x8025CBE8 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025CBEC ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy12StateCaptureFv + .byte4 procAnim__Q53scn4step4boss6whispy12StateCaptureFv + .byte4 procMove__Q53scn4step4boss6whispy12StateCaptureFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy12StateCaptureFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateCaptureAttack.s b/asm/src/StateCaptureAttack.s index 0eceb585..3f28a145 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 - .4byte 0x8025A810 ;# ptr - .4byte 0x8025A7F4 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateCapture$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateCapture$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss13watergalboros18StateCaptureAttack __vt__Q53scn4step4boss13watergalboros18StateCaptureAttack: .4byte 0 .4byte 0 - .4byte 0x8025A4A4 ;# ptr - .4byte 0x8025A51C ;# ptr - .4byte 0x8025A740 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80234500 ;# ptr - .4byte 0x8025A744 ;# ptr + .byte4 __dt__Q53scn4step4boss13watergalboros18StateCaptureAttackFv + .byte4 procAnim__Q53scn4step4boss13watergalboros18StateCaptureAttackFv + .byte4 procMove__Q53scn4step4boss13watergalboros18StateCaptureAttackFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q43scn4step4boss9StateBaseFv + .byte4 procObjCollReact__Q53scn4step4boss13watergalboros18StateCaptureAttackFv diff --git a/asm/src/StateCapturedFighter.s b/asm/src/StateCapturedFighter.s index 9491a5f8..cd5c8dfb 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 - .4byte 0x802A4634 ;# ptr - .4byte 0x802A45EC ;# ptr + .byte4 __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateThrownFighter$$4PQ43scn4step5enemy5Enemy$$4Ux$$1Fv + .byte4 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 - .4byte 0x802A4630 ;# ptr - .4byte 0x802A4610 ;# ptr + .byte4 __dt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage23StateDeadCaptureRelease$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv + .byte4 create__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage23StateDeadCaptureRelease$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv .global __vt__Q53scn4step5enemy8captured20StateCapturedFighter __vt__Q53scn4step5enemy8captured20StateCapturedFighter: .4byte 0 .4byte 0 - .4byte 0x802A42FC ;# ptr - .4byte 0x802A4370 ;# ptr - .4byte 0x802A4578 ;# ptr - .4byte 0x802A457C ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8captured20StateCapturedFighterFv + .byte4 procAnim__Q53scn4step5enemy8captured20StateCapturedFighterFv + .byte4 procMove__Q53scn4step5enemy8captured20StateCapturedFighterFv + .byte4 procConstraint__Q53scn4step5enemy8captured20StateCapturedFighterFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255917 diff --git a/asm/src/StateCapturedParasol.s b/asm/src/StateCapturedParasol.s index 58508167..da8a45fd 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 - .4byte 0x802A4BB0 ;# ptr - .4byte 0x802A4B88 ;# ptr + .byte4 __dt__Q24util109StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateParasolRelease$$4PQ43scn4step5enemy5Enemy$$4Ux$$4Ul$$1Fv + .byte4 create__Q24util109StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateParasolRelease$$4PQ43scn4step5enemy5Enemy$$4Ux$$4Ul$$1Fv .global __vt__Q53scn4step5enemy8captured20StateCapturedParasol __vt__Q53scn4step5enemy8captured20StateCapturedParasol: .4byte 0 .4byte 0 - .4byte 0x802A4730 ;# ptr - .4byte 0x802A47B8 ;# ptr - .4byte 0x802A4AE0 ;# ptr - .4byte 0x802A4AE4 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8captured20StateCapturedParasolFv + .byte4 procAnim__Q53scn4step5enemy8captured20StateCapturedParasolFv + .byte4 procMove__Q53scn4step5enemy8captured20StateCapturedParasolFv + .byte4 procConstraint__Q53scn4step5enemy8captured20StateCapturedParasolFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256967 diff --git a/asm/src/StateCapturedWaterGalborosEat.s b/asm/src/StateCapturedWaterGalborosEat.s index 77061158..9e8ec909 100644 --- a/asm/src/StateCapturedWaterGalborosEat.s +++ b/asm/src/StateCapturedWaterGalborosEat.s @@ -215,13 +215,13 @@ procFixPos__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv: __vt__Q53scn4step4hero8captured29StateCapturedWaterGalborosEat: .4byte 0 .4byte 0 - .4byte 0x80383F7C - .4byte 0x80384044 - .4byte 0x80384048 - .4byte 0x8035550C - .4byte 0x80384124 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv + .byte4 procAnim__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv + .byte4 procMove__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateCapturedWaterGalborosVomit.s b/asm/src/StateCapturedWaterGalborosVomit.s index f96c2950..442fd3ec 100644 --- a/asm/src/StateCapturedWaterGalborosVomit.s +++ b/asm/src/StateCapturedWaterGalborosVomit.s @@ -317,13 +317,13 @@ lbl_803845A0: __vt__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit: .4byte 0 .4byte 0 - .4byte 0x803842C0 - .4byte 0x803843A0 - .4byte 0x80384414 - .4byte 0x8035550C - .4byte 0x8038446C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomitFv + .byte4 procAnim__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomitFv + .byte4 procMove__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomitFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomitFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateCapturedWhip.s b/asm/src/StateCapturedWhip.s index 1d95e79e..b0c3f145 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 - .4byte 0x802A5064 ;# ptr - .4byte 0x802A5048 ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageCapture$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageCapture$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8captured17StateCapturedWhip __vt__Q53scn4step5enemy8captured17StateCapturedWhip: .4byte 0 .4byte 0 - .4byte 0x802A4C9C ;# ptr - .4byte 0x802A4D10 ;# ptr - .4byte 0x802A501C ;# ptr - .4byte 0x802A5020 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8captured17StateCapturedWhipFv + .byte4 procAnim__Q53scn4step5enemy8captured17StateCapturedWhipFv + .byte4 procMove__Q53scn4step5enemy8captured17StateCapturedWhipFv + .byte4 procConstraint__Q53scn4step5enemy8captured17StateCapturedWhipFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256311 diff --git a/asm/src/StateCapturedWhispyChewing.s b/asm/src/StateCapturedWhispyChewing.s index ddc468f5..89ba8376 100644 --- a/asm/src/StateCapturedWhispyChewing.s +++ b/asm/src/StateCapturedWhispyChewing.s @@ -116,11 +116,11 @@ procFixPos__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv: __vt__Q53scn4step4hero8captured26StateCapturedWhispyChewing: .4byte 0 .4byte 0 - .4byte 0x80384684 - .4byte 0x80384724 - .4byte 0x80384728 - .4byte 0x8035550C - .4byte 0x8038472C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv + .byte4 procAnim__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv + .byte4 procMove__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateCapturedWhispyRelease.s b/asm/src/StateCapturedWhispyRelease.s index 30982eba..118b1055 100644 --- a/asm/src/StateCapturedWhispyRelease.s +++ b/asm/src/StateCapturedWhispyRelease.s @@ -181,11 +181,11 @@ procFixPos__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv: __vt__Q53scn4step4hero8captured26StateCapturedWhispyRelease: .4byte 0 .4byte 0 - .4byte 0x80384800 - .4byte 0x8038487C - .4byte 0x8038494C - .4byte 0x8035550C - .4byte 0x803849A0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv + .byte4 procAnim__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv + .byte4 procMove__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateCapturedWhispyVacuum.s b/asm/src/StateCapturedWhispyVacuum.s index 84747dc8..ac7b4c30 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 - .4byte 0x80384D50 - .4byte 0x80384D34 + .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyChewing$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyChewing$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero8captured25StateCapturedWhispyVacuum __vt__Q53scn4step4hero8captured25StateCapturedWhispyVacuum: .4byte 0 .4byte 0 - .4byte 0x80384B3C - .4byte 0x80384BB8 - .4byte 0x80384C70 - .4byte 0x8035550C - .4byte 0x80384D30 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero8captured25StateCapturedWhispyVacuumFv + .byte4 procAnim__Q53scn4step4hero8captured25StateCapturedWhispyVacuumFv + .byte4 procMove__Q53scn4step4hero8captured25StateCapturedWhispyVacuumFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero8captured25StateCapturedWhispyVacuumFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateCapturedWhispyVomit.s b/asm/src/StateCapturedWhispyVomit.s index 2f0b8e22..8189a3a8 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 - .4byte 0x803850C0 - .4byte 0x803850A4 + .byte4 __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWhispyVomitBound$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWhispyVomitBound$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero8captured24StateCapturedWhispyVomit __vt__Q53scn4step4hero8captured24StateCapturedWhispyVomit: .4byte 0 .4byte 0 - .4byte 0x80384E20 - .4byte 0x80384E9C - .4byte 0x80384F00 - .4byte 0x8035550C - .4byte 0x80384F54 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero8captured24StateCapturedWhispyVomitFv + .byte4 procAnim__Q53scn4step4hero8captured24StateCapturedWhispyVomitFv + .byte4 procMove__Q53scn4step4hero8captured24StateCapturedWhispyVomitFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero8captured24StateCapturedWhispyVomitFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateCapturedWhispyVomitBound.s b/asm/src/StateCapturedWhispyVomitBound.s index b01febbc..1aa1cb7e 100644 --- a/asm/src/StateCapturedWhispyVomitBound.s +++ b/asm/src/StateCapturedWhispyVomitBound.s @@ -379,13 +379,13 @@ lbl_80385614: __vt__Q53scn4step4hero8captured29StateCapturedWhispyVomitBound: .4byte 0 .4byte 0 - .4byte 0x80385208 - .4byte 0x803852C8 - .4byte 0x80385434 - .4byte 0x8035550C - .4byte 0x8038548C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero8captured29StateCapturedWhispyVomitBoundFv + .byte4 procAnim__Q53scn4step4hero8captured29StateCapturedWhispyVomitBoundFv + .byte4 procMove__Q53scn4step4hero8captured29StateCapturedWhispyVomitBoundFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero8captured29StateCapturedWhispyVomitBoundFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateCapturedWhispyVomitSoft.s b/asm/src/StateCapturedWhispyVomitSoft.s index b21b2225..61086ee6 100644 --- a/asm/src/StateCapturedWhispyVomitSoft.s +++ b/asm/src/StateCapturedWhispyVomitSoft.s @@ -309,13 +309,13 @@ lbl_80385A8C: __vt__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft: .4byte 0 .4byte 0 - .4byte 0x80385720 - .4byte 0x803857F4 - .4byte 0x803858E0 - .4byte 0x8035550C - .4byte 0x80385938 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoftFv + .byte4 procAnim__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoftFv + .byte4 procMove__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoftFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoftFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateCatch.s b/asm/src/StateCatch.s index c7e5fb88..b6d37edb 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 - .4byte 0x802616B8 ;# ptr - .4byte 0x80261738 ;# ptr - .4byte 0x80261854 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80261858 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9zankibble10StateCatchFv + .byte4 procAnim__Q53scn4step4boss9zankibble10StateCatchFv + .byte4 procMove__Q53scn4step4boss9zankibble10StateCatchFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9zankibble10StateCatchFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9sirkibble10StateCatch __vt__Q53scn4step5enemy9sirkibble10StateCatch: .4byte 0 .4byte 0 - .4byte 0x802E19B0 ;# ptr - .4byte 0x802E19B4 ;# ptr - .4byte 0x802E1A4C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E1A50 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9sirkibble10StateCatchFv + .byte4 procAnim__Q53scn4step5enemy9sirkibble10StateCatchFv + .byte4 procMove__Q53scn4step5enemy9sirkibble10StateCatchFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9sirkibble10StateCatchFv + .byte4 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 - .4byte 0x8039BF04 - .4byte 0x8039BEA0 + .byte4 __dt__Q24util96StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateThrow$$4PQ43scn4step4hero4Hero$$4b$$4b$$1Fv + .byte4 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 - .4byte 0x8039BF00 - .4byte 0x8039BEC4 + .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedFighter$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedFighter$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateCatch$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateCatch$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8039BEFC - .4byte 0x8039BEE0 + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateCatch$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateCatch$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7fighter10StateCatch __vt__Q53scn4step4hero7fighter10StateCatch: .4byte 0 .4byte 0 - .4byte 0x8039B920 - .4byte 0x8039B9BC - .4byte 0x8039BC0C - .4byte 0x8039BC10 - .4byte 0x8039BD68 - .4byte 0x8039BE9C - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter10StateCatchFv + .byte4 procAnim__Q53scn4step4hero7fighter10StateCatchFv + .byte4 procMove__Q53scn4step4hero7fighter10StateCatchFv + .byte4 procConstraint__Q53scn4step4hero7fighter10StateCatchFv + .byte4 procFixPos__Q53scn4step4hero7fighter10StateCatchFv + .byte4 procObjCollReact__Q53scn4step4hero7fighter10StateCatchFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateChallengeBattleLose.s b/asm/src/StateChallengeBattleLose.s index 406148e7..c624fbca 100644 --- a/asm/src/StateChallengeBattleLose.s +++ b/asm/src/StateChallengeBattleLose.s @@ -1075,13 +1075,13 @@ lbl_80379E84: __vt__Q53scn4step4hero7gimmick24StateChallengeBattleLose: .4byte 0 .4byte 0 - .4byte 0x80378FFC - .4byte 0x803790EC - .4byte 0x80379808 - .4byte 0x8035550C - .4byte 0x8037999C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick24StateChallengeBattleLoseFv + .byte4 procAnim__Q53scn4step4hero7gimmick24StateChallengeBattleLoseFv + .byte4 procMove__Q53scn4step4hero7gimmick24StateChallengeBattleLoseFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick24StateChallengeBattleLoseFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateChallengeBattleWin.s b/asm/src/StateChallengeBattleWin.s index a11a148e..fbc0bdef 100644 --- a/asm/src/StateChallengeBattleWin.s +++ b/asm/src/StateChallengeBattleWin.s @@ -619,13 +619,13 @@ sceneChange__Q53scn4step4hero7gimmick23StateChallengeBattleWinFv: __vt__Q53scn4step4hero7gimmick23StateChallengeBattleWin: .4byte 0 .4byte 0 - .4byte 0x8037A018 - .4byte 0x8037A0D4 - .4byte 0x8037A1C4 - .4byte 0x8035550C - .4byte 0x8037A1C8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick23StateChallengeBattleWinFv + .byte4 procAnim__Q53scn4step4hero7gimmick23StateChallengeBattleWinFv + .byte4 procMove__Q53scn4step4hero7gimmick23StateChallengeBattleWinFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick23StateChallengeBattleWinFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/StateChallengeBattleWinPre.s b/asm/src/StateChallengeBattleWinPre.s index 55e01fbc..2432f9ad 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 - .4byte 0x8037B4C4 - .4byte 0x8037B480 + .byte4 __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .byte4 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 - .4byte 0x8037B4C0 - .4byte 0x8037B4A0 + .byte4 __dt__Q24util167StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateChallengeBattleWinPre$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero7gimmick26StateChallengeBattleWinPre5Phase$$1Fv + .byte4 create__Q24util167StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateChallengeBattleWinPre$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero7gimmick26StateChallengeBattleWinPre5Phase$$1Fv .global __vt__Q53scn4step4hero7gimmick26StateChallengeBattleWinPre __vt__Q53scn4step4hero7gimmick26StateChallengeBattleWinPre: .4byte 0 .4byte 0 - .4byte 0x8037AD88 - .4byte 0x8037AE40 - .4byte 0x8037B004 - .4byte 0x8035550C - .4byte 0x8037B104 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick26StateChallengeBattleWinPreFv + .byte4 procAnim__Q53scn4step4hero7gimmick26StateChallengeBattleWinPreFv + .byte4 procMove__Q53scn4step4hero7gimmick26StateChallengeBattleWinPreFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick26StateChallengeBattleWinPreFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/StateChallengeConfirm.s b/asm/src/StateChallengeConfirm.s index 2a8c2932..ea9548da 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 - .4byte 0x8037B938 - .4byte 0x8037B914 + .byte4 __dt__Q24util181StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateChallengeConfirm$$4PQ43scn4step4hero4Hero$$4Q33scn4step13ChallengeKind$$4PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$1Fv + .byte4 create__Q24util181StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateChallengeConfirm$$4PQ43scn4step4hero4Hero$$4Q33scn4step13ChallengeKind$$4PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$1Fv .global __vt__Q53scn4step4hero7gimmick21StateChallengeConfirm __vt__Q53scn4step4hero7gimmick21StateChallengeConfirm: .4byte 0 .4byte 0 - .4byte 0x8037B5FC - .4byte 0x8037B6A8 - .4byte 0x8037B858 - .4byte 0x8035550C - .4byte 0x8037B85C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick21StateChallengeConfirmFv + .byte4 procAnim__Q53scn4step4hero7gimmick21StateChallengeConfirmFv + .byte4 procMove__Q53scn4step4hero7gimmick21StateChallengeConfirmFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick21StateChallengeConfirmFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateChallengeIn.s b/asm/src/StateChallengeIn.s index d252eaa4..e96789f4 100644 --- a/asm/src/StateChallengeIn.s +++ b/asm/src/StateChallengeIn.s @@ -597,13 +597,13 @@ lbl_8037C1C0: __vt__Q53scn4step4hero7gimmick16StateChallengeIn: .4byte 0 .4byte 0 - .4byte 0x8037BB84 - .4byte 0x8037BCB4 - .4byte 0x8037BE18 - .4byte 0x8035550C - .4byte 0x8037BEE4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick16StateChallengeInFv + .byte4 procAnim__Q53scn4step4hero7gimmick16StateChallengeInFv + .byte4 procMove__Q53scn4step4hero7gimmick16StateChallengeInFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick16StateChallengeInFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateChange.s b/asm/src/StateChange.s index 77731d76..3d495ac2 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 - .4byte 0x803900D0 - .4byte 0x80390044 + .byte4 __dt__Q24util161StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone19StateFallScrewStart$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .byte4 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 - .4byte 0x803900CC - .4byte 0x80390064 + .byte4 __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateSlip$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .byte4 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 - .4byte 0x803900C8 - .4byte 0x80390084 + .byte4 __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateFall$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .byte4 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 - .4byte 0x803900C4 - .4byte 0x803900A4 + .byte4 __dt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone11StateChange$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .byte4 create__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone11StateChange$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv .global __vt__Q53scn4step4hero5stone11StateChange __vt__Q53scn4step4hero5stone11StateChange: .4byte 0 .4byte 0 - .4byte 0x8038FC84 - .4byte 0x8038FD1C - .4byte 0x8038FF10 - .4byte 0x8035550C - .4byte 0x8038FFD8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5stone11StateChangeFv + .byte4 procAnim__Q53scn4step4hero5stone11StateChangeFv + .byte4 procMove__Q53scn4step4hero5stone11StateChangeFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5stone11StateChangeFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateChangeGrade.s b/asm/src/StateChangeGrade.s index 33f1fe95..c35766a7 100644 --- a/asm/src/StateChangeGrade.s +++ b/asm/src/StateChangeGrade.s @@ -127,11 +127,11 @@ procFixPos__Q53scn4step4hero7gimmick16StateChangeGradeFv: __vt__Q53scn4step4hero7gimmick16StateChangeGrade: .4byte 0 .4byte 0 - .4byte 0x8037C2D4 - .4byte 0x8037C364 - .4byte 0x8037C368 - .4byte 0x8035550C - .4byte 0x8037C36C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick16StateChangeGradeFv + .byte4 procAnim__Q53scn4step4hero7gimmick16StateChangeGradeFv + .byte4 procMove__Q53scn4step4hero7gimmick16StateChangeGradeFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick16StateChangeGradeFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateChanger.s b/asm/src/StateChanger.s index 62980458..224cef9c 100644 --- a/asm/src/StateChanger.s +++ b/asm/src/StateChanger.s @@ -181,5 +181,5 @@ onSetNextStateFactory__Q24util16StateChangerBaseFv: __vt__Q24util16StateChangerBase: .4byte 0 .4byte 0 - .4byte 0x80405D08 + .byte4 __dt__Q24util16StateChangerBaseFv .4byte 0 diff --git a/asm/src/StateCharge.s b/asm/src/StateCharge.s index 6d4deeb4..5bfa9e7b 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 - .4byte 0x8039C660 - .4byte 0x8039C5C0 + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateStamp$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateStamp$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateVulcan$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateVulcan$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8039C65C - .4byte 0x8039C5DC + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateVulcan$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateVulcan$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateDoubleKick$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateDoubleKick$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8039C658 - .4byte 0x8039C5F8 + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateDoubleKick$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateDoubleKick$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateSmash$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateSmash$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8039C654 - .4byte 0x8039C614 + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateSmash$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 - .4byte 0x8039C650 - .4byte 0x8039C5A0 + .byte4 __dt__Q24util128StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter9StateShot$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero7fighter11ChargeLevel$$1Fv + .byte4 create__Q24util128StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter9StateShot$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero7fighter11ChargeLevel$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateCharge$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateCharge$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8039C64C - .4byte 0x8039C630 + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateCharge$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateCharge$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7fighter11StateCharge __vt__Q53scn4step4hero7fighter11StateCharge: .4byte 0 .4byte 0 - .4byte 0x8039C054 - .4byte 0x8039C0F4 - .4byte 0x8039C278 - .4byte 0x8035550C - .4byte 0x8039C2B4 - .4byte 0x8039C2B8 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter11StateChargeFv + .byte4 procAnim__Q53scn4step4hero7fighter11StateChargeFv + .byte4 procMove__Q53scn4step4hero7fighter11StateChargeFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter11StateChargeFv + .byte4 procObjCollReact__Q53scn4step4hero7fighter11StateChargeFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateChargeAttack.s b/asm/src/StateChargeAttack.s index 0a922da0..ba6272ee 100644 --- a/asm/src/StateChargeAttack.s +++ b/asm/src/StateChargeAttack.s @@ -334,12 +334,12 @@ lbl_80253D54: __vt__Q53scn4step4boss8kingsdoo17StateChargeAttack: .4byte 0 .4byte 0 - .4byte 0x802539CC ;# ptr - .4byte 0x802539D0 ;# ptr - .4byte 0x80253A8C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80253AE0 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss8kingsdoo17StateChargeAttackFv + .byte4 procAnim__Q53scn4step4boss8kingsdoo17StateChargeAttackFv + .byte4 procMove__Q53scn4step4boss8kingsdoo17StateChargeAttackFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss8kingsdoo17StateChargeAttackFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256691 diff --git a/asm/src/StateChargeAttackStart.s b/asm/src/StateChargeAttackStart.s index bd2d6c44..5613d1f1 100644 --- a/asm/src/StateChargeAttackStart.s +++ b/asm/src/StateChargeAttackStart.s @@ -56,9 +56,9 @@ procFixPos__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv: __vt__Q53scn4step4boss8kingsdoo22StateChargeAttackStart: .4byte 0 .4byte 0 - .4byte 0x80253E8C ;# ptr - .4byte 0x80253E90 ;# ptr - .4byte 0x80253E94 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80253E98 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv + .byte4 procAnim__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv + .byte4 procMove__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateChase.s b/asm/src/StateChase.s index a5851079..e874ba56 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 - .4byte 0x8029A11C ;# ptr - .4byte 0x80299690 ;# ptr - .4byte 0x80299754 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80299D08 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7blipper10StateChaseFv + .byte4 procAnim__Q53scn4step5enemy7blipper10StateChaseFv + .byte4 procMove__Q53scn4step5enemy7blipper10StateChaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7blipper10StateChaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6degout10StateChase __vt__Q53scn4step5enemy6degout10StateChase: .4byte 0 .4byte 0 - .4byte 0x802ADA54 ;# ptr - .4byte 0x802AD6C0 ;# ptr - .4byte 0x802AD784 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6degout10StateChaseFv + .byte4 procAnim__Q53scn4step5enemy6degout10StateChaseFv + .byte4 procMove__Q53scn4step5enemy6degout10StateChaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802B0290 ;# ptr - .4byte 0x802B0270 ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4elec10StateChase __vt__Q53scn4step5enemy4elec10StateChase: .4byte 0 .4byte 0 - .4byte 0x802B028C ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802AFF5C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy4elec10StateChaseFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy4elec10StateChaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer10StateChase __vt__Q53scn4step5enemy6flamer10StateChase: .4byte 0 .4byte 0 - .4byte 0x802B3478 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802B3014 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B3248 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6flamer10StateChaseFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy6flamer10StateChaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6flamer10StateChaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7mumbies10StateChase __vt__Q53scn4step5enemy7mumbies10StateChase: .4byte 0 .4byte 0 - .4byte 0x802C5270 ;# ptr - .4byte 0x802C5274 ;# ptr - .4byte 0x802C545C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C57B0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7mumbies10StateChaseFv + .byte4 procAnim__Q53scn4step5enemy7mumbies10StateChaseFv + .byte4 procMove__Q53scn4step5enemy7mumbies10StateChaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7mumbies10StateChaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy10StateChase __vt__Q53scn4step5enemy6scarfy10StateChase: .4byte 0 .4byte 0 - .4byte 0x802DA748 ;# ptr - .4byte 0x802DA74C ;# ptr - .4byte 0x802DA770 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6scarfy10StateChaseFv + .byte4 procAnim__Q53scn4step5enemy6scarfy10StateChaseFv + .byte4 procMove__Q53scn4step5enemy6scarfy10StateChaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802DDED4 ;# ptr - .4byte 0x802DDE98 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802DDED0 ;# ptr - .4byte 0x802DDEB4 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5sheld10StateChase __vt__Q53scn4step5enemy5sheld10StateChase: .4byte 0 .4byte 0 - .4byte 0x802DDBC8 ;# ptr - .4byte 0x802DDBCC ;# ptr - .4byte 0x802DDBD0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802DDC40 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5sheld10StateChaseFv + .byte4 procAnim__Q53scn4step5enemy5sheld10StateChaseFv + .byte4 procMove__Q53scn4step5enemy5sheld10StateChaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5sheld10StateChaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257807 diff --git a/asm/src/StateChewing.s b/asm/src/StateChewing.s index fd54e14a..0d4f5dbd 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 - .4byte 0x8025CE6C ;# ptr - .4byte 0x8025CE4C ;# ptr + .byte4 __dt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1Fv + .byte4 create__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1Fv .global __vt__Q53scn4step4boss6whispy12StateChewing __vt__Q53scn4step4boss6whispy12StateChewing: .4byte 0 .4byte 0 - .4byte 0x8025CC80 ;# ptr - .4byte 0x8025CC84 ;# ptr - .4byte 0x8025CE44 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025CE48 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy12StateChewingFv + .byte4 procAnim__Q53scn4step4boss6whispy12StateChewingFv + .byte4 procMove__Q53scn4step4boss6whispy12StateChewingFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy12StateChewingFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateCircle.s b/asm/src/StateCircle.s index 90ce07e2..5516fef1 100644 --- a/asm/src/StateCircle.s +++ b/asm/src/StateCircle.s @@ -386,12 +386,12 @@ lbl_802F309C: __vt__Q53scn4step5enemy15zankibblecutter11StateCircle: .4byte 0 .4byte 0 - .4byte 0x802F2CDC ;# ptr - .4byte 0x802F2CE0 ;# ptr - .4byte 0x802F2CE4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802F2E0C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy15zankibblecutter11StateCircleFv + .byte4 procAnim__Q53scn4step5enemy15zankibblecutter11StateCircleFv + .byte4 procMove__Q53scn4step5enemy15zankibblecutter11StateCircleFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy15zankibblecutter11StateCircleFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257063 diff --git a/asm/src/StateClearDance.s b/asm/src/StateClearDance.s index f9c7f419..63eab079 100644 --- a/asm/src/StateClearDance.s +++ b/asm/src/StateClearDance.s @@ -207,13 +207,13 @@ procFixPos__Q53scn4step4hero6common15StateClearDanceFv: __vt__Q53scn4step4hero6common15StateClearDance: .4byte 0 .4byte 0 - .4byte 0x8035F464 - .4byte 0x8035F468 - .4byte 0x8035F59C - .4byte 0x8035550C - .4byte 0x8035F5A0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common15StateClearDanceFv + .byte4 procAnim__Q53scn4step4hero6common15StateClearDanceFv + .byte4 procMove__Q53scn4step4hero6common15StateClearDanceFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common15StateClearDanceFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateClearDanceFall.s b/asm/src/StateClearDanceFall.s index ab3da677..416d50b0 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 - .4byte 0x8035F924 - .4byte 0x8035F904 + .byte4 __dt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceWalk$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .byte4 create__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceWalk$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q53scn4step4hero6common19StateClearDanceFall __vt__Q53scn4step4hero6common19StateClearDanceFall: .4byte 0 .4byte 0 - .4byte 0x8035F6D4 - .4byte 0x8035F770 - .4byte 0x8035F7A8 - .4byte 0x8035550C - .4byte 0x8035F7CC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common19StateClearDanceFallFv + .byte4 procAnim__Q53scn4step4hero6common19StateClearDanceFallFv + .byte4 procMove__Q53scn4step4hero6common19StateClearDanceFallFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common19StateClearDanceFallFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateClearDancePre.s b/asm/src/StateClearDancePre.s index 5e9b060c..5b85b8f9 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 - .4byte 0x8035FBA8 - .4byte 0x8035FB8C + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateClearDance$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateClearDance$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common18StateClearDancePre __vt__Q53scn4step4hero6common18StateClearDancePre: .4byte 0 .4byte 0 - .4byte 0x8035FA84 - .4byte 0x8035FA88 - .4byte 0x8035FB84 - .4byte 0x8035550C - .4byte 0x8035FB88 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common18StateClearDancePreFv + .byte4 procAnim__Q53scn4step4hero6common18StateClearDancePreFv + .byte4 procMove__Q53scn4step4hero6common18StateClearDancePreFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common18StateClearDancePreFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateClearDanceWalk.s b/asm/src/StateClearDanceWalk.s index 0b9ea562..08f495a6 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 - .4byte 0x8035FFAC - .4byte 0x8035FF8C + .byte4 __dt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common18StateClearDancePre$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .byte4 create__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common18StateClearDancePre$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q53scn4step4hero6common19StateClearDanceWalk __vt__Q53scn4step4hero6common19StateClearDanceWalk: .4byte 0 .4byte 0 - .4byte 0x8035FD3C - .4byte 0x8035FD40 - .4byte 0x8035FD78 - .4byte 0x8035550C - .4byte 0x8035FE6C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common19StateClearDanceWalkFv + .byte4 procAnim__Q53scn4step4hero6common19StateClearDanceWalkFv + .byte4 procMove__Q53scn4step4hero6common19StateClearDanceWalkFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common19StateClearDanceWalkFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateCliffAttack.s b/asm/src/StateCliffAttack.s index 22fb11d4..0eb34801 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 - .4byte 0x802D3F54 ;# ptr - .4byte 0x802D3F38 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateCliffJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateCliffJump$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5rocky16StateCliffAttack __vt__Q53scn4step5enemy5rocky16StateCliffAttack: .4byte 0 .4byte 0 - .4byte 0x802D3E74 ;# ptr - .4byte 0x802D3E78 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D3F34 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5rocky16StateCliffAttackFv + .byte4 procAnim__Q53scn4step5enemy5rocky16StateCliffAttackFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5rocky16StateCliffAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255825 diff --git a/asm/src/StateCliffJump.s b/asm/src/StateCliffJump.s index f65e62e6..88e2cd96 100644 --- a/asm/src/StateCliffJump.s +++ b/asm/src/StateCliffJump.s @@ -222,9 +222,9 @@ procFixPos__Q53scn4step5enemy5rocky14StateCliffJumpFv: __vt__Q53scn4step5enemy5rocky14StateCliffJump: .4byte 0 .4byte 0 - .4byte 0x802D4050 ;# ptr - .4byte 0x802D4054 ;# ptr - .4byte 0x802D41D0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D4250 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5rocky14StateCliffJumpFv + .byte4 procAnim__Q53scn4step5enemy5rocky14StateCliffJumpFv + .byte4 procMove__Q53scn4step5enemy5rocky14StateCliffJumpFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5rocky14StateCliffJumpFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateCombinationAttack.s b/asm/src/StateCombinationAttack.s index ea05e407..ab31ded8 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 - .4byte 0x80370E38 - .4byte 0x80370E18 + .byte4 __dt__Q24util113StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference22StateCombinationAttack$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .byte4 create__Q24util113StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference22StateCombinationAttack$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q53scn4step4hero12interference22StateCombinationAttack __vt__Q53scn4step4hero12interference22StateCombinationAttack: .4byte 0 .4byte 0 - .4byte 0x803700C8 - .4byte 0x80370144 - .4byte 0x803701B4 - .4byte 0x8035550C - .4byte 0x803701B8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero12interference22StateCombinationAttackFv + .byte4 procAnim__Q53scn4step4hero12interference22StateCombinationAttackFv + .byte4 procMove__Q53scn4step4hero12interference22StateCombinationAttackFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero12interference22StateCombinationAttackFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateCopy.s b/asm/src/StateCopy.s index 688d20ab..2cfa1588 100644 --- a/asm/src/StateCopy.s +++ b/asm/src/StateCopy.s @@ -612,13 +612,13 @@ procFixPos__Q53scn4step4hero6common9StateCopyFv: __vt__Q53scn4step4hero6common9StateCopy: .4byte 0 .4byte 0 - .4byte 0x80360498 - .4byte 0x80360778 - .4byte 0x8036087C - .4byte 0x8035550C - .4byte 0x80360880 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common9StateCopyFv + .byte4 procAnim__Q53scn4step4hero6common9StateCopyFv + .byte4 procMove__Q53scn4step4hero6common9StateCopyFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common9StateCopyFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateCopyPre.s b/asm/src/StateCopyPre.s index 132ab8e0..92bcbd7a 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 - .4byte 0x80360C9C - .4byte 0x80360C7C + .byte4 __dt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateCopy$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv + .byte4 create__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateCopy$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv .global __vt__Q53scn4step4hero6common12StateCopyPre __vt__Q53scn4step4hero6common12StateCopyPre: .4byte 0 .4byte 0 - .4byte 0x8036097C - .4byte 0x80360A8C - .4byte 0x80355508 - .4byte 0x8035550C - .4byte 0x80355510 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common12StateCopyPreFv + .byte4 procAnim__Q53scn4step4hero6common12StateCopyPreFv + .byte4 procMove__Q43scn4step4hero9StateBaseFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q43scn4step4hero9StateBaseFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateCreditMove.s b/asm/src/StateCreditMove.s index 33d2faf6..6ef978ad 100644 --- a/asm/src/StateCreditMove.s +++ b/asm/src/StateCreditMove.s @@ -181,12 +181,12 @@ __dt__Q53scn4step5enemy6chilly15StateCreditMoveFv: __vt__Q53scn4step5enemy6chilly15StateCreditMove: .4byte 0 .4byte 0 - .4byte 0x802A6880 ;# ptr - .4byte 0x802A66D4 ;# ptr - .4byte 0x802A6760 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A687C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6chilly15StateCreditMoveFv + .byte4 procAnim__Q53scn4step5enemy6chilly15StateCreditMoveFv + .byte4 procMove__Q53scn4step5enemy6chilly15StateCreditMoveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6chilly15StateCreditMoveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256565 diff --git a/asm/src/StateCreditWalk.s b/asm/src/StateCreditWalk.s index b98b0ee4..5f257de5 100644 --- a/asm/src/StateCreditWalk.s +++ b/asm/src/StateCreditWalk.s @@ -402,24 +402,24 @@ __dt__Q53scn4step5enemy11broomhatter15StateCreditWalkFv: __vt__Q53scn4step5enemy6common15StateCreditWalk: .4byte 0 .4byte 0 - .4byte 0x802919B8 ;# ptr - .4byte 0x80291A14 ;# ptr - .4byte 0x80291A18 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80291A70 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common15StateCreditWalkFv + .byte4 procAnim__Q53scn4step5enemy6common15StateCreditWalkFv + .byte4 procMove__Q53scn4step5enemy6common15StateCreditWalkFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common15StateCreditWalkFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter15StateCreditWalk __vt__Q53scn4step5enemy11broomhatter15StateCreditWalk: .4byte 0 .4byte 0 - .4byte 0x802A131C ;# ptr - .4byte 0x802A1100 ;# ptr - .4byte 0x802A12D0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A1318 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11broomhatter15StateCreditWalkFv + .byte4 procAnim__Q53scn4step5enemy11broomhatter15StateCreditWalkFv + .byte4 procMove__Q53scn4step5enemy11broomhatter15StateCreditWalkFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11broomhatter15StateCreditWalkFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256619 diff --git a/asm/src/StateCutFall.s b/asm/src/StateCutFall.s index 5c71815e..0a4334df 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 - .4byte 0x802A7CCC ;# ptr - .4byte 0x802A7CB0 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como15StateCutLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como15StateCutLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4como12StateCutFall __vt__Q53scn4step5enemy4como12StateCutFall: .4byte 0 .4byte 0 - .4byte 0x802A7B38 ;# ptr - .4byte 0x802A7BB0 ;# ptr - .4byte 0x802A7BB4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A7C0C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy4como12StateCutFallFv + .byte4 procAnim__Q53scn4step5enemy4como12StateCutFallFv + .byte4 procMove__Q53scn4step5enemy4como12StateCutFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4como12StateCutFallFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256668 diff --git a/asm/src/StateCutLanding.s b/asm/src/StateCutLanding.s index b1e96797..2aaa5ec8 100644 --- a/asm/src/StateCutLanding.s +++ b/asm/src/StateCutLanding.s @@ -125,12 +125,12 @@ procFixPos__Q53scn4step5enemy4como15StateCutLandingFv: __vt__Q53scn4step5enemy4como15StateCutLanding: .4byte 0 .4byte 0 - .4byte 0x802A7E04 ;# ptr - .4byte 0x802A7E08 ;# ptr - .4byte 0x802A7E64 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A7E68 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy4como15StateCutLandingFv + .byte4 procAnim__Q53scn4step5enemy4como15StateCutLandingFv + .byte4 procMove__Q53scn4step5enemy4como15StateCutLandingFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4como15StateCutLandingFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256544 diff --git a/asm/src/StateDamage.s b/asm/src/StateDamage.s index 413701d6..f3ad939d 100644 --- a/asm/src/StateDamage.s +++ b/asm/src/StateDamage.s @@ -168,9 +168,9 @@ __dt__Q53scn4step5enemy8rollball11StateDamageFv: __vt__Q53scn4step5enemy8rollball11StateDamage: .4byte 0 .4byte 0 - .4byte 0x802D69E8 ;# ptr - .4byte 0x802D69A0 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8rollball11StateDamageFv + .byte4 procAnim__Q53scn4step5enemy8rollball11StateDamageFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateDamageCapture.s b/asm/src/StateDamageCapture.s index 8b4f1668..79d8ead7 100644 --- a/asm/src/StateDamageCapture.s +++ b/asm/src/StateDamageCapture.s @@ -464,12 +464,12 @@ lbl_802A94A8: __vt__Q53scn4step5enemy6damage18StateDamageCapture: .4byte 0 .4byte 0 - .4byte 0x802A8F44 ;# ptr - .4byte 0x802A8FE8 ;# ptr - .4byte 0x802A9214 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A9294 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6damage18StateDamageCaptureFv + .byte4 procAnim__Q53scn4step5enemy6damage18StateDamageCaptureFv + .byte4 procMove__Q53scn4step5enemy6damage18StateDamageCaptureFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6damage18StateDamageCaptureFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257027 diff --git a/asm/src/StateDamageExtreme.s b/asm/src/StateDamageExtreme.s index 69fc0b54..32492a76 100644 --- a/asm/src/StateDamageExtreme.s +++ b/asm/src/StateDamageExtreme.s @@ -365,12 +365,12 @@ lbl_802A99C4: __vt__Q53scn4step5enemy6damage18StateDamageExtreme: .4byte 0 .4byte 0 - .4byte 0x802A9600 ;# ptr - .4byte 0x802A96A4 ;# ptr - .4byte 0x802A9884 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A98C0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6damage18StateDamageExtremeFv + .byte4 procAnim__Q53scn4step5enemy6damage18StateDamageExtremeFv + .byte4 procMove__Q53scn4step5enemy6damage18StateDamageExtremeFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6damage18StateDamageExtremeFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256978 diff --git a/asm/src/StateDamageL.s b/asm/src/StateDamageL.s index b7ae666d..5bfbe96a 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 - .4byte 0x8025CFC8 ;# ptr - .4byte 0x8025CFAC ;# ptr + .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateGrow$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateGrow$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6whispy12StateDamageL __vt__Q53scn4step4boss6whispy12StateDamageL: .4byte 0 .4byte 0 - .4byte 0x8025CF08 ;# ptr - .4byte 0x8025CF0C ;# ptr - .4byte 0x8025CFA4 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025CFA8 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy12StateDamageLFv + .byte4 procAnim__Q53scn4step4boss6whispy12StateDamageLFv + .byte4 procMove__Q53scn4step4boss6whispy12StateDamageLFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy12StateDamageLFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateDamageNormal.s b/asm/src/StateDamageNormal.s index b94aa168..095ed3f4 100644 --- a/asm/src/StateDamageNormal.s +++ b/asm/src/StateDamageNormal.s @@ -289,12 +289,12 @@ procFixPos__Q53scn4step5enemy6damage17StateDamageNormalFv: __vt__Q53scn4step5enemy6damage17StateDamageNormal: .4byte 0 .4byte 0 - .4byte 0x802A9C58 ;# ptr - .4byte 0x802A9CDC ;# ptr - .4byte 0x802A9D8C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A9DB0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6damage17StateDamageNormalFv + .byte4 procAnim__Q53scn4step5enemy6damage17StateDamageNormalFv + .byte4 procMove__Q53scn4step5enemy6damage17StateDamageNormalFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6damage17StateDamageNormalFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256803 diff --git a/asm/src/StateDamageWingToss.s b/asm/src/StateDamageWingToss.s index dccf8a7a..4cb3974a 100644 --- a/asm/src/StateDamageWingToss.s +++ b/asm/src/StateDamageWingToss.s @@ -317,12 +317,12 @@ lbl_802AA21C: __vt__Q53scn4step5enemy6damage19StateDamageWingToss: .4byte 0 .4byte 0 - .4byte 0x802A9EDC ;# ptr - .4byte 0x802A9F60 ;# ptr - .4byte 0x802AA068 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802AA0D4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6damage19StateDamageWingTossFv + .byte4 procAnim__Q53scn4step5enemy6damage19StateDamageWingTossFv + .byte4 procMove__Q53scn4step5enemy6damage19StateDamageWingTossFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6damage19StateDamageWingTossFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256724 diff --git a/asm/src/StateDash.s b/asm/src/StateDash.s index d5fe6bb5..72abbd67 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 - .4byte 0x8023FE9C ;# ptr - .4byte 0x8023FE5C ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateDash$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateDash$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8023FE98 ;# ptr - .4byte 0x8023FE7C ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateDash$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateDash$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster9StateDash __vt__Q53scn4step4boss15challengemaster9StateDash: .4byte 0 .4byte 0 - .4byte 0x8023FC34 ;# ptr - .4byte 0x8023FCD8 ;# ptr - .4byte 0x8023FE28 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8023FE58 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster9StateDashFv + .byte4 procAnim__Q53scn4step4boss15challengemaster9StateDashFv + .byte4 procMove__Q53scn4step4boss15challengemaster9StateDashFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster9StateDashFv + .byte4 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 - .4byte 0x8024559C ;# ptr - .4byte 0x80245550 ;# ptr + .byte4 __dt__Q24util139StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateDashWallHit$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1Fv + .byte4 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 - .4byte 0x80245598 ;# ptr - .4byte 0x80245574 ;# ptr + .byte4 __dt__Q24util135StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common12StateDashEnd$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1Fv + .byte4 create__Q24util135StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common12StateDashEnd$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1Fv .global __vt__Q53scn4step4boss6common9StateDash __vt__Q53scn4step4boss6common9StateDash: .4byte 0 .4byte 0 - .4byte 0x80244FCC ;# ptr - .4byte 0x8024504C ;# ptr - .4byte 0x802452A4 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024530C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6common9StateDashFv + .byte4 procAnim__Q53scn4step4boss6common9StateDashFv + .byte4 procMove__Q53scn4step4boss6common9StateDashFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common9StateDashFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateDashWallHit$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateDashWallHit$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8024E3E0 ;# ptr - .4byte 0x8024E3C4 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateDashWallHit$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateDashWallHit$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6dubior9StateDash __vt__Q53scn4step4boss6dubior9StateDash: .4byte 0 .4byte 0 - .4byte 0x8024E15C ;# ptr - .4byte 0x8024E1D8 ;# ptr - .4byte 0x8024E244 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024E2FC ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6dubior9StateDashFv + .byte4 procAnim__Q53scn4step4boss6dubior9StateDashFv + .byte4 procMove__Q53scn4step4boss6dubior9StateDashFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6dubior9StateDashFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld9StateDash __vt__Q53scn4step5enemy5sheld9StateDash: .4byte 0 .4byte 0 - .4byte 0x802DE014 ;# ptr - .4byte 0x802DE018 ;# ptr - .4byte 0x802DE01C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802DE08C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5sheld9StateDashFv + .byte4 procAnim__Q53scn4step5enemy5sheld9StateDashFv + .byte4 procMove__Q53scn4step5enemy5sheld9StateDashFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5sheld9StateDashFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256936 diff --git a/asm/src/StateDashAttack.s b/asm/src/StateDashAttack.s index ff918da0..7ed090ce 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 - .4byte 0x80397DBC - .4byte 0x80397D40 + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing22StateDashAttackWallHit$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing22StateDashAttackWallHit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDiveAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDiveAttack$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80397DB8 - .4byte 0x80397D5C + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDiveAttack$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDiveAttack$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateUnderAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateUnderAttack$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80397DB4 - .4byte 0x80397D78 + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateUnderAttack$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateUnderAttack$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDashAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDashAttack$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80397DB0 - .4byte 0x80397D94 + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDashAttack$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateDashAttack$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4wing15StateDashAttack __vt__Q53scn4step4hero4wing15StateDashAttack: .4byte 0 .4byte 0 - .4byte 0x803973C8 - .4byte 0x803974C8 - .4byte 0x80397668 - .4byte 0x8035550C - .4byte 0x803976D8 - .4byte 0x803976DC - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4wing15StateDashAttackFv + .byte4 procAnim__Q53scn4step4hero4wing15StateDashAttackFv + .byte4 procMove__Q53scn4step4hero4wing15StateDashAttackFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4wing15StateDashAttackFv + .byte4 procObjCollReact__Q53scn4step4hero4wing15StateDashAttackFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateDashAttackWallHit.s b/asm/src/StateDashAttackWallHit.s index b5c95971..39a9a883 100644 --- a/asm/src/StateDashAttackWallHit.s +++ b/asm/src/StateDashAttackWallHit.s @@ -196,13 +196,13 @@ procFixPos__Q53scn4step4hero4wing22StateDashAttackWallHitFv: __vt__Q53scn4step4hero4wing22StateDashAttackWallHit: .4byte 0 .4byte 0 - .4byte 0x80397ED4 - .4byte 0x80397F78 - .4byte 0x80397F7C - .4byte 0x8035550C - .4byte 0x80398068 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4wing22StateDashAttackWallHitFv + .byte4 procAnim__Q53scn4step4hero4wing22StateDashAttackWallHitFv + .byte4 procMove__Q53scn4step4hero4wing22StateDashAttackWallHitFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4wing22StateDashAttackWallHitFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateDashEnd.s b/asm/src/StateDashEnd.s index 3bda3b85..b11a7e35 100644 --- a/asm/src/StateDashEnd.s +++ b/asm/src/StateDashEnd.s @@ -68,9 +68,9 @@ procFixPos__Q53scn4step4boss6common12StateDashEndFv: __vt__Q53scn4step4boss6common12StateDashEnd: .4byte 0 .4byte 0 - .4byte 0x80245700 ;# ptr - .4byte 0x80245704 ;# ptr - .4byte 0x80245708 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80245744 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6common12StateDashEndFv + .byte4 procAnim__Q53scn4step4boss6common12StateDashEndFv + .byte4 procMove__Q53scn4step4boss6common12StateDashEndFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common12StateDashEndFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateDashWallHit.s b/asm/src/StateDashWallHit.s index 79dbd1ff..e4949521 100644 --- a/asm/src/StateDashWallHit.s +++ b/asm/src/StateDashWallHit.s @@ -408,24 +408,24 @@ procFixPos__Q53scn4step4boss6dubior16StateDashWallHitFv: __vt__Q53scn4step4boss6common16StateDashWallHit: .4byte 0 .4byte 0 - .4byte 0x8024592C ;# ptr - .4byte 0x80245930 ;# ptr - .4byte 0x80245934 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80245970 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6common16StateDashWallHitFv + .byte4 procAnim__Q53scn4step4boss6common16StateDashWallHitFv + .byte4 procMove__Q53scn4step4boss6common16StateDashWallHitFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common16StateDashWallHitFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior16StateDashWallHit __vt__Q53scn4step4boss6dubior16StateDashWallHit: .4byte 0 .4byte 0 - .4byte 0x8024E5C0 ;# ptr - .4byte 0x8024E5C4 ;# ptr - .4byte 0x8024E5C8 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024E5CC ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6dubior16StateDashWallHitFv + .byte4 procAnim__Q53scn4step4boss6dubior16StateDashWallHitFv + .byte4 procMove__Q53scn4step4boss6dubior16StateDashWallHitFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6dubior16StateDashWallHitFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255953 diff --git a/asm/src/StateDead.s b/asm/src/StateDead.s index 0c7af63e..250cba6f 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 - .4byte 0x80245EAC ;# ptr - .4byte 0x80245F34 ;# ptr - .4byte 0x80245FA4 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802460DC ;# ptr - .4byte 0x802462F0 ;# ptr + .byte4 __dt__Q53scn4step4boss6common9StateDeadFv + .byte4 procAnim__Q53scn4step4boss6common9StateDeadFv + .byte4 procMove__Q53scn4step4boss6common9StateDeadFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common9StateDeadFv + .byte4 procObjCollReact__Q53scn4step4boss6common9StateDeadFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy9StateDead __vt__Q53scn4step4boss6whispy9StateDead: .4byte 0 .4byte 0 - .4byte 0x8025D05C ;# ptr - .4byte 0x8025D060 ;# ptr - .4byte 0x8025D3CC ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025D3D0 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy9StateDeadFv + .byte4 procAnim__Q53scn4step4boss6whispy9StateDeadFv + .byte4 procMove__Q53scn4step4boss6whispy9StateDeadFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy9StateDeadFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateLogout$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateLogout$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80361E28 - .4byte 0x80361E0C + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateLogout$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateLogout$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common9StateDead __vt__Q53scn4step4hero6common9StateDead: .4byte 0 .4byte 0 - .4byte 0x80360E48 - .4byte 0x80360EE8 - .4byte 0x803616A0 - .4byte 0x8035550C - .4byte 0x803616A4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common9StateDeadFv + .byte4 procAnim__Q53scn4step4hero6common9StateDeadFv + .byte4 procMove__Q53scn4step4hero6common9StateDeadFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common9StateDeadFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/StateDeadCaptureRelease.s b/asm/src/StateDeadCaptureRelease.s index a5f7df1b..0cbcab59 100644 --- a/asm/src/StateDeadCaptureRelease.s +++ b/asm/src/StateDeadCaptureRelease.s @@ -212,12 +212,12 @@ lbl_802AA50C: __vt__Q53scn4step5enemy6damage23StateDeadCaptureRelease: .4byte 0 .4byte 0 - .4byte 0x802AA470 ;# ptr - .4byte 0x802AA474 ;# ptr - .4byte 0x802AA484 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802AA4C0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6damage23StateDeadCaptureReleaseFv + .byte4 procAnim__Q53scn4step5enemy6damage23StateDeadCaptureReleaseFv + .byte4 procMove__Q53scn4step5enemy6damage23StateDeadCaptureReleaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6damage23StateDeadCaptureReleaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256713 diff --git a/asm/src/StateDeadExtreme.s b/asm/src/StateDeadExtreme.s index fe5a2c7d..62656175 100644 --- a/asm/src/StateDeadExtreme.s +++ b/asm/src/StateDeadExtreme.s @@ -333,12 +333,12 @@ lbl_802AA9A0: __vt__Q53scn4step5enemy6damage16StateDeadExtreme: .4byte 0 .4byte 0 - .4byte 0x802AA690 ;# ptr - .4byte 0x802AA734 ;# ptr - .4byte 0x802AA944 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802AA948 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6damage16StateDeadExtremeFv + .byte4 procAnim__Q53scn4step5enemy6damage16StateDeadExtremeFv + .byte4 procMove__Q53scn4step5enemy6damage16StateDeadExtremeFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6damage16StateDeadExtremeFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257029 diff --git a/asm/src/StateDeadInWater.s b/asm/src/StateDeadInWater.s index 3519bae1..3bb44ca1 100644 --- a/asm/src/StateDeadInWater.s +++ b/asm/src/StateDeadInWater.s @@ -406,12 +406,12 @@ lbl_802AAE7C: __vt__Q53scn4step5enemy6damage16StateDeadInWater: .4byte 0 .4byte 0 - .4byte 0x802AABC8 ;# ptr - .4byte 0x802AABCC ;# ptr - .4byte 0x802AADCC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802AAE14 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6damage16StateDeadInWaterFv + .byte4 procAnim__Q53scn4step5enemy6damage16StateDeadInWaterFv + .byte4 procMove__Q53scn4step5enemy6damage16StateDeadInWaterFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6damage16StateDeadInWaterFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256983 diff --git a/asm/src/StateDeadSuper.s b/asm/src/StateDeadSuper.s index 6eeb7b47..fa3d3009 100644 --- a/asm/src/StateDeadSuper.s +++ b/asm/src/StateDeadSuper.s @@ -475,12 +475,12 @@ lbl_802AB5FC: __vt__Q53scn4step5enemy6damage14StateDeadSuper: .4byte 0 .4byte 0 - .4byte 0x802AB0E8 ;# ptr - .4byte 0x802AB18C ;# ptr - .4byte 0x802AB39C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802AB40C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6damage14StateDeadSuperFv + .byte4 procAnim__Q53scn4step5enemy6damage14StateDeadSuperFv + .byte4 procMove__Q53scn4step5enemy6damage14StateDeadSuperFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6damage14StateDeadSuperFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257110 diff --git a/asm/src/StateDemo.s b/asm/src/StateDemo.s index bb45df93..6911e97d 100644 --- a/asm/src/StateDemo.s +++ b/asm/src/StateDemo.s @@ -226,11 +226,11 @@ lbl_80362130: __vt__Q53scn4step4hero6common9StateDemo: .4byte 0 .4byte 0 - .4byte 0x80361F20 - .4byte 0x80361FF4 - .4byte 0x80362048 - .4byte 0x8035550C - .4byte 0x8036204C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common9StateDemoFv + .byte4 procAnim__Q53scn4step4hero6common9StateDemoFv + .byte4 procMove__Q53scn4step4hero6common9StateDemoFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common9StateDemoFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateDive.s b/asm/src/StateDive.s index 4098c7dd..fe333b29 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 - .4byte 0x8029A56C ;# ptr - .4byte 0x8029A1F0 ;# ptr - .4byte 0x8029A240 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029A320 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7blipper9StateDiveFv + .byte4 procAnim__Q53scn4step5enemy7blipper9StateDiveFv + .byte4 procMove__Q53scn4step5enemy7blipper9StateDiveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7blipper9StateDiveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13StateDiveWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13StateDiveWait$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802A8104 ;# ptr - .4byte 0x802A80E8 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13StateDiveWait$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13StateDiveWait$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4como9StateDive __vt__Q53scn4step5enemy4como9StateDive: .4byte 0 .4byte 0 - .4byte 0x802A7ED8 ;# ptr - .4byte 0x802A7EDC ;# ptr - .4byte 0x802A7EE0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A8074 ;# ptr - .4byte 0x802A80E4 ;# ptr + .byte4 __dt__Q53scn4step5enemy4como9StateDiveFv + .byte4 procAnim__Q53scn4step5enemy4como9StateDiveFv + .byte4 procMove__Q53scn4step5enemy4como9StateDiveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4como9StateDiveFv + .byte4 procObjCollReact__Q53scn4step5enemy4como9StateDiveFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255836 diff --git a/asm/src/StateDiveAttack.s b/asm/src/StateDiveAttack.s index 1ab3b33e..3fc936b1 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 - .4byte 0x803988D8 - .4byte 0x803988B8 + .byte4 __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero4wing23StateUnderAttackLanding$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .byte4 create__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero4wing23StateUnderAttackLanding$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero4wing15StateDiveAttack __vt__Q53scn4step4hero4wing15StateDiveAttack: .4byte 0 .4byte 0 - .4byte 0x803981F4 - .4byte 0x803982F4 - .4byte 0x80398390 - .4byte 0x8035550C - .4byte 0x803984D8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4wing15StateDiveAttackFv + .byte4 procAnim__Q53scn4step4hero4wing15StateDiveAttackFv + .byte4 procMove__Q53scn4step4hero4wing15StateDiveAttackFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4wing15StateDiveAttackFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateDiveWait.s b/asm/src/StateDiveWait.s index e6352ef4..47a56a63 100644 --- a/asm/src/StateDiveWait.s +++ b/asm/src/StateDiveWait.s @@ -155,9 +155,9 @@ __dt__Q53scn4step5enemy4como13StateDiveWaitFv: __vt__Q53scn4step5enemy4como13StateDiveWait: .4byte 0 .4byte 0 - .4byte 0x802A82E8 ;# ptr - .4byte 0x802A814C ;# ptr - .4byte 0x802A81EC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A81F0 ;# ptr - .4byte 0x802A81F4 ;# ptr + .byte4 __dt__Q53scn4step5enemy4como13StateDiveWaitFv + .byte4 procAnim__Q53scn4step5enemy4como13StateDiveWaitFv + .byte4 procMove__Q53scn4step5enemy4como13StateDiveWaitFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4como13StateDiveWaitFv + .byte4 procObjCollReact__Q53scn4step5enemy4como13StateDiveWaitFv diff --git a/asm/src/StateDoubleAttack.s b/asm/src/StateDoubleAttack.s index a226b9ca..8304a427 100644 --- a/asm/src/StateDoubleAttack.s +++ b/asm/src/StateDoubleAttack.s @@ -175,12 +175,12 @@ procFixPos__Q53scn4step5enemy11bladeknight17StateDoubleAttackFv: __vt__Q53scn4step5enemy11bladeknight17StateDoubleAttack: .4byte 0 .4byte 0 - .4byte 0x80297950 ;# ptr - .4byte 0x80297954 ;# ptr - .4byte 0x80297A40 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80297B34 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11bladeknight17StateDoubleAttackFv + .byte4 procAnim__Q53scn4step5enemy11bladeknight17StateDoubleAttackFv + .byte4 procMove__Q53scn4step5enemy11bladeknight17StateDoubleAttackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11bladeknight17StateDoubleAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255847 diff --git a/asm/src/StateDoubleKick.s b/asm/src/StateDoubleKick.s index b9ab8549..44833ab8 100644 --- a/asm/src/StateDoubleKick.s +++ b/asm/src/StateDoubleKick.s @@ -311,13 +311,13 @@ createWeapon__Q53scn4step4hero7fighter15StateDoubleKickFv: __vt__Q53scn4step4hero7fighter15StateDoubleKick: .4byte 0 .4byte 0 - .4byte 0x8039C710 - .4byte 0x8039C78C - .4byte 0x8039C824 - .4byte 0x8035550C - .4byte 0x8039C828 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter15StateDoubleKickFv + .byte4 procAnim__Q53scn4step4hero7fighter15StateDoubleKickFv + .byte4 procMove__Q53scn4step4hero7fighter15StateDoubleKickFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter15StateDoubleKickFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateDrink.s b/asm/src/StateDrink.s index fe7e1c9b..f5a50de9 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 - .4byte 0x80362808 - .4byte 0x803627AC + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateMixPre$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateMixPre$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80362804 - .4byte 0x803627C8 + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateCopyPre$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateDrink$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateDrink$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80362800 - .4byte 0x803627E4 + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateDrink$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateDrink$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common10StateDrink __vt__Q53scn4step4hero6common10StateDrink: .4byte 0 .4byte 0 - .4byte 0x803624EC - .4byte 0x803625C0 - .4byte 0x80362740 - .4byte 0x8035550C - .4byte 0x80362744 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common10StateDrinkFv + .byte4 procAnim__Q53scn4step4hero6common10StateDrinkFv + .byte4 procMove__Q53scn4step4hero6common10StateDrinkFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common10StateDrinkFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateEat.s b/asm/src/StateEat.s index 96baa9bc..8521d0ff 100644 --- a/asm/src/StateEat.s +++ b/asm/src/StateEat.s @@ -123,11 +123,11 @@ procFixPos__Q53scn4step4hero6common8StateEatFv: __vt__Q53scn4step4hero6common8StateEat: .4byte 0 .4byte 0 - .4byte 0x803628C0 - .4byte 0x803628C4 - .4byte 0x8036298C - .4byte 0x8035550C - .4byte 0x80362990 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common8StateEatFv + .byte4 procAnim__Q53scn4step4hero6common8StateEatFv + .byte4 procMove__Q53scn4step4hero6common8StateEatFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common8StateEatFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateEaten.s b/asm/src/StateEaten.s index 1bf045a4..2d566aee 100644 --- a/asm/src/StateEaten.s +++ b/asm/src/StateEaten.s @@ -565,13 +565,13 @@ endState__Q53scn4step4hero12interference10StateEatenFv: __vt__Q53scn4step4hero12interference10StateEaten: .4byte 0 .4byte 0 - .4byte 0x80371088 - .4byte 0x80371274 - .4byte 0x803713A8 - .4byte 0x803713AC - .4byte 0x80355510 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero12interference10StateEatenFv + .byte4 procAnim__Q53scn4step4hero12interference10StateEatenFv + .byte4 procMove__Q53scn4step4hero12interference10StateEatenFv + .byte4 procConstraint__Q53scn4step4hero12interference10StateEatenFv + .byte4 procFixPos__Q43scn4step4hero9StateBaseFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateEnd.s b/asm/src/StateEnd.s index 679e4f76..9210a8cf 100644 --- a/asm/src/StateEnd.s +++ b/asm/src/StateEnd.s @@ -147,13 +147,13 @@ procFixPos__Q53scn4step4hero5stone8StateEndFv: __vt__Q53scn4step4hero5stone8StateEnd: .4byte 0 .4byte 0 - .4byte 0x8039021C - .4byte 0x803902A8 - .4byte 0x803902AC - .4byte 0x8035550C - .4byte 0x803902B0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5stone8StateEndFv + .byte4 procAnim__Q53scn4step4hero5stone8StateEndFv + .byte4 procMove__Q53scn4step4hero5stone8StateEndFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5stone8StateEndFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateEndure.s b/asm/src/StateEndure.s index b949a165..4c3c4159 100644 --- a/asm/src/StateEndure.s +++ b/asm/src/StateEndure.s @@ -136,9 +136,9 @@ lbl_802C5A24: __vt__Q53scn4step5enemy7mumbies11StateEndure: .4byte 0 .4byte 0 - .4byte 0x802C5980 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802C5984 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C5988 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7mumbies11StateEndureFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy7mumbies11StateEndureFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7mumbies11StateEndureFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateEnterChallengeDoor.s b/asm/src/StateEnterChallengeDoor.s index 32f77d9d..6e8dc565 100644 --- a/asm/src/StateEnterChallengeDoor.s +++ b/asm/src/StateEnterChallengeDoor.s @@ -279,13 +279,13 @@ lbl_8037C730: __vt__Q53scn4step4hero7gimmick23StateEnterChallengeDoor: .4byte 0 .4byte 0 - .4byte 0x8037C418 - .4byte 0x8037C484 - .4byte 0x8037C4F0 - .4byte 0x8035550C - .4byte 0x8037C5A0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick23StateEnterChallengeDoorFv + .byte4 procAnim__Q53scn4step4hero7gimmick23StateEnterChallengeDoorFv + .byte4 procMove__Q53scn4step4hero7gimmick23StateEnterChallengeDoorFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick23StateEnterChallengeDoorFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateEnterChallengeDoorPre.s b/asm/src/StateEnterChallengeDoorPre.s index d2485e1b..c2b91b8f 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 - .4byte 0x8037CF78 - .4byte 0x8037CF58 + .byte4 __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick13challengedoor6Result$$1Fv + .byte4 create__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick13challengedoor6Result$$1Fv .global __vt__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre __vt__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre: .4byte 0 .4byte 0 - .4byte 0x8037CA5C - .4byte 0x8037CAE0 - .4byte 0x8037CB78 - .4byte 0x8035550C - .4byte 0x8037CB7C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPreFv + .byte4 procAnim__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPreFv + .byte4 procMove__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPreFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPreFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateEnterDoor.s b/asm/src/StateEnterDoor.s index 47a0661b..f5354278 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 - .4byte 0x8037DB10 - .4byte 0x8037DAE8 + .byte4 __dt__Q24util132StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateEnterDoor$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick4door6Result$$4b$$4b$$1Fv + .byte4 create__Q24util132StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateEnterDoor$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick4door6Result$$4b$$4b$$1Fv .global __vt__Q53scn4step4hero7gimmick14StateEnterDoor __vt__Q53scn4step4hero7gimmick14StateEnterDoor: .4byte 0 .4byte 0 - .4byte 0x8037D2D0 - .4byte 0x8037D360 - .4byte 0x8037D5CC - .4byte 0x8035550C - .4byte 0x8037D684 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick14StateEnterDoorFv + .byte4 procAnim__Q53scn4step4hero7gimmick14StateEnterDoorFv + .byte4 procMove__Q53scn4step4hero7gimmick14StateEnterDoorFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick14StateEnterDoorFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateEnterMahoroa.s b/asm/src/StateEnterMahoroa.s index 46636a60..bb46b0d0 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 - .4byte 0x8037F554 - .4byte 0x8037F538 + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateLeaveMahoroa$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateLeaveMahoroa$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7gimmick17StateEnterMahoroa __vt__Q53scn4step4hero7gimmick17StateEnterMahoroa: .4byte 0 .4byte 0 - .4byte 0x8037DF6C - .4byte 0x8037E054 - .4byte 0x8037E248 - .4byte 0x8035550C - .4byte 0x8037E5B0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick17StateEnterMahoroaFv + .byte4 procAnim__Q53scn4step4hero7gimmick17StateEnterMahoroaFv + .byte4 procMove__Q53scn4step4hero7gimmick17StateEnterMahoroaFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick17StateEnterMahoroaFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateEscape.s b/asm/src/StateEscape.s index acc1f5f6..50a004d6 100644 --- a/asm/src/StateEscape.s +++ b/asm/src/StateEscape.s @@ -356,24 +356,24 @@ lbl_802DE524: __vt__Q53scn4step5enemy6scarfy11StateEscape: .4byte 0 .4byte 0 - .4byte 0x802DAE04 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802DAC64 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6scarfy11StateEscapeFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy6scarfy11StateEscapeFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld11StateEscape __vt__Q53scn4step5enemy5sheld11StateEscape: .4byte 0 .4byte 0 - .4byte 0x802DE394 ;# ptr - .4byte 0x802DE398 ;# ptr - .4byte 0x802DE39C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802DE40C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5sheld11StateEscapeFv + .byte4 procAnim__Q53scn4step5enemy5sheld11StateEscapeFv + .byte4 procMove__Q53scn4step5enemy5sheld11StateEscapeFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5sheld11StateEscapeFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257269 diff --git a/asm/src/StateExplosion.s b/asm/src/StateExplosion.s index 1a926dbf..47b12975 100644 --- a/asm/src/StateExplosion.s +++ b/asm/src/StateExplosion.s @@ -1010,72 +1010,72 @@ __dt__Q53scn4step6weapon12dededehammer14StateExplosionFv: __vt__Q53scn4step6weapon12hammerhammer14StateExplosion: .4byte 0 .4byte 0 - .4byte 0x803E5784 - .4byte 0x803E5598 - .4byte 0x803E5778 - .4byte 0x803D895C - .4byte 0x803E577C - .4byte 0x803E5780 + .byte4 __dt__Q53scn4step6weapon12hammerhammer14StateExplosionFv + .byte4 procAnim__Q53scn4step6weapon12hammerhammer14StateExplosionFv + .byte4 procMove__Q53scn4step6weapon12hammerhammer14StateExplosionFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon12hammerhammer14StateExplosionFv + .byte4 procObjCollReact__Q53scn4step6weapon12hammerhammer14StateExplosionFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon16fightersmashshot14StateExplosion __vt__Q53scn4step6weapon16fightersmashshot14StateExplosion: .4byte 0 .4byte 0 - .4byte 0x803E6358 - .4byte 0x803E635C - .4byte 0x803E63B4 - .4byte 0x803D895C - .4byte 0x803E63B8 - .4byte 0x803E63BC + .byte4 __dt__Q53scn4step6weapon16fightersmashshot14StateExplosionFv + .byte4 procAnim__Q53scn4step6weapon16fightersmashshot14StateExplosionFv + .byte4 procMove__Q53scn4step6weapon16fightersmashshot14StateExplosionFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon16fightersmashshot14StateExplosionFv + .byte4 procObjCollReact__Q53scn4step6weapon16fightersmashshot14StateExplosionFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon15fighterkickshot14StateExplosion __vt__Q53scn4step6weapon15fighterkickshot14StateExplosion: .4byte 0 .4byte 0 - .4byte 0x803E6770 - .4byte 0x803E6774 - .4byte 0x803E67CC - .4byte 0x803D895C - .4byte 0x803E67D0 - .4byte 0x803E67D4 + .byte4 __dt__Q53scn4step6weapon15fighterkickshot14StateExplosionFv + .byte4 procAnim__Q53scn4step6weapon15fighterkickshot14StateExplosionFv + .byte4 procMove__Q53scn4step6weapon15fighterkickshot14StateExplosionFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon15fighterkickshot14StateExplosionFv + .byte4 procObjCollReact__Q53scn4step6weapon15fighterkickshot14StateExplosionFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon16fighterhadoushot14StateExplosion __vt__Q53scn4step6weapon16fighterhadoushot14StateExplosion: .4byte 0 .4byte 0 - .4byte 0x803E6D40 - .4byte 0x803E6D44 - .4byte 0x803E6E34 - .4byte 0x803D895C - .4byte 0x803E6E38 - .4byte 0x803E6E3C + .byte4 __dt__Q53scn4step6weapon16fighterhadoushot14StateExplosionFv + .byte4 procAnim__Q53scn4step6weapon16fighterhadoushot14StateExplosionFv + .byte4 procMove__Q53scn4step6weapon16fighterhadoushot14StateExplosionFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon16fighterhadoushot14StateExplosionFv + .byte4 procObjCollReact__Q53scn4step6weapon16fighterhadoushot14StateExplosionFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon23combinationdededebomber14StateExplosion __vt__Q53scn4step6weapon23combinationdededebomber14StateExplosion: .4byte 0 .4byte 0 - .4byte 0x803EB974 - .4byte 0x803EB978 - .4byte 0x803EB9D0 - .4byte 0x803D895C - .4byte 0x803EB9D4 - .4byte 0x803EB9D8 + .byte4 __dt__Q53scn4step6weapon23combinationdededebomber14StateExplosionFv + .byte4 procAnim__Q53scn4step6weapon23combinationdededebomber14StateExplosionFv + .byte4 procMove__Q53scn4step6weapon23combinationdededebomber14StateExplosionFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon23combinationdededebomber14StateExplosionFv + .byte4 procObjCollReact__Q53scn4step6weapon23combinationdededebomber14StateExplosionFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12dededehammer14StateExplosion __vt__Q53scn4step6weapon12dededehammer14StateExplosion: .4byte 0 .4byte 0 - .4byte 0x803ECBD0 - .4byte 0x803EC9E4 - .4byte 0x803ECBC4 - .4byte 0x803D895C - .4byte 0x803ECBC8 - .4byte 0x803ECBCC + .byte4 __dt__Q53scn4step6weapon12dededehammer14StateExplosionFv + .byte4 procAnim__Q53scn4step6weapon12dededehammer14StateExplosionFv + .byte4 procMove__Q53scn4step6weapon12dededehammer14StateExplosionFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon12dededehammer14StateExplosionFv + .byte4 procObjCollReact__Q53scn4step6weapon12dededehammer14StateExplosionFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256495 diff --git a/asm/src/StateExtreme.s b/asm/src/StateExtreme.s index 5d2cd037..93e12a73 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 - .4byte 0x8037601C - .4byte 0x80375FF8 + .byte4 __dt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateFaint$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .byte4 create__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateFaint$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q53scn4step4hero6damage12StateExtreme __vt__Q53scn4step4hero6damage12StateExtreme: .4byte 0 .4byte 0 - .4byte 0x80375BC4 - .4byte 0x80375C70 - .4byte 0x80375E00 - .4byte 0x8035550C - .4byte 0x80375E68 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6damage12StateExtremeFv + .byte4 procAnim__Q53scn4step4hero6damage12StateExtremeFv + .byte4 procMove__Q53scn4step4hero6damage12StateExtremeFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6damage12StateExtremeFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateFaceChange.s b/asm/src/StateFaceChange.s index 848cb674..ca78c7cb 100644 --- a/asm/src/StateFaceChange.s +++ b/asm/src/StateFaceChange.s @@ -248,9 +248,9 @@ lbl_802DB160: __vt__Q53scn4step5enemy6scarfy15StateFaceChange: .4byte 0 .4byte 0 - .4byte 0x802DAE88 ;# ptr - .4byte 0x802DAE8C ;# ptr - .4byte 0x802DB044 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6scarfy15StateFaceChangeFv + .byte4 procAnim__Q53scn4step5enemy6scarfy15StateFaceChangeFv + .byte4 procMove__Q53scn4step5enemy6scarfy15StateFaceChangeFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateFaint.s b/asm/src/StateFaint.s index c4973918..8f577ac6 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 - .4byte 0x80362C50 - .4byte 0x80362C30 + .byte4 __dt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateWakeUp$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .byte4 create__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateWakeUp$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero6common10StateFaint __vt__Q53scn4step4hero6common10StateFaint: .4byte 0 .4byte 0 - .4byte 0x80362A44 - .4byte 0x80362AE0 - .4byte 0x80362B90 - .4byte 0x8035550C - .4byte 0x80362B94 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common10StateFaintFv + .byte4 procAnim__Q53scn4step4hero6common10StateFaintFv + .byte4 procMove__Q53scn4step4hero6common10StateFaintFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common10StateFaintFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateFall.s b/asm/src/StateFall.s index 71279f30..126df122 100644 --- a/asm/src/StateFall.s +++ b/asm/src/StateFall.s @@ -3422,223 +3422,223 @@ lbl_803C7B58: __vt__Q53scn4step4boss6common9StateFall: .4byte 0 .4byte 0 - .4byte 0x802465E4 ;# ptr - .4byte 0x802465E8 ;# ptr - .4byte 0x802465EC ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80246664 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6common9StateFallFv + .byte4 procAnim__Q53scn4step4boss6common9StateFallFv + .byte4 procMove__Q53scn4step4boss6common9StateFallFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common9StateFallFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x80291C74 ;# ptr - .4byte 0x80291C58 ;# ptr + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6common9StateFall __vt__Q53scn4step5enemy6common9StateFall: .4byte 0 .4byte 0 - .4byte 0x80291AD4 ;# ptr - .4byte 0x80291AD8 ;# ptr - .4byte 0x80291ADC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80291BA4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common9StateFallFv + .byte4 procAnim__Q53scn4step5enemy6common9StateFallFv + .byte4 procMove__Q53scn4step5enemy6common9StateFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common9StateFallFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper9StateFall __vt__Q53scn4step5enemy7blipper9StateFall: .4byte 0 .4byte 0 - .4byte 0x8029A73C ;# ptr - .4byte 0x8029A5E8 ;# ptr - .4byte 0x8029A638 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029A698 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7blipper9StateFallFv + .byte4 procAnim__Q53scn4step5enemy7blipper9StateFallFv + .byte4 procMove__Q53scn4step5enemy7blipper9StateFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7blipper9StateFallFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu9StateFall __vt__Q53scn4step5enemy4kabu9StateFall: .4byte 0 .4byte 0 - .4byte 0x802BCF38 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802BCF3C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802BCFC0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy4kabu9StateFallFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy4kabu9StateFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4kabu9StateFallFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C3B38 ;# ptr - .4byte 0x802C3B18 ;# ptr + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6leafan9StateFall __vt__Q53scn4step5enemy6leafan9StateFall: .4byte 0 .4byte 0 - .4byte 0x802C3B34 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802C3A08 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C3A74 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6leafan9StateFallFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy6leafan9StateFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6leafan9StateFallFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12StateStopAir$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12StateStopAir$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C83A8 ;# ptr - .4byte 0x802C838C ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12StateStopAir$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12StateStopAir$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5nruff9StateFall __vt__Q53scn4step5enemy5nruff9StateFall: .4byte 0 .4byte 0 - .4byte 0x802C7FD4 ;# ptr - .4byte 0x802C8054 ;# ptr - .4byte 0x802C80BC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C8128 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5nruff9StateFallFv + .byte4 procAnim__Q53scn4step5enemy5nruff9StateFallFv + .byte4 procMove__Q53scn4step5enemy5nruff9StateFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5nruff9StateFallFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802CC89C ;# ptr - .4byte 0x802CC87C ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10parasoldee9StateFall __vt__Q53scn4step5enemy10parasoldee9StateFall: .4byte 0 .4byte 0 - .4byte 0x802CC898 ;# ptr - .4byte 0x802CC71C ;# ptr - .4byte 0x802CC720 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802CC7B0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10parasoldee9StateFallFv + .byte4 procAnim__Q53scn4step5enemy10parasoldee9StateFallFv + .byte4 procMove__Q53scn4step5enemy10parasoldee9StateFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10parasoldee9StateFallFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802CE6A8 ;# ptr - .4byte 0x802CE688 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10parasoldoo9StateFall __vt__Q53scn4step5enemy10parasoldoo9StateFall: .4byte 0 .4byte 0 - .4byte 0x802CE6A4 ;# ptr - .4byte 0x802CE564 ;# ptr - .4byte 0x802CE568 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802CE5D4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10parasoldoo9StateFallFv + .byte4 procAnim__Q53scn4step5enemy10parasoldoo9StateFallFv + .byte4 procMove__Q53scn4step5enemy10parasoldoo9StateFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10parasoldoo9StateFallFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802D45F4 ;# ptr - .4byte 0x802D45D8 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5rocky9StateFall __vt__Q53scn4step5enemy5rocky9StateFall: .4byte 0 .4byte 0 - .4byte 0x802D4408 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802D4484 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D4534 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5rocky9StateFallFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy5rocky9StateFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5rocky9StateFallFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld9StateFall __vt__Q53scn4step5enemy5sheld9StateFall: .4byte 0 .4byte 0 - .4byte 0x802DE610 ;# ptr - .4byte 0x802DE614 ;# ptr - .4byte 0x802DE618 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802DE684 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5sheld9StateFallFv + .byte4 procAnim__Q53scn4step5enemy5sheld9StateFallFv + .byte4 procMove__Q53scn4step5enemy5sheld9StateFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5sheld9StateFallFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound9StateFall __vt__Q53scn4step5enemy11sisterbound9StateFall: .4byte 0 .4byte 0 - .4byte 0x802E2C68 ;# ptr - .4byte 0x802E2C6C ;# ptr - .4byte 0x802E2CFC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E2DA8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11sisterbound9StateFallFv + .byte4 procAnim__Q53scn4step5enemy11sisterbound9StateFallFv + .byte4 procMove__Q53scn4step5enemy11sisterbound9StateFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11sisterbound9StateFallFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802EB510 ;# ptr - .4byte 0x802EB4F4 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9tsukikage9StateFall __vt__Q53scn4step5enemy9tsukikage9StateFall: .4byte 0 .4byte 0 - .4byte 0x802EB3D0 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802EB3D4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EB440 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9tsukikage9StateFallFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy9tsukikage9StateFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9tsukikage9StateFallFv + .byte4 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 - .4byte 0x802F2210 ;# ptr - .4byte 0x802F21EC ;# ptr + .byte4 __dt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound1$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1Fv + .byte4 create__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound1$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1Fv .global __vt__Q53scn4step5enemy11whispyapple9StateFall __vt__Q53scn4step5enemy11whispyapple9StateFall: .4byte 0 .4byte 0 - .4byte 0x802F1F7C ;# ptr - .4byte 0x802F1F80 ;# ptr - .4byte 0x802F1F84 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802F2014 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11whispyapple9StateFallFv + .byte4 procAnim__Q53scn4step5enemy11whispyapple9StateFallFv + .byte4 procMove__Q53scn4step5enemy11whispyapple9StateFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11whispyapple9StateFallFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13StatePlancher$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13StatePlancher$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x803631EC - .4byte 0x803631D0 + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13StatePlancher$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13StatePlancher$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common9StateFall __vt__Q53scn4step4hero6common9StateFall: .4byte 0 .4byte 0 - .4byte 0x80362D18 - .4byte 0x80362D94 - .4byte 0x80363068 - .4byte 0x8035550C - .4byte 0x8036306C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common9StateFallFv + .byte4 procAnim__Q53scn4step4hero6common9StateFallFv + .byte4 procMove__Q53scn4step4hero6common9StateFallFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common9StateFallFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 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 - .4byte 0x803907AC - .4byte 0x8039076C + .byte4 __dt__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone12StateLanding$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .byte4 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 - .4byte 0x803907A8 - .4byte 0x8039078C + .byte4 __dt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5stone8StateEnd$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5stone8StateEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5stone9StateFall __vt__Q53scn4step4hero5stone9StateFall: .4byte 0 .4byte 0 - .4byte 0x80390354 - .4byte 0x803903C8 - .4byte 0x80390584 - .4byte 0x8035550C - .4byte 0x803906A4 - .4byte 0x803906A8 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5stone9StateFallFv + .byte4 procAnim__Q53scn4step4hero5stone9StateFallFv + .byte4 procMove__Q53scn4step4hero5stone9StateFallFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5stone9StateFallFv + .byte4 procObjCollReact__Q53scn4step4hero5stone9StateFallFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -3672,10 +3672,10 @@ __vt__Q53scn4step4hero5stone9StateFall: __vt__Q53scn4step4item5state9StateFall: .4byte 0 .4byte 0 - .4byte 0x803C795C - .4byte 0x803C79E4 - .4byte 0x803C79EC - .4byte 0x803C7A60 + .byte4 __dt__Q53scn4step4item5state9StateFallFv + .byte4 procAnim__Q53scn4step4item5state9StateFallFv + .byte4 procMove__Q53scn4step4item5state9StateFallFv + .byte4 procFixPos__Q53scn4step4item5state9StateFallFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255720 diff --git a/asm/src/StateFallEnemy.s b/asm/src/StateFallEnemy.s index 68a42ee5..67b9de5c 100644 --- a/asm/src/StateFallEnemy.s +++ b/asm/src/StateFallEnemy.s @@ -243,9 +243,9 @@ lbl_8025D7B0: __vt__Q53scn4step4boss6whispy14StateFallEnemy: .4byte 0 .4byte 0 - .4byte 0x8025D5BC ;# ptr - .4byte 0x8025D63C ;# ptr - .4byte 0x8025D728 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025D72C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy14StateFallEnemyFv + .byte4 procAnim__Q53scn4step4boss6whispy14StateFallEnemyFv + .byte4 procMove__Q53scn4step4boss6whispy14StateFallEnemyFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy14StateFallEnemyFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateFallFeathery.s b/asm/src/StateFallFeathery.s index 24844e89..848acdf0 100644 --- a/asm/src/StateFallFeathery.s +++ b/asm/src/StateFallFeathery.s @@ -142,7 +142,7 @@ lbl_803C7D34: __vt__Q53scn4step4item5state17StateFallFeathery: .4byte 0 .4byte 0 - .4byte 0x803C7BE8 - .4byte 0x803C7C64 - .4byte 0x803C7C68 - .4byte 0x803C7CFC + .byte4 __dt__Q53scn4step4item5state17StateFallFeatheryFv + .byte4 procAnim__Q53scn4step4item5state17StateFallFeatheryFv + .byte4 procMove__Q53scn4step4item5state17StateFallFeatheryFv + .byte4 procFixPos__Q53scn4step4item5state17StateFallFeatheryFv diff --git a/asm/src/StateFallNoDecel.s b/asm/src/StateFallNoDecel.s index d1711e7b..4ba1ac4c 100644 --- a/asm/src/StateFallNoDecel.s +++ b/asm/src/StateFallNoDecel.s @@ -71,12 +71,12 @@ procFixPos__Q53scn4step5enemy6common16StateFallNoDecelFv: __vt__Q53scn4step5enemy6common16StateFallNoDecel: .4byte 0 .4byte 0 - .4byte 0x80291CD8 ;# ptr - .4byte 0x80291CDC ;# ptr - .4byte 0x80291CE0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80291D3C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common16StateFallNoDecelFv + .byte4 procAnim__Q53scn4step5enemy6common16StateFallNoDecelFv + .byte4 procMove__Q53scn4step5enemy6common16StateFallNoDecelFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common16StateFallNoDecelFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255747 diff --git a/asm/src/StateFallScrewStart.s b/asm/src/StateFallScrewStart.s index 36857d35..59b270c4 100644 --- a/asm/src/StateFallScrewStart.s +++ b/asm/src/StateFallScrewStart.s @@ -199,11 +199,11 @@ procFixPos__Q53scn4step4hero5stone19StateFallScrewStartFv: __vt__Q53scn4step4hero5stone19StateFallScrewStart: .4byte 0 .4byte 0 - .4byte 0x8039088C - .4byte 0x80390900 - .4byte 0x803909D8 - .4byte 0x8035550C - .4byte 0x80390A58 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5stone19StateFallScrewStartFv + .byte4 procAnim__Q53scn4step4hero5stone19StateFallScrewStartFv + .byte4 procMove__Q53scn4step4hero5stone19StateFallScrewStartFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5stone19StateFallScrewStartFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateFattyBufferAppearFall.s b/asm/src/StateFattyBufferAppearFall.s index 5e6144a6..4d7e29de 100644 --- a/asm/src/StateFattyBufferAppearFall.s +++ b/asm/src/StateFattyBufferAppearFall.s @@ -188,12 +188,12 @@ procFixPos__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv: __vt__Q53scn4step5enemy7blipper26StateFattyBufferAppearFall: .4byte 0 .4byte 0 - .4byte 0x8029A7E4 ;# ptr - .4byte 0x8029A8B8 ;# ptr - .4byte 0x8029A97C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029A9D4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv + .byte4 procAnim__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv + .byte4 procMove__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256135 diff --git a/asm/src/StateFattyBufferEscapeNear.s b/asm/src/StateFattyBufferEscapeNear.s index 300a19b6..42fa8149 100644 --- a/asm/src/StateFattyBufferEscapeNear.s +++ b/asm/src/StateFattyBufferEscapeNear.s @@ -121,12 +121,12 @@ __dt__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFv: __vt__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear: .4byte 0 .4byte 0 - .4byte 0x8029AB60 ;# ptr - .4byte 0x8029AADC ;# ptr - .4byte 0x8029AAE0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029AAE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFv + .byte4 procAnim__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFv + .byte4 procMove__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256586 diff --git a/asm/src/StateFinalCutterDrop.s b/asm/src/StateFinalCutterDrop.s index 4dfca7d9..bcd91492 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 - .4byte 0x803A1364 - .4byte 0x803A1348 + .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash23StateFinalCutterLanding$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash23StateFinalCutterLanding$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5smash20StateFinalCutterDrop __vt__Q53scn4step4hero5smash20StateFinalCutterDrop: .4byte 0 .4byte 0 - .4byte 0x803A10AC - .4byte 0x803A1128 - .4byte 0x803A112C - .4byte 0x8035550C - .4byte 0x803A1208 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5smash20StateFinalCutterDropFv + .byte4 procAnim__Q53scn4step4hero5smash20StateFinalCutterDropFv + .byte4 procMove__Q53scn4step4hero5smash20StateFinalCutterDropFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5smash20StateFinalCutterDropFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateFinalCutterLanding.s b/asm/src/StateFinalCutterLanding.s index c9a5dc5a..61c5c58d 100644 --- a/asm/src/StateFinalCutterLanding.s +++ b/asm/src/StateFinalCutterLanding.s @@ -227,13 +227,13 @@ procFixPos__Q53scn4step4hero5smash23StateFinalCutterLandingFv: __vt__Q53scn4step4hero5smash23StateFinalCutterLanding: .4byte 0 .4byte 0 - .4byte 0x803A156C - .4byte 0x803A15E8 - .4byte 0x803A168C - .4byte 0x8035550C - .4byte 0x803A1690 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5smash23StateFinalCutterLandingFv + .byte4 procAnim__Q53scn4step4hero5smash23StateFinalCutterLandingFv + .byte4 procMove__Q53scn4step4hero5smash23StateFinalCutterLandingFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5smash23StateFinalCutterLandingFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateFinalCutterPre.s b/asm/src/StateFinalCutterPre.s index 45abfa76..f7e16f10 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 - .4byte 0x803A1914 - .4byte 0x803A18D8 + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterRise$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterRise$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash19StateFinalCutterPre$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash19StateFinalCutterPre$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x803A1910 - .4byte 0x803A18F4 + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash19StateFinalCutterPre$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash19StateFinalCutterPre$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5smash19StateFinalCutterPre __vt__Q53scn4step4hero5smash19StateFinalCutterPre: .4byte 0 .4byte 0 - .4byte 0x803A17EC - .4byte 0x803A17F0 - .4byte 0x803A1880 - .4byte 0x8035550C - .4byte 0x803A18D4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5smash19StateFinalCutterPreFv + .byte4 procAnim__Q53scn4step4hero5smash19StateFinalCutterPreFv + .byte4 procMove__Q53scn4step4hero5smash19StateFinalCutterPreFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5smash19StateFinalCutterPreFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateFinalCutterRise.s b/asm/src/StateFinalCutterRise.s index 33da0421..e86ce2c3 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 - .4byte 0x803A1CB0 - .4byte 0x803A1C94 + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterDrop$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterDrop$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5smash20StateFinalCutterRise __vt__Q53scn4step4hero5smash20StateFinalCutterRise: .4byte 0 .4byte 0 - .4byte 0x803A1A5C - .4byte 0x803A1AE8 - .4byte 0x803A1BF0 - .4byte 0x8035550C - .4byte 0x803A1C90 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5smash20StateFinalCutterRiseFv + .byte4 procAnim__Q53scn4step4hero5smash20StateFinalCutterRiseFv + .byte4 procMove__Q53scn4step4hero5smash20StateFinalCutterRiseFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5smash20StateFinalCutterRiseFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateFireBlock.s b/asm/src/StateFireBlock.s index cd234cd7..51fcab43 100644 --- a/asm/src/StateFireBlock.s +++ b/asm/src/StateFireBlock.s @@ -426,13 +426,13 @@ lbl_8037662C: __vt__Q53scn4step4hero6damage14StateFireBlock: .4byte 0 .4byte 0 - .4byte 0x80376258 - .4byte 0x80376314 - .4byte 0x803764A0 - .4byte 0x8035550C - .4byte 0x80376508 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6damage14StateFireBlockFv + .byte4 procAnim__Q53scn4step4hero6damage14StateFireBlockFv + .byte4 procMove__Q53scn4step4hero6damage14StateFireBlockFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6damage14StateFireBlockFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateFireLv2.s b/asm/src/StateFireLv2.s index 0343ce27..83736016 100644 --- a/asm/src/StateFireLv2.s +++ b/asm/src/StateFireLv2.s @@ -336,13 +336,13 @@ lbl_80376AEC: __vt__Q53scn4step4hero6damage12StateFireLv2: .4byte 0 .4byte 0 - .4byte 0x8037671C - .4byte 0x803767D8 - .4byte 0x80376964 - .4byte 0x8035550C - .4byte 0x803769CC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6damage12StateFireLv2Fv + .byte4 procAnim__Q53scn4step4hero6damage12StateFireLv2Fv + .byte4 procMove__Q53scn4step4hero6damage12StateFireLv2Fv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6damage12StateFireLv2Fv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateFireLv3.s b/asm/src/StateFireLv3.s index e4397e04..63cfbaa8 100644 --- a/asm/src/StateFireLv3.s +++ b/asm/src/StateFireLv3.s @@ -341,13 +341,13 @@ lbl_80376FBC: __vt__Q53scn4step4hero6damage12StateFireLv3: .4byte 0 .4byte 0 - .4byte 0x80376BE8 - .4byte 0x80376CA4 - .4byte 0x80376E30 - .4byte 0x8035550C - .4byte 0x80376E98 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6damage12StateFireLv3Fv + .byte4 procAnim__Q53scn4step4hero6damage12StateFireLv3Fv + .byte4 procMove__Q53scn4step4hero6damage12StateFireLv3Fv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6damage12StateFireLv3Fv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateFirst.s b/asm/src/StateFirst.s index 6580beee..7b454ce5 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 - .4byte 0x8025D954 ;# ptr - .4byte 0x8025D938 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6whispy10StateFirst __vt__Q53scn4step4boss6whispy10StateFirst: .4byte 0 .4byte 0 - .4byte 0x8025D834 ;# ptr - .4byte 0x8025D838 ;# ptr - .4byte 0x8025D83C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025D840 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy10StateFirstFv + .byte4 procAnim__Q53scn4step4boss6whispy10StateFirstFv + .byte4 procMove__Q53scn4step4boss6whispy10StateFirstFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy10StateFirstFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateFirstDemo.s b/asm/src/StateFirstDemo.s index d50d5530..b0222659 100644 --- a/asm/src/StateFirstDemo.s +++ b/asm/src/StateFirstDemo.s @@ -356,13 +356,13 @@ lbl_8037FA2C: __vt__Q53scn4step4hero7gimmick14StateFirstDemo: .4byte 0 .4byte 0 - .4byte 0x8037F738 - .4byte 0x8037F844 - .4byte 0x8037F920 - .4byte 0x8035550C - .4byte 0x8037F924 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick14StateFirstDemoFv + .byte4 procAnim__Q53scn4step4hero7gimmick14StateFirstDemoFv + .byte4 procMove__Q53scn4step4hero7gimmick14StateFirstDemoFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick14StateFirstDemoFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateFirstMotion.s b/asm/src/StateFirstMotion.s index a64473a4..7cc4ab33 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 - .4byte 0x8039D150 - .4byte 0x8039D0F4 + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateMoonSault$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateMoonSault$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateRising$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateRising$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8039D14C - .4byte 0x8039D110 + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateRising$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11StateRising$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter16StateFirstMotion$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter16StateFirstMotion$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8039D148 - .4byte 0x8039D12C + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter16StateFirstMotion$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter16StateFirstMotion$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7fighter16StateFirstMotion __vt__Q53scn4step4hero7fighter16StateFirstMotion: .4byte 0 .4byte 0 - .4byte 0x8039CC34 - .4byte 0x8039CCB0 - .4byte 0x8039D06C - .4byte 0x8035550C - .4byte 0x8039D070 - .4byte 0x8039D074 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter16StateFirstMotionFv + .byte4 procAnim__Q53scn4step4hero7fighter16StateFirstMotionFv + .byte4 procMove__Q53scn4step4hero7fighter16StateFirstMotionFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter16StateFirstMotionFv + .byte4 procObjCollReact__Q53scn4step4hero7fighter16StateFirstMotionFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateFirstMotionDash.s b/asm/src/StateFirstMotionDash.s index 65847095..806a67aa 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 - .4byte 0x8039D4D4 - .4byte 0x8039D478 + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateFootSweep$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateFootSweep$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateSpinKick$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateSpinKick$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8039D4D0 - .4byte 0x8039D494 + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateSpinKick$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateSpinKick$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter20StateFirstMotionDash$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter20StateFirstMotionDash$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8039D4CC - .4byte 0x8039D4B0 + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter20StateFirstMotionDash$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter20StateFirstMotionDash$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7fighter20StateFirstMotionDash __vt__Q53scn4step4hero7fighter20StateFirstMotionDash: .4byte 0 .4byte 0 - .4byte 0x8039D298 - .4byte 0x8039D29C - .4byte 0x8039D424 - .4byte 0x8035550C - .4byte 0x8039D428 - .4byte 0x8039D42C - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter20StateFirstMotionDashFv + .byte4 procAnim__Q53scn4step4hero7fighter20StateFirstMotionDashFv + .byte4 procMove__Q53scn4step4hero7fighter20StateFirstMotionDashFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter20StateFirstMotionDashFv + .byte4 procObjCollReact__Q53scn4step4hero7fighter20StateFirstMotionDashFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateFixed.s b/asm/src/StateFixed.s index 29ff6967..778d8fc1 100644 --- a/asm/src/StateFixed.s +++ b/asm/src/StateFixed.s @@ -65,7 +65,7 @@ __dt__Q53scn4step4item5state10StateFixedFv: __vt__Q53scn4step4item5state10StateFixed: .4byte 0 .4byte 0 - .4byte 0x803C7E08 - .4byte 0x803C51FC - .4byte 0x803C7D98 - .4byte 0x803C5204 + .byte4 __dt__Q53scn4step4item5state10StateFixedFv + .byte4 procAnim__Q43scn4step4item9StateBaseFv + .byte4 procMove__Q53scn4step4item5state10StateFixedFv + .byte4 procFixPos__Q43scn4step4item9StateBaseFv diff --git a/asm/src/StateFlight.s b/asm/src/StateFlight.s index a65ae2f8..d09d6207 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 - .4byte 0x80398EB8 - .4byte 0x80398E9C + .byte4 __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing11StateFlight$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing11StateFlight$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4wing11StateFlight __vt__Q53scn4step4hero4wing11StateFlight: .4byte 0 .4byte 0 - .4byte 0x80398A60 - .4byte 0x80398B04 - .4byte 0x80398C64 - .4byte 0x8035550C - .4byte 0x80398CE4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4wing11StateFlightFv + .byte4 procAnim__Q53scn4step4hero4wing11StateFlightFv + .byte4 procMove__Q53scn4step4hero4wing11StateFlightFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4wing11StateFlightFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateFlightFar.s b/asm/src/StateFlightFar.s index 85f0e061..acf7cd9a 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 - .4byte 0x80248EE4 ;# ptr - .4byte 0x80248EC8 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateFlightFar$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateFlightFar$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9creditdee14StateFlightFar __vt__Q53scn4step4boss9creditdee14StateFlightFar: .4byte 0 .4byte 0 - .4byte 0x80248BBC ;# ptr - .4byte 0x80248C3C ;# ptr - .4byte 0x80248CF0 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80248DD8 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9creditdee14StateFlightFarFv + .byte4 procAnim__Q53scn4step4boss9creditdee14StateFlightFarFv + .byte4 procMove__Q53scn4step4boss9creditdee14StateFlightFarFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9creditdee14StateFlightFarFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255678 diff --git a/asm/src/StateFlush.s b/asm/src/StateFlush.s index 47f1339c..0cfbb63b 100644 --- a/asm/src/StateFlush.s +++ b/asm/src/StateFlush.s @@ -135,12 +135,12 @@ __dt__Q53scn4step5enemy6common10StateFlushFv: __vt__Q53scn4step5enemy6common10StateFlush: .4byte 0 .4byte 0 - .4byte 0x80291F10 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x80291DB4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common10StateFlushFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy6common10StateFlushFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254965 diff --git a/asm/src/StateFlushWait.s b/asm/src/StateFlushWait.s index e91d9a68..21fdd878 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 - .4byte 0x80292074 ;# ptr - .4byte 0x80292054 ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common10StateFlush$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common10StateFlush$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6common14StateFlushWait __vt__Q53scn4step5enemy6common14StateFlushWait: .4byte 0 .4byte 0 - .4byte 0x80292070 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80291F80 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common14StateFlushWaitFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common14StateFlushWaitFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255730 diff --git a/asm/src/StateFly.s b/asm/src/StateFly.s index 8244ba39..4f881a91 100644 --- a/asm/src/StateFly.s +++ b/asm/src/StateFly.s @@ -1627,114 +1627,114 @@ procFixPos__Q53scn4step5enemy6sodory8StateFlyFv: __vt__Q53scn4step4boss15challengemaster8StateFly: .4byte 0 .4byte 0 - .4byte 0x8023FF8C ;# ptr - .4byte 0x8023FF90 ;# ptr - .4byte 0x802400A0 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802400A4 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster8StateFlyFv + .byte4 procAnim__Q53scn4step4boss15challengemaster8StateFlyFv + .byte4 procMove__Q53scn4step4boss15challengemaster8StateFlyFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster8StateFlyFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common8StateFly __vt__Q53scn4step5enemy6common8StateFly: .4byte 0 .4byte 0 - .4byte 0x802920F0 ;# ptr - .4byte 0x802920F4 ;# ptr - .4byte 0x802920F8 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80292200 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common8StateFlyFv + .byte4 procAnim__Q53scn4step5enemy6common8StateFlyFv + .byte4 procMove__Q53scn4step5enemy6common8StateFlyFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common8StateFlyFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10brontoburt8StateFly __vt__Q53scn4step5enemy10brontoburt8StateFly: .4byte 0 .4byte 0 - .4byte 0x8029F86C ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x8029F57C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029F69C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10brontoburt8StateFlyFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy10brontoburt8StateFlyFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10brontoburt8StateFlyFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8cerulean8StateFly __vt__Q53scn4step5enemy8cerulean8StateFly: .4byte 0 .4byte 0 - .4byte 0x802A57B8 ;# ptr - .4byte 0x802A57BC ;# ptr - .4byte 0x802A586C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A5964 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8cerulean8StateFlyFv + .byte4 procAnim__Q53scn4step5enemy8cerulean8StateFlyFv + .byte4 procMove__Q53scn4step5enemy8cerulean8StateFlyFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy8cerulean8StateFlyFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6degout8StateFly __vt__Q53scn4step5enemy6degout8StateFly: .4byte 0 .4byte 0 - .4byte 0x802ADB34 ;# ptr - .4byte 0x802ADAD0 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6degout8StateFlyFv + .byte4 procAnim__Q53scn4step5enemy6degout8StateFlyFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8dubiorjr8StateFly __vt__Q53scn4step5enemy8dubiorjr8StateFly: .4byte 0 .4byte 0 - .4byte 0x802AE698 ;# ptr - .4byte 0x802AE69C ;# ptr - .4byte 0x802AE6A0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802AE6F4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8dubiorjr8StateFlyFv + .byte4 procAnim__Q53scn4step5enemy8dubiorjr8StateFlyFv + .byte4 procMove__Q53scn4step5enemy8dubiorjr8StateFlyFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy8dubiorjr8StateFlyFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gemra8StateFly __vt__Q53scn4step5enemy5gemra8StateFly: .4byte 0 .4byte 0 - .4byte 0x802B64DC ;# ptr - .4byte 0x802B64E0 ;# ptr - .4byte 0x802B65CC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B65F8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5gemra8StateFlyFv + .byte4 procAnim__Q53scn4step5enemy5gemra8StateFlyFv + .byte4 procMove__Q53scn4step5enemy5gemra8StateFlyFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5gemra8StateFlyFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802DC28C ;# ptr - .4byte 0x802DC26C ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8searches8StateFly __vt__Q53scn4step5enemy8searches8StateFly: .4byte 0 .4byte 0 - .4byte 0x802DC288 ;# ptr - .4byte 0x802DC174 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8searches8StateFlyFv + .byte4 procAnim__Q53scn4step5enemy8searches8StateFlyFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory8StateFly __vt__Q53scn4step5enemy6sodory8StateFly: .4byte 0 .4byte 0 - .4byte 0x802E61C0 ;# ptr - .4byte 0x802E61C4 ;# ptr - .4byte 0x802E6240 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E6284 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6sodory8StateFlyFv + .byte4 procAnim__Q53scn4step5enemy6sodory8StateFlyFv + .byte4 procMove__Q53scn4step5enemy6sodory8StateFlyFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6sodory8StateFlyFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255233 diff --git a/asm/src/StateFlyAround.s b/asm/src/StateFlyAround.s index 99401c51..221bd5d0 100644 --- a/asm/src/StateFlyAround.s +++ b/asm/src/StateFlyAround.s @@ -959,24 +959,24 @@ lbl_802E3E80: __vt__Q53scn4step5enemy6pierce14StateFlyAround: .4byte 0 .4byte 0 - .4byte 0x802CFD50 ;# ptr - .4byte 0x802CFD54 ;# ptr - .4byte 0x802CFFC4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D00C4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6pierce14StateFlyAroundFv + .byte4 procAnim__Q53scn4step5enemy6pierce14StateFlyAroundFv + .byte4 procMove__Q53scn4step5enemy6pierce14StateFlyAroundFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6pierce14StateFlyAroundFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5snowl14StateFlyAround __vt__Q53scn4step5enemy5snowl14StateFlyAround: .4byte 0 .4byte 0 - .4byte 0x802E39F4 ;# ptr - .4byte 0x802E39F8 ;# ptr - .4byte 0x802E3C00 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E3D48 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5snowl14StateFlyAroundFv + .byte4 procAnim__Q53scn4step5enemy5snowl14StateFlyAroundFv + .byte4 procMove__Q53scn4step5enemy5snowl14StateFlyAroundFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5snowl14StateFlyAroundFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256372 diff --git a/asm/src/StateFlyAway.s b/asm/src/StateFlyAway.s index f91227b0..cd0bf30d 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 - .4byte 0x8024BF58 ;# ptr - .4byte 0x8024BF3C ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateFlyAway$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateFlyAway$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss10creditroah12StateFlyAway __vt__Q53scn4step4boss10creditroah12StateFlyAway: .4byte 0 .4byte 0 - .4byte 0x8024BB60 ;# ptr - .4byte 0x8024BBD8 ;# ptr - .4byte 0x8024BC24 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024BD8C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss10creditroah12StateFlyAwayFv + .byte4 procAnim__Q53scn4step4boss10creditroah12StateFlyAwayFv + .byte4 procMove__Q53scn4step4boss10creditroah12StateFlyAwayFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss10creditroah12StateFlyAwayFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255018 diff --git a/asm/src/StateFlyFarSinCurve.s b/asm/src/StateFlyFarSinCurve.s index 5bc0b2b6..31b1f395 100644 --- a/asm/src/StateFlyFarSinCurve.s +++ b/asm/src/StateFlyFarSinCurve.s @@ -153,12 +153,12 @@ procFixPos__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFv: __vt__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve: .4byte 0 .4byte 0 - .4byte 0x8029F9B0 ;# ptr - .4byte 0x8029F9B4 ;# ptr - .4byte 0x8029F9B8 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029FA78 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFv + .byte4 procAnim__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFv + .byte4 procMove__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256604 diff --git a/asm/src/StateFlyPursuit.s b/asm/src/StateFlyPursuit.s index dfa336c3..feb1a09b 100644 --- a/asm/src/StateFlyPursuit.s +++ b/asm/src/StateFlyPursuit.s @@ -493,12 +493,12 @@ lbl_802D0AEC: __vt__Q53scn4step5enemy6pierce15StateFlyPursuit: .4byte 0 .4byte 0 - .4byte 0x802D0554 ;# ptr - .4byte 0x802D0558 ;# ptr - .4byte 0x802D0708 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D0970 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6pierce15StateFlyPursuitFv + .byte4 procAnim__Q53scn4step5enemy6pierce15StateFlyPursuitFv + .byte4 procMove__Q53scn4step5enemy6pierce15StateFlyPursuitFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6pierce15StateFlyPursuitFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256306 diff --git a/asm/src/StateFlySinCurve.s b/asm/src/StateFlySinCurve.s index efae3d6f..d9c4fb56 100644 --- a/asm/src/StateFlySinCurve.s +++ b/asm/src/StateFlySinCurve.s @@ -614,24 +614,24 @@ lbl_802D0F9C: __vt__Q53scn4step5enemy6common16StateFlySinCurve: .4byte 0 .4byte 0 - .4byte 0x802922C4 ;# ptr - .4byte 0x802922C8 ;# ptr - .4byte 0x802922CC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802923D0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common16StateFlySinCurveFv + .byte4 procAnim__Q53scn4step5enemy6common16StateFlySinCurveFv + .byte4 procMove__Q53scn4step5enemy6common16StateFlySinCurveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common16StateFlySinCurveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6pierce16StateFlySinCurve __vt__Q53scn4step5enemy6pierce16StateFlySinCurve: .4byte 0 .4byte 0 - .4byte 0x802D0BC8 ;# ptr - .4byte 0x802D0BCC ;# ptr - .4byte 0x802D0D98 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D0EB0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6pierce16StateFlySinCurveFv + .byte4 procAnim__Q53scn4step5enemy6pierce16StateFlySinCurveFv + .byte4 procMove__Q53scn4step5enemy6pierce16StateFlySinCurveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6pierce16StateFlySinCurveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255895 diff --git a/asm/src/StateFlyStraight.s b/asm/src/StateFlyStraight.s index ec9c61e0..1f52edf8 100644 --- a/asm/src/StateFlyStraight.s +++ b/asm/src/StateFlyStraight.s @@ -461,24 +461,24 @@ lbl_802E42D4: __vt__Q53scn4step5enemy6owgulf16StateFlyStraight: .4byte 0 .4byte 0 - .4byte 0x802CA93C ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802CA7AC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802CA830 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6owgulf16StateFlyStraightFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy6owgulf16StateFlyStraightFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6owgulf16StateFlyStraightFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5snowl16StateFlyStraight __vt__Q53scn4step5enemy5snowl16StateFlyStraight: .4byte 0 .4byte 0 - .4byte 0x802E3F44 ;# ptr - .4byte 0x802E3F48 ;# ptr - .4byte 0x802E4154 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E41EC ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5snowl16StateFlyStraightFv + .byte4 procAnim__Q53scn4step5enemy5snowl16StateFlyStraightFv + .byte4 procMove__Q53scn4step5enemy5snowl16StateFlyStraightFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5snowl16StateFlyStraightFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255722 diff --git a/asm/src/StateFlyUpDown.s b/asm/src/StateFlyUpDown.s index ad330fc3..68e0b610 100644 --- a/asm/src/StateFlyUpDown.s +++ b/asm/src/StateFlyUpDown.s @@ -342,24 +342,24 @@ lbl_802DB3CC: __vt__Q53scn4step5enemy6common14StateFlyUpDown: .4byte 0 .4byte 0 - .4byte 0x80292668 ;# ptr - .4byte 0x8029266C ;# ptr - .4byte 0x80292670 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029271C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common14StateFlyUpDownFv + .byte4 procAnim__Q53scn4step5enemy6common14StateFlyUpDownFv + .byte4 procMove__Q53scn4step5enemy6common14StateFlyUpDownFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common14StateFlyUpDownFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy14StateFlyUpDown __vt__Q53scn4step5enemy6scarfy14StateFlyUpDown: .4byte 0 .4byte 0 - .4byte 0x802DB218 ;# ptr - .4byte 0x802DB21C ;# ptr - .4byte 0x802DB220 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802DB2E4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6scarfy14StateFlyUpDownFv + .byte4 procAnim__Q53scn4step5enemy6scarfy14StateFlyUpDownFv + .byte4 procMove__Q53scn4step5enemy6scarfy14StateFlyUpDownFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6scarfy14StateFlyUpDownFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255699 diff --git a/asm/src/StateFlyWait.s b/asm/src/StateFlyWait.s index 5163aeba..9db50bec 100644 --- a/asm/src/StateFlyWait.s +++ b/asm/src/StateFlyWait.s @@ -169,9 +169,9 @@ procMove__Q53scn4step5enemy6pierce12StateFlyWaitFv: __vt__Q53scn4step5enemy6pierce12StateFlyWait: .4byte 0 .4byte 0 - .4byte 0x802D1028 ;# ptr - .4byte 0x802D102C ;# ptr - .4byte 0x802D1174 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6pierce12StateFlyWaitFv + .byte4 procAnim__Q53scn4step5enemy6pierce12StateFlyWaitFv + .byte4 procMove__Q53scn4step5enemy6pierce12StateFlyWaitFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateFlyWaitFix.s b/asm/src/StateFlyWaitFix.s index e4fd8aac..e1bb3fad 100644 --- a/asm/src/StateFlyWaitFix.s +++ b/asm/src/StateFlyWaitFix.s @@ -68,12 +68,12 @@ __dt__Q53scn4step5enemy6owgulf15StateFlyWaitFixFv: __vt__Q53scn4step5enemy6owgulf15StateFlyWaitFix: .4byte 0 .4byte 0 - .4byte 0x802CAA10 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802CA9B0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6owgulf15StateFlyWaitFixFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy6owgulf15StateFlyWaitFixFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254812 diff --git a/asm/src/StateFlyWall.s b/asm/src/StateFlyWall.s index a7a1ae23..67b6a36d 100644 --- a/asm/src/StateFlyWall.s +++ b/asm/src/StateFlyWall.s @@ -535,12 +535,12 @@ lbl_8024096C: __vt__Q53scn4step4boss15challengemaster12StateFlyWall: .4byte 0 .4byte 0 - .4byte 0x802402CC ;# ptr - .4byte 0x80240370 ;# ptr - .4byte 0x8024046C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80240668 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster12StateFlyWallFv + .byte4 procAnim__Q53scn4step4boss15challengemaster12StateFlyWallFv + .byte4 procMove__Q53scn4step4boss15challengemaster12StateFlyWallFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster12StateFlyWallFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255893 diff --git a/asm/src/StateFlyWallStart.s b/asm/src/StateFlyWallStart.s index e0b488f7..999842c4 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 - .4byte 0x80240CD4 ;# ptr - .4byte 0x80240C90 ;# ptr + .byte4 __dt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateFlyWall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1Fv + .byte4 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 - .4byte 0x80240CD0 ;# ptr - .4byte 0x80240CB0 ;# ptr + .byte4 __dt__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster17StateFlyWallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1Fv + .byte4 create__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster17StateFlyWallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1Fv .global __vt__Q53scn4step4boss15challengemaster17StateFlyWallStart __vt__Q53scn4step4boss15challengemaster17StateFlyWallStart: .4byte 0 .4byte 0 - .4byte 0x80240B5C ;# ptr - .4byte 0x80240BF0 ;# ptr - .4byte 0x80240C88 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80240C8C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster17StateFlyWallStartFv + .byte4 procAnim__Q53scn4step4boss15challengemaster17StateFlyWallStartFv + .byte4 procMove__Q53scn4step4boss15challengemaster17StateFlyWallStartFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster17StateFlyWallStartFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateFlyingOut.s b/asm/src/StateFlyingOut.s index 8c75192f..577d40d1 100644 --- a/asm/src/StateFlyingOut.s +++ b/asm/src/StateFlyingOut.s @@ -207,12 +207,12 @@ __dt__Q53scn4step5enemy7blipper14StateFlyingOutFv: __vt__Q53scn4step5enemy7blipper14StateFlyingOut: .4byte 0 .4byte 0 - .4byte 0x8029AE30 ;# ptr - .4byte 0x8029AC9C ;# ptr - .4byte 0x8029AD60 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029ADC0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7blipper14StateFlyingOutFv + .byte4 procAnim__Q53scn4step5enemy7blipper14StateFlyingOutFv + .byte4 procMove__Q53scn4step5enemy7blipper14StateFlyingOutFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7blipper14StateFlyingOutFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255853 diff --git a/asm/src/StateFollow.s b/asm/src/StateFollow.s index c62dff2c..e89d9dff 100644 --- a/asm/src/StateFollow.s +++ b/asm/src/StateFollow.s @@ -361,12 +361,12 @@ __dt__Q53scn4step5enemy6juckle11StateFollowFv: __vt__Q53scn4step5enemy6juckle11StateFollow: .4byte 0 .4byte 0 - .4byte 0x802BC18C ;# ptr - .4byte 0x802BBE80 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6juckle11StateFollowFv + .byte4 procAnim__Q53scn4step5enemy6juckle11StateFollowFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255367 diff --git a/asm/src/StateFootSweep.s b/asm/src/StateFootSweep.s index 096bcfb1..268962cf 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 - .4byte 0x8039D9F0 - .4byte 0x8039D9D4 + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter17StateFootSweepEnd$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter17StateFootSweepEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7fighter14StateFootSweep __vt__Q53scn4step4hero7fighter14StateFootSweep: .4byte 0 .4byte 0 - .4byte 0x8039D5DC - .4byte 0x8039D66C - .4byte 0x8039D778 - .4byte 0x8035550C - .4byte 0x8039D7CC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter14StateFootSweepFv + .byte4 procAnim__Q53scn4step4hero7fighter14StateFootSweepFv + .byte4 procMove__Q53scn4step4hero7fighter14StateFootSweepFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter14StateFootSweepFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateFootSweepEnd.s b/asm/src/StateFootSweepEnd.s index 394910cc..404ce772 100644 --- a/asm/src/StateFootSweepEnd.s +++ b/asm/src/StateFootSweepEnd.s @@ -86,11 +86,11 @@ procFixPos__Q53scn4step4hero7fighter17StateFootSweepEndFv: __vt__Q53scn4step4hero7fighter17StateFootSweepEnd: .4byte 0 .4byte 0 - .4byte 0x8039DA6C - .4byte 0x8039DAE8 - .4byte 0x8039DAEC - .4byte 0x8035550C - .4byte 0x8039DAF0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter17StateFootSweepEndFv + .byte4 procAnim__Q53scn4step4hero7fighter17StateFootSweepEndFv + .byte4 procMove__Q53scn4step4hero7fighter17StateFootSweepEndFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter17StateFootSweepEndFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateGather.s b/asm/src/StateGather.s index 2ba82a51..0febfff5 100644 --- a/asm/src/StateGather.s +++ b/asm/src/StateGather.s @@ -198,10 +198,10 @@ __dt__Q53scn4step4item5state11StateGatherFv: __vt__Q53scn4step4item5state11StateGather: .4byte 0 .4byte 0 - .4byte 0x803C80D4 - .4byte 0x803C7F10 - .4byte 0x803C7FD4 - .4byte 0x803C5204 + .byte4 __dt__Q53scn4step4item5state11StateGatherFv + .byte4 procAnim__Q53scn4step4item5state11StateGatherFv + .byte4 procMove__Q53scn4step4item5state11StateGatherFv + .byte4 procFixPos__Q43scn4step4item9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255059 diff --git a/asm/src/StateGetShipParts.s b/asm/src/StateGetShipParts.s index cc7f7197..a69b4915 100644 --- a/asm/src/StateGetShipParts.s +++ b/asm/src/StateGetShipParts.s @@ -334,13 +334,13 @@ lbl_8037FF00: __vt__Q53scn4step4hero7gimmick17StateGetShipParts: .4byte 0 .4byte 0 - .4byte 0x8037FC1C - .4byte 0x8037FD2C - .4byte 0x8037FEC4 - .4byte 0x8035550C - .4byte 0x8037FEC8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick17StateGetShipPartsFv + .byte4 procAnim__Q53scn4step4hero7gimmick17StateGetShipPartsFv + .byte4 procMove__Q53scn4step4hero7gimmick17StateGetShipPartsFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick17StateGetShipPartsFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateGlide.s b/asm/src/StateGlide.s index 4cf0cfe1..9f9ed996 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 - .4byte 0x8024A454 ;# ptr - .4byte 0x8024A434 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10creditmeta10StateGlide$$4PQ43scn4step4boss4Boss$$4b$$1Fv + .byte4 create__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10creditmeta10StateGlide$$4PQ43scn4step4boss4Boss$$4b$$1Fv .global __vt__Q53scn4step4boss10creditmeta10StateGlide __vt__Q53scn4step4boss10creditmeta10StateGlide: .4byte 0 .4byte 0 - .4byte 0x8024A020 ;# ptr - .4byte 0x8024A024 ;# ptr - .4byte 0x8024A0A8 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024A224 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss10creditmeta10StateGlideFv + .byte4 procAnim__Q53scn4step4boss10creditmeta10StateGlideFv + .byte4 procMove__Q53scn4step4boss10creditmeta10StateGlideFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss10creditmeta10StateGlideFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior10StateGlide __vt__Q53scn4step4boss6dubior10StateGlide: .4byte 0 .4byte 0 - .4byte 0x8024E7A4 ;# ptr - .4byte 0x8024E820 ;# ptr - .4byte 0x8024E978 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024ED44 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6dubior10StateGlideFv + .byte4 procAnim__Q53scn4step4boss6dubior10StateGlideFv + .byte4 procMove__Q53scn4step4boss6dubior10StateGlideFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6dubior10StateGlideFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255202 diff --git a/asm/src/StateGlideAway.s b/asm/src/StateGlideAway.s index 17fbbd2d..7f9dc78e 100644 --- a/asm/src/StateGlideAway.s +++ b/asm/src/StateGlideAway.s @@ -496,12 +496,12 @@ lbl_8024AB84: __vt__Q53scn4step4boss10creditmeta14StateGlideAway: .4byte 0 .4byte 0 - .4byte 0x8024A5BC ;# ptr - .4byte 0x8024A668 ;# ptr - .4byte 0x8024A714 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024A924 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss10creditmeta14StateGlideAwayFv + .byte4 procAnim__Q53scn4step4boss10creditmeta14StateGlideAwayFv + .byte4 procMove__Q53scn4step4boss10creditmeta14StateGlideAwayFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss10creditmeta14StateGlideAwayFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256059 diff --git a/asm/src/StateGoodbye.s b/asm/src/StateGoodbye.s index 3a94642c..9f26d3c0 100644 --- a/asm/src/StateGoodbye.s +++ b/asm/src/StateGoodbye.s @@ -206,9 +206,9 @@ $$256612: __vt__Q53scn4step5enemy6common12StateGoodbye: .4byte 0 .4byte 0 - .4byte 0x80292984 ;# ptr - .4byte 0x80292988 ;# ptr - .4byte 0x802929AC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80292A00 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common12StateGoodbyeFv + .byte4 procAnim__Q53scn4step5enemy6common12StateGoodbyeFv + .byte4 procMove__Q53scn4step5enemy6common12StateGoodbyeFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common12StateGoodbyeFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateGrandLowperAppear.s b/asm/src/StateGrandLowperAppear.s index 81380e3f..a4186dbf 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 - .4byte 0x802967A0 ;# ptr - .4byte 0x80296838 ;# ptr - .4byte 0x802968CC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802968D4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8armordee22StateGrandLowperAppearFv + .byte4 procAnim__Q53scn4step5enemy8armordee22StateGrandLowperAppearFv + .byte4 procMove__Q53scn4step5enemy8armordee22StateGrandLowperAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy8armordee22StateGrandLowperAppearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight22StateGrandLowperAppear __vt__Q53scn4step5enemy11bladeknight22StateGrandLowperAppear: .4byte 0 .4byte 0 - .4byte 0x80297BD0 ;# ptr - .4byte 0x80297C68 ;# ptr - .4byte 0x80297CFC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80297D00 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11bladeknight22StateGrandLowperAppearFv + .byte4 procAnim__Q53scn4step5enemy11bladeknight22StateGrandLowperAppearFv + .byte4 procMove__Q53scn4step5enemy11bladeknight22StateGrandLowperAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11bladeknight22StateGrandLowperAppearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy22StateGrandLowperAppear __vt__Q53scn4step5enemy6bouncy22StateGrandLowperAppear: .4byte 0 .4byte 0 - .4byte 0x8029D350 ;# ptr - .4byte 0x8029D3E8 ;# ptr - .4byte 0x8029D4B4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029D4B8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6bouncy22StateGrandLowperAppearFv + .byte4 procAnim__Q53scn4step5enemy6bouncy22StateGrandLowperAppearFv + .byte4 procMove__Q53scn4step5enemy6bouncy22StateGrandLowperAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6bouncy22StateGrandLowperAppearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter22StateGrandLowperAppear __vt__Q53scn4step5enemy11broomhatter22StateGrandLowperAppear: .4byte 0 .4byte 0 - .4byte 0x802A13B8 ;# ptr - .4byte 0x802A1450 ;# ptr - .4byte 0x802A14E4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A14E8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11broomhatter22StateGrandLowperAppearFv + .byte4 procAnim__Q53scn4step5enemy11broomhatter22StateGrandLowperAppearFv + .byte4 procMove__Q53scn4step5enemy11broomhatter22StateGrandLowperAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11broomhatter22StateGrandLowperAppearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu22StateGrandLowperAppear __vt__Q53scn4step5enemy4kabu22StateGrandLowperAppear: .4byte 0 .4byte 0 - .4byte 0x802BD180 ;# ptr - .4byte 0x802BD218 ;# ptr - .4byte 0x802BD344 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802BD348 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy4kabu22StateGrandLowperAppearFv + .byte4 procAnim__Q53scn4step5enemy4kabu22StateGrandLowperAppearFv + .byte4 procMove__Q53scn4step5enemy4kabu22StateGrandLowperAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4kabu22StateGrandLowperAppearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff22StateGrandLowperAppear __vt__Q53scn4step5enemy5nruff22StateGrandLowperAppear: .4byte 0 .4byte 0 - .4byte 0x802C8444 ;# ptr - .4byte 0x802C84DC ;# ptr - .4byte 0x802C859C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C85A0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5nruff22StateGrandLowperAppearFv + .byte4 procAnim__Q53scn4step5enemy5nruff22StateGrandLowperAppearFv + .byte4 procMove__Q53scn4step5enemy5nruff22StateGrandLowperAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5nruff22StateGrandLowperAppearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy22StateGrandLowperAppear __vt__Q53scn4step5enemy6scarfy22StateGrandLowperAppear: .4byte 0 .4byte 0 - .4byte 0x802DB488 ;# ptr - .4byte 0x802DB520 ;# ptr - .4byte 0x802DB614 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802DB618 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6scarfy22StateGrandLowperAppearFv + .byte4 procAnim__Q53scn4step5enemy6scarfy22StateGrandLowperAppearFv + .byte4 procMove__Q53scn4step5enemy6scarfy22StateGrandLowperAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6scarfy22StateGrandLowperAppearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld22StateGrandLowperAppear __vt__Q53scn4step5enemy5sheld22StateGrandLowperAppear: .4byte 0 .4byte 0 - .4byte 0x802DE7F4 ;# ptr - .4byte 0x802DE88C ;# ptr - .4byte 0x802DE920 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802DE924 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5sheld22StateGrandLowperAppearFv + .byte4 procAnim__Q53scn4step5enemy5sheld22StateGrandLowperAppearFv + .byte4 procMove__Q53scn4step5enemy5sheld22StateGrandLowperAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5sheld22StateGrandLowperAppearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee23StateGrandLowperLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee23StateGrandLowperLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802EDC64 ;# ptr - .4byte 0x802EDC48 ;# ptr + .byte4 __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee23StateGrandLowperLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee23StateGrandLowperLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee22StateGrandLowperAppear __vt__Q53scn4step5enemy9waddledee22StateGrandLowperAppear: .4byte 0 .4byte 0 - .4byte 0x802EDA54 ;# ptr - .4byte 0x802EDAEC ;# ptr - .4byte 0x802EDBA0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EDBA4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledee22StateGrandLowperAppearFv + .byte4 procAnim__Q53scn4step5enemy9waddledee22StateGrandLowperAppearFv + .byte4 procMove__Q53scn4step5enemy9waddledee22StateGrandLowperAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9waddledee22StateGrandLowperAppearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256597 diff --git a/asm/src/StateGrandLowperEscape.s b/asm/src/StateGrandLowperEscape.s index 85825669..aadc6590 100644 --- a/asm/src/StateGrandLowperEscape.s +++ b/asm/src/StateGrandLowperEscape.s @@ -1130,81 +1130,81 @@ lbl_802EDE88: __vt__Q53scn4step5enemy11bladeknight22StateGrandLowperEscape: .4byte 0 .4byte 0 - .4byte 0x80297DE8 ;# ptr - .4byte 0x80297E64 ;# ptr - .4byte 0x80297E68 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80297EC0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11bladeknight22StateGrandLowperEscapeFv + .byte4 procAnim__Q53scn4step5enemy11bladeknight22StateGrandLowperEscapeFv + .byte4 procMove__Q53scn4step5enemy11bladeknight22StateGrandLowperEscapeFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11bladeknight22StateGrandLowperEscapeFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy22StateGrandLowperEscape __vt__Q53scn4step5enemy6bouncy22StateGrandLowperEscape: .4byte 0 .4byte 0 - .4byte 0x8029D608 ;# ptr - .4byte 0x8029D684 ;# ptr - .4byte 0x8029D688 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029D6E0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6bouncy22StateGrandLowperEscapeFv + .byte4 procAnim__Q53scn4step5enemy6bouncy22StateGrandLowperEscapeFv + .byte4 procMove__Q53scn4step5enemy6bouncy22StateGrandLowperEscapeFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6bouncy22StateGrandLowperEscapeFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter22StateGrandLowperEscape __vt__Q53scn4step5enemy11broomhatter22StateGrandLowperEscape: .4byte 0 .4byte 0 - .4byte 0x802A15D0 ;# ptr - .4byte 0x802A164C ;# ptr - .4byte 0x802A1650 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A16A8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11broomhatter22StateGrandLowperEscapeFv + .byte4 procAnim__Q53scn4step5enemy11broomhatter22StateGrandLowperEscapeFv + .byte4 procMove__Q53scn4step5enemy11broomhatter22StateGrandLowperEscapeFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11broomhatter22StateGrandLowperEscapeFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu22StateGrandLowperEscape __vt__Q53scn4step5enemy4kabu22StateGrandLowperEscape: .4byte 0 .4byte 0 - .4byte 0x802BD430 ;# ptr - .4byte 0x802BD4AC ;# ptr - .4byte 0x802BD4B0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802BD508 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy4kabu22StateGrandLowperEscapeFv + .byte4 procAnim__Q53scn4step5enemy4kabu22StateGrandLowperEscapeFv + .byte4 procMove__Q53scn4step5enemy4kabu22StateGrandLowperEscapeFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4kabu22StateGrandLowperEscapeFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff22StateGrandLowperEscape __vt__Q53scn4step5enemy5nruff22StateGrandLowperEscape: .4byte 0 .4byte 0 - .4byte 0x802C8688 ;# ptr - .4byte 0x802C8704 ;# ptr - .4byte 0x802C8708 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C8760 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5nruff22StateGrandLowperEscapeFv + .byte4 procAnim__Q53scn4step5enemy5nruff22StateGrandLowperEscapeFv + .byte4 procMove__Q53scn4step5enemy5nruff22StateGrandLowperEscapeFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5nruff22StateGrandLowperEscapeFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld22StateGrandLowperEscape __vt__Q53scn4step5enemy5sheld22StateGrandLowperEscape: .4byte 0 .4byte 0 - .4byte 0x802DEA0C ;# ptr - .4byte 0x802DEA88 ;# ptr - .4byte 0x802DEA8C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802DEAE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5sheld22StateGrandLowperEscapeFv + .byte4 procAnim__Q53scn4step5enemy5sheld22StateGrandLowperEscapeFv + .byte4 procMove__Q53scn4step5enemy5sheld22StateGrandLowperEscapeFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5sheld22StateGrandLowperEscapeFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledee22StateGrandLowperEscape __vt__Q53scn4step5enemy9waddledee22StateGrandLowperEscape: .4byte 0 .4byte 0 - .4byte 0x802EDD4C ;# ptr - .4byte 0x802EDDC8 ;# ptr - .4byte 0x802EDDCC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EDE24 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledee22StateGrandLowperEscapeFv + .byte4 procAnim__Q53scn4step5enemy9waddledee22StateGrandLowperEscapeFv + .byte4 procMove__Q53scn4step5enemy9waddledee22StateGrandLowperEscapeFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9waddledee22StateGrandLowperEscapeFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateGrandLowperEscapeStart.s b/asm/src/StateGrandLowperEscapeStart.s index 8218ad29..9fd0467a 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 - .4byte 0x8029806C ;# ptr - .4byte 0x80298050 ;# ptr + .byte4 __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart: .4byte 0 .4byte 0 - .4byte 0x80297FAC ;# ptr - .4byte 0x80297FB0 ;# ptr - .4byte 0x80298048 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029804C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStartFv + .byte4 procAnim__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStartFv + .byte4 procMove__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStartFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStartFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x8029D88C ;# ptr - .4byte 0x8029D870 ;# ptr + .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart: .4byte 0 .4byte 0 - .4byte 0x8029D7CC ;# ptr - .4byte 0x8029D7D0 ;# ptr - .4byte 0x8029D868 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029D86C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStartFv + .byte4 procAnim__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStartFv + .byte4 procMove__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStartFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStartFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802A1854 ;# ptr - .4byte 0x802A1838 ;# ptr + .byte4 __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart: .4byte 0 .4byte 0 - .4byte 0x802A1794 ;# ptr - .4byte 0x802A1798 ;# ptr - .4byte 0x802A1830 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A1834 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStartFv + .byte4 procAnim__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStartFv + .byte4 procMove__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStartFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStartFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802BD6B4 ;# ptr - .4byte 0x802BD698 ;# ptr + .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart: .4byte 0 .4byte 0 - .4byte 0x802BD5F4 ;# ptr - .4byte 0x802BD5F8 ;# ptr - .4byte 0x802BD690 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802BD694 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStartFv + .byte4 procAnim__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStartFv + .byte4 procMove__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStartFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStartFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C890C ;# ptr - .4byte 0x802C88F0 ;# ptr + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart: .4byte 0 .4byte 0 - .4byte 0x802C884C ;# ptr - .4byte 0x802C8850 ;# ptr - .4byte 0x802C88E8 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C88EC ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStartFv + .byte4 procAnim__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStartFv + .byte4 procMove__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStartFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStartFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802DEC90 ;# ptr - .4byte 0x802DEC74 ;# ptr + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart: .4byte 0 .4byte 0 - .4byte 0x802DEBD0 ;# ptr - .4byte 0x802DEBD4 ;# ptr - .4byte 0x802DEC6C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802DEC70 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStartFv + .byte4 procAnim__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStartFv + .byte4 procMove__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStartFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStartFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802EDFD0 ;# ptr - .4byte 0x802EDFB4 ;# ptr + .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStart __vt__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStart: .4byte 0 .4byte 0 - .4byte 0x802EDF10 ;# ptr - .4byte 0x802EDF14 ;# ptr - .4byte 0x802EDFAC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EDFB0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStartFv + .byte4 procAnim__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStartFv + .byte4 procMove__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStartFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStartFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateGrandLowperLanding.s b/asm/src/StateGrandLowperLanding.s index b5189483..a8c4cff3 100644 --- a/asm/src/StateGrandLowperLanding.s +++ b/asm/src/StateGrandLowperLanding.s @@ -92,9 +92,9 @@ procFixPos__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv: __vt__Q53scn4step5enemy9waddledee23StateGrandLowperLanding: .4byte 0 .4byte 0 - .4byte 0x802EE044 ;# ptr - .4byte 0x802EE048 ;# ptr - .4byte 0x802EE0E0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EE0E4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv + .byte4 procAnim__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv + .byte4 procMove__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateGroundAttack.s b/asm/src/StateGroundAttack.s index 3e630732..81bb15e0 100644 --- a/asm/src/StateGroundAttack.s +++ b/asm/src/StateGroundAttack.s @@ -113,9 +113,9 @@ procMove__Q53scn4step5enemy6sodory17StateGroundAttackFv: __vt__Q53scn4step5enemy6sodory17StateGroundAttack: .4byte 0 .4byte 0 - .4byte 0x802E635C ;# ptr - .4byte 0x802E6420 ;# ptr - .4byte 0x802E6424 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6sodory17StateGroundAttackFv + .byte4 procAnim__Q53scn4step5enemy6sodory17StateGroundAttackFv + .byte4 procMove__Q53scn4step5enemy6sodory17StateGroundAttackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateGrow.s b/asm/src/StateGrow.s index 33823d29..dd99bfd1 100644 --- a/asm/src/StateGrow.s +++ b/asm/src/StateGrow.s @@ -263,12 +263,12 @@ procFixPos__Q53scn4step4boss6whispy9StateGrowFv: __vt__Q53scn4step4boss6whispy9StateGrow: .4byte 0 .4byte 0 - .4byte 0x8025D9C0 ;# ptr - .4byte 0x8025D9C4 ;# ptr - .4byte 0x8025DCF0 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025DCF4 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy9StateGrowFv + .byte4 procAnim__Q53scn4step4boss6whispy9StateGrowFv + .byte4 procMove__Q53scn4step4boss6whispy9StateGrowFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy9StateGrowFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256186 diff --git a/asm/src/StateGuard.s b/asm/src/StateGuard.s index 960e9785..068ff1cd 100644 --- a/asm/src/StateGuard.s +++ b/asm/src/StateGuard.s @@ -855,37 +855,37 @@ procFixPos__Q53scn4step4hero6damage10StateGuardFv: __vt__Q53scn4step4boss10gigantedge10StateGuard: .4byte 0 .4byte 0 - .4byte 0x80252424 ;# ptr - .4byte 0x802524C8 ;# ptr - .4byte 0x80252570 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802525C4 ;# ptr - .4byte 0x802525C8 ;# ptr + .byte4 __dt__Q53scn4step4boss10gigantedge10StateGuardFv + .byte4 procAnim__Q53scn4step4boss10gigantedge10StateGuardFv + .byte4 procMove__Q53scn4step4boss10gigantedge10StateGuardFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss10gigantedge10StateGuardFv + .byte4 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 - .4byte 0x80363840 - .4byte 0x803637FC + .byte4 __dt__Q24util118StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv + .byte4 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 - .4byte 0x8036383C - .4byte 0x8036381C + .byte4 __dt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateGuard$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .byte4 create__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateGuard$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero6common10StateGuard __vt__Q53scn4step4hero6common10StateGuard: .4byte 0 .4byte 0 - .4byte 0x803634A4 - .4byte 0x80363520 - .4byte 0x8036369C - .4byte 0x8035550C - .4byte 0x803636C0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common10StateGuardFv + .byte4 procAnim__Q53scn4step4hero6common10StateGuardFv + .byte4 procMove__Q53scn4step4hero6common10StateGuardFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common10StateGuardFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -893,13 +893,13 @@ __vt__Q53scn4step4hero6common10StateGuard: __vt__Q53scn4step4hero6damage10StateGuard: .4byte 0 .4byte 0 - .4byte 0x8037712C - .4byte 0x803771A8 - .4byte 0x8037721C - .4byte 0x8035550C - .4byte 0x80377240 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6damage10StateGuardFv + .byte4 procAnim__Q53scn4step4hero6damage10StateGuardFv + .byte4 procMove__Q53scn4step4hero6damage10StateGuardFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6damage10StateGuardFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateHadou.s b/asm/src/StateHadou.s index a8fe7e01..e9be0698 100644 --- a/asm/src/StateHadou.s +++ b/asm/src/StateHadou.s @@ -151,12 +151,12 @@ procFixPos__Q53scn4step5enemy10knucklejoe10StateHadouFv: __vt__Q53scn4step5enemy10knucklejoe10StateHadou: .4byte 0 .4byte 0 - .4byte 0x802C024C ;# ptr - .4byte 0x802C02F4 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C0380 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10knucklejoe10StateHadouFv + .byte4 procAnim__Q53scn4step5enemy10knucklejoe10StateHadouFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10knucklejoe10StateHadouFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255822 diff --git a/asm/src/StateHammerAirSpin.s b/asm/src/StateHammerAirSpin.s index 7cd99d29..28a2031c 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 - .4byte 0x803A2048 - .4byte 0x803A202C + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash18StateHammerAirSpin$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash18StateHammerAirSpin$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5smash18StateHammerAirSpin __vt__Q53scn4step4hero5smash18StateHammerAirSpin: .4byte 0 .4byte 0 - .4byte 0x803A1E84 - .4byte 0x803A1F34 - .4byte 0x803A2024 - .4byte 0x8035550C - .4byte 0x803A2028 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5smash18StateHammerAirSpinFv + .byte4 procAnim__Q53scn4step4hero5smash18StateHammerAirSpinFv + .byte4 procMove__Q53scn4step4hero5smash18StateHammerAirSpinFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5smash18StateHammerAirSpinFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateHammerStrongSwing.s b/asm/src/StateHammerStrongSwing.s index cc03dcaa..ffe68d71 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 - .4byte 0x803A22C8 - .4byte 0x803A22AC + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash22StateHammerStrongSwing$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash22StateHammerStrongSwing$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5smash22StateHammerStrongSwing __vt__Q53scn4step4hero5smash22StateHammerStrongSwing: .4byte 0 .4byte 0 - .4byte 0x803A2200 - .4byte 0x803A2204 - .4byte 0x803A22A4 - .4byte 0x8035550C - .4byte 0x803A22A8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5smash22StateHammerStrongSwingFv + .byte4 procAnim__Q53scn4step4hero5smash22StateHammerStrongSwingFv + .byte4 procMove__Q53scn4step4hero5smash22StateHammerStrongSwingFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5smash22StateHammerStrongSwingFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateHang.s b/asm/src/StateHang.s index d80f2dd1..b98ef3a6 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 - .4byte 0x802A85F4 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802A8420 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A8478 ;# ptr - .4byte 0x802A8554 ;# ptr + .byte4 __dt__Q53scn4step5enemy4como9StateHangFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy4como9StateHangFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4como9StateHangFv + .byte4 procObjCollReact__Q53scn4step5enemy4como9StateHangFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference9StateHang$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference9StateHang$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80371FF4 - .4byte 0x80371FD8 + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference9StateHang$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference9StateHang$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero12interference9StateHang __vt__Q53scn4step4hero12interference9StateHang: .4byte 0 .4byte 0 - .4byte 0x80371954 - .4byte 0x80371A44 - .4byte 0x80371A9C - .4byte 0x80371AE0 - .4byte 0x80371DA4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero12interference9StateHangFv + .byte4 procAnim__Q53scn4step4hero12interference9StateHangFv + .byte4 procMove__Q53scn4step4hero12interference9StateHangFv + .byte4 procConstraint__Q53scn4step4hero12interference9StateHangFv + .byte4 procFixPos__Q53scn4step4hero12interference9StateHangFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateHeightAdjust.s b/asm/src/StateHeightAdjust.s index 0f3864b1..de469083 100644 --- a/asm/src/StateHeightAdjust.s +++ b/asm/src/StateHeightAdjust.s @@ -264,12 +264,12 @@ procFixPos__Q53scn4step4boss6dubior17StateHeightAdjustFv: __vt__Q53scn4step4boss6dubior17StateHeightAdjust: .4byte 0 .4byte 0 - .4byte 0x8024F0EC ;# ptr - .4byte 0x8024F0F0 ;# ptr - .4byte 0x8024F19C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024F2B8 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6dubior17StateHeightAdjustFv + .byte4 procAnim__Q53scn4step4boss6dubior17StateHeightAdjustFv + .byte4 procMove__Q53scn4step4boss6dubior17StateHeightAdjustFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6dubior17StateHeightAdjustFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255294 diff --git a/asm/src/StateHide.s b/asm/src/StateHide.s index 3cedb58a..6a557904 100644 --- a/asm/src/StateHide.s +++ b/asm/src/StateHide.s @@ -557,45 +557,45 @@ procFixPos__Q53scn4step4boss10creditroah9StateHideFv: __vt__Q53scn4step4boss12creditdedede9StateHide: .4byte 0 .4byte 0 - .4byte 0x80247DC4 ;# ptr - .4byte 0x80247E54 ;# ptr - .4byte 0x80247E9C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80247EA0 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss12creditdedede9StateHideFv + .byte4 procAnim__Q53scn4step4boss12creditdedede9StateHideFv + .byte4 procMove__Q53scn4step4boss12creditdedede9StateHideFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss12creditdedede9StateHideFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9creditdee9StateHide __vt__Q53scn4step4boss9creditdee9StateHide: .4byte 0 .4byte 0 - .4byte 0x80249008 ;# ptr - .4byte 0x80249098 ;# ptr - .4byte 0x80249124 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80249128 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9creditdee9StateHideFv + .byte4 procAnim__Q53scn4step4boss9creditdee9StateHideFv + .byte4 procMove__Q53scn4step4boss9creditdee9StateHideFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9creditdee9StateHideFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss10creditmeta9StateHide __vt__Q53scn4step4boss10creditmeta9StateHide: .4byte 0 .4byte 0 - .4byte 0x8024AC30 ;# ptr - .4byte 0x8024ACC0 ;# ptr - .4byte 0x8024AD08 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024AD0C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss10creditmeta9StateHideFv + .byte4 procAnim__Q53scn4step4boss10creditmeta9StateHideFv + .byte4 procMove__Q53scn4step4boss10creditmeta9StateHideFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss10creditmeta9StateHideFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss10creditroah9StateHide __vt__Q53scn4step4boss10creditroah9StateHide: .4byte 0 .4byte 0 - .4byte 0x8024BFF8 ;# ptr - .4byte 0x8024C088 ;# ptr - .4byte 0x8024C0B0 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024C0B4 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss10creditroah9StateHideFv + .byte4 procAnim__Q53scn4step4boss10creditroah9StateHideFv + .byte4 procMove__Q53scn4step4boss10creditroah9StateHideFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss10creditroah9StateHideFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateHover.s b/asm/src/StateHover.s index 096bdd09..fe13e1c8 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 - .4byte 0x80364338 - .4byte 0x80364318 + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StateShotAirBall$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 - .4byte 0x80364334 - .4byte 0x803642F8 + .byte4 __dt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateHover$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .byte4 create__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateHover$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero6common10StateHover __vt__Q53scn4step4hero6common10StateHover: .4byte 0 .4byte 0 - .4byte 0x80363BE0 - .4byte 0x80363C90 - .4byte 0x80363E70 - .4byte 0x8035550C - .4byte 0x80364128 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common10StateHoverFv + .byte4 procAnim__Q53scn4step4hero6common10StateHoverFv + .byte4 procMove__Q53scn4step4hero6common10StateHoverFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common10StateHoverFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -993,13 +993,13 @@ __vt__Q53scn4step4hero6common10StateHover: __vt__Q53scn4step4hero6damage10StateHover: .4byte 0 .4byte 0 - .4byte 0x80377350 - .4byte 0x803773EC - .4byte 0x8037748C - .4byte 0x8035550C - .4byte 0x803774F4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6damage10StateHoverFv + .byte4 procAnim__Q53scn4step4hero6damage10StateHoverFv + .byte4 procMove__Q53scn4step4hero6damage10StateHoverFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6damage10StateHoverFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateHoverFar.s b/asm/src/StateHoverFar.s index c579c04b..eb7da8bd 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 - .4byte 0x80248264 ;# ptr - .4byte 0x80248248 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede13StateHoverFar$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede13StateHoverFar$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss12creditdedede13StateHoverFar __vt__Q53scn4step4boss12creditdedede13StateHoverFar: .4byte 0 .4byte 0 - .4byte 0x8024805C ;# ptr - .4byte 0x80248060 ;# ptr - .4byte 0x80248064 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802480F8 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss12creditdedede13StateHoverFarFv + .byte4 procAnim__Q53scn4step4boss12creditdedede13StateHoverFarFv + .byte4 procMove__Q53scn4step4boss12creditdedede13StateHoverFarFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss12creditdedede13StateHoverFarFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255585 diff --git a/asm/src/StateHoverLanding.s b/asm/src/StateHoverLanding.s index cefb2fe1..64dab410 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 - .4byte 0x80364540 - .4byte 0x80364524 + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common17StateHoverLanding$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common17StateHoverLanding$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common17StateHoverLanding __vt__Q53scn4step4hero6common17StateHoverLanding: .4byte 0 .4byte 0 - .4byte 0x8036443C - .4byte 0x80364440 - .4byte 0x803644C8 - .4byte 0x8035550C - .4byte 0x803644CC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common17StateHoverLandingFv + .byte4 procAnim__Q53scn4step4hero6common17StateHoverLandingFv + .byte4 procMove__Q53scn4step4hero6common17StateHoverLandingFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common17StateHoverLandingFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateIdling.s b/asm/src/StateIdling.s index c9031d6c..dd698a44 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 - .4byte 0x802C6C84 ;# ptr - .4byte 0x802C6C68 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8needlous11StateIdling __vt__Q53scn4step5enemy8needlous11StateIdling: .4byte 0 .4byte 0 - .4byte 0x802C686C ;# ptr - .4byte 0x802C6914 ;# ptr - .4byte 0x802C698C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C6A0C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8needlous11StateIdlingFv + .byte4 procAnim__Q53scn4step5enemy8needlous11StateIdlingFv + .byte4 procMove__Q53scn4step5enemy8needlous11StateIdlingFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy8needlous11StateIdlingFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256990 diff --git a/asm/src/StateInit.s b/asm/src/StateInit.s index 184ea86e..0a626204 100644 --- a/asm/src/StateInit.s +++ b/asm/src/StateInit.s @@ -385,21 +385,21 @@ procFixPos__Q53scn4step4hero11staffcredit9StateInitFv: __vt__Q53scn4step4hero8inactive9StateInit: .4byte 0 .4byte 0 - .4byte 0x8035D2E4 - .4byte 0x8035D340 + .byte4 __dt__Q53scn4step4hero8inactive9StateInitFv + .byte4 proc__Q53scn4step4hero8inactive9StateInitFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero11staffcredit9StateInit __vt__Q53scn4step4hero11staffcredit9StateInit: .4byte 0 .4byte 0 - .4byte 0x803A3DB0 - .4byte 0x803A3E2C - .4byte 0x803A3E78 - .4byte 0x8035550C - .4byte 0x803A3E7C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero11staffcredit9StateInitFv + .byte4 procAnim__Q53scn4step4hero11staffcredit9StateInitFv + .byte4 procMove__Q53scn4step4hero11staffcredit9StateInitFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero11staffcredit9StateInitFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateItemGet.s b/asm/src/StateItemGet.s index 74cc45c0..9263973e 100644 --- a/asm/src/StateItemGet.s +++ b/asm/src/StateItemGet.s @@ -240,11 +240,11 @@ procFixPos__Q53scn4step4hero7gimmick12StateItemGetFv: __vt__Q53scn4step4hero7gimmick12StateItemGet: .4byte 0 .4byte 0 - .4byte 0x803800BC - .4byte 0x803801D4 - .4byte 0x80380250 - .4byte 0x8035550C - .4byte 0x80380254 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick12StateItemGetFv + .byte4 procAnim__Q53scn4step4hero7gimmick12StateItemGetFv + .byte4 procMove__Q53scn4step4hero7gimmick12StateItemGetFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick12StateItemGetFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateJump.s b/asm/src/StateJump.s index 9248122d..6c7726e4 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 - .4byte 0x802467F0 ;# ptr - .4byte 0x80246870 ;# ptr - .4byte 0x802468A4 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802468E0 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6common9StateJumpFv + .byte4 procAnim__Q53scn4step4boss6common9StateJumpFv + .byte4 procMove__Q53scn4step4boss6common9StateJumpFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common9StateJumpFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9moundeath9StateJump __vt__Q53scn4step4boss9moundeath9StateJump: .4byte 0 .4byte 0 - .4byte 0x80255C6C ;# ptr - .4byte 0x80255C70 ;# ptr - .4byte 0x80255C74 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80255CD4 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9moundeath9StateJumpFv + .byte4 procAnim__Q53scn4step4boss9moundeath9StateJumpFv + .byte4 procMove__Q53scn4step4boss9moundeath9StateJumpFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9moundeath9StateJumpFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper9StateJump __vt__Q53scn4step5enemy7blipper9StateJump: .4byte 0 .4byte 0 - .4byte 0x8029B084 ;# ptr - .4byte 0x8029AFB0 ;# ptr - .4byte 0x8029AFB4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029B014 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7blipper9StateJumpFv + .byte4 procAnim__Q53scn4step5enemy7blipper9StateJumpFv + .byte4 procMove__Q53scn4step5enemy7blipper9StateJumpFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7blipper9StateJumpFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy9StateJump __vt__Q53scn4step5enemy6bouncy9StateJump: .4byte 0 .4byte 0 - .4byte 0x8029DBE0 ;# ptr - .4byte 0x8029D944 ;# ptr - .4byte 0x8029D9A0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029DAC4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6bouncy9StateJumpFv + .byte4 procAnim__Q53scn4step5enemy6bouncy9StateJumpFv + .byte4 procMove__Q53scn4step5enemy6bouncy9StateJumpFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6bouncy9StateJumpFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu9StateJump __vt__Q53scn4step5enemy4kabu9StateJump: .4byte 0 .4byte 0 - .4byte 0x802BD72C ;# ptr - .4byte 0x802BD730 ;# ptr - .4byte 0x802BD868 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802BD950 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy4kabu9StateJumpFv + .byte4 procAnim__Q53scn4step5enemy4kabu9StateJumpFv + .byte4 procMove__Q53scn4step5enemy4kabu9StateJumpFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4kabu9StateJumpFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6leafan9StateJump __vt__Q53scn4step5enemy6leafan9StateJump: .4byte 0 .4byte 0 - .4byte 0x802C3DD4 ;# ptr - .4byte 0x802C3BEC ;# ptr - .4byte 0x802C3C90 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C3D14 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6leafan9StateJumpFv + .byte4 procAnim__Q53scn4step5enemy6leafan9StateJumpFv + .byte4 procMove__Q53scn4step5enemy6leafan9StateJumpFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6leafan9StateJumpFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5rocky9StateJump __vt__Q53scn4step5enemy5rocky9StateJump: .4byte 0 .4byte 0 - .4byte 0x802D46F0 ;# ptr - .4byte 0x802D46F4 ;# ptr - .4byte 0x802D4870 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D48F0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5rocky9StateJumpFv + .byte4 procAnim__Q53scn4step5enemy5rocky9StateJumpFv + .byte4 procMove__Q53scn4step5enemy5rocky9StateJumpFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5rocky9StateJumpFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFallNoDecel$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFallNoDecel$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802DF00C ;# ptr - .4byte 0x802DEFF0 ;# ptr + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFallNoDecel$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFallNoDecel$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5sheld9StateJump __vt__Q53scn4step5enemy5sheld9StateJump: .4byte 0 .4byte 0 - .4byte 0x802DEE20 ;# ptr - .4byte 0x802DEE9C ;# ptr - .4byte 0x802DEF2C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802DEF30 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5sheld9StateJumpFv + .byte4 procAnim__Q53scn4step5enemy5sheld9StateJumpFv + .byte4 procMove__Q53scn4step5enemy5sheld9StateJumpFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5sheld9StateJumpFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802E1E08 ;# ptr - .4byte 0x802E1DEC ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9sirkibble9StateJump __vt__Q53scn4step5enemy9sirkibble9StateJump: .4byte 0 .4byte 0 - .4byte 0x802E1ABC ;# ptr - .4byte 0x802E1AC0 ;# ptr - .4byte 0x802E1C34 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E1CF4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9sirkibble9StateJumpFv + .byte4 procAnim__Q53scn4step5enemy9sirkibble9StateJumpFv + .byte4 procMove__Q53scn4step5enemy9sirkibble9StateJumpFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9sirkibble9StateJumpFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound9StateJump __vt__Q53scn4step5enemy11sisterbound9StateJump: .4byte 0 .4byte 0 - .4byte 0x802E2F34 ;# ptr - .4byte 0x802E2F38 ;# ptr - .4byte 0x802E2FE4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E3068 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11sisterbound9StateJumpFv + .byte4 procAnim__Q53scn4step5enemy11sisterbound9StateJumpFv + .byte4 procMove__Q53scn4step5enemy11sisterbound9StateJumpFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11sisterbound9StateJumpFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sparky9StateJump __vt__Q53scn4step5enemy6sparky9StateJump: .4byte 0 .4byte 0 - .4byte 0x802E7164 ;# ptr - .4byte 0x802E7168 ;# ptr - .4byte 0x802E72C4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E7348 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6sparky9StateJumpFv + .byte4 procAnim__Q53scn4step5enemy6sparky9StateJumpFv + .byte4 procMove__Q53scn4step5enemy6sparky9StateJumpFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6sparky9StateJumpFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage9StateJump __vt__Q53scn4step5enemy9tsukikage9StateJump: .4byte 0 .4byte 0 - .4byte 0x802EB588 ;# ptr - .4byte 0x802EB58C ;# ptr - .4byte 0x802EB65C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EB6F4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9tsukikage9StateJumpFv + .byte4 procAnim__Q53scn4step5enemy9tsukikage9StateJumpFv + .byte4 procMove__Q53scn4step5enemy9tsukikage9StateJumpFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9tsukikage9StateJumpFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledoo9StateJump __vt__Q53scn4step5enemy9waddledoo9StateJump: .4byte 0 .4byte 0 - .4byte 0x802EFFA4 ;# ptr - .4byte 0x802EFD08 ;# ptr - .4byte 0x802EFDD8 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EFE78 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledoo9StateJumpFv + .byte4 procAnim__Q53scn4step5enemy9waddledoo9StateJumpFv + .byte4 procMove__Q53scn4step5enemy9waddledoo9StateJumpFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9waddledoo9StateJumpFv + .byte4 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 - .4byte 0x80364C58 - .4byte 0x80364C10 + .byte4 __dt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common13StateJumpHold$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .byte4 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 - .4byte 0x80364C54 - .4byte 0x80364C30 + .byte4 __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .byte4 create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero6common9StateJump __vt__Q53scn4step4hero6common9StateJump: .4byte 0 .4byte 0 - .4byte 0x803646B4 - .4byte 0x80364730 - .4byte 0x80364938 - .4byte 0x8035550C - .4byte 0x803649CC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common9StateJumpFv + .byte4 procAnim__Q53scn4step4hero6common9StateJumpFv + .byte4 procMove__Q53scn4step4hero6common9StateJumpFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common9StateJumpFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 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 - .4byte 0x803A4630 - .4byte 0x803A45F0 + .byte4 __dt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv + .byte4 create__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateJump$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateJump$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x803A462C - .4byte 0x803A4610 + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateJump$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateJump$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero11staffcredit9StateJump __vt__Q53scn4step4hero11staffcredit9StateJump: .4byte 0 .4byte 0 - .4byte 0x803A4048 - .4byte 0x803A40C4 - .4byte 0x803A4234 - .4byte 0x8035550C - .4byte 0x803A448C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero11staffcredit9StateJumpFv + .byte4 procAnim__Q53scn4step4hero11staffcredit9StateJumpFv + .byte4 procMove__Q53scn4step4hero11staffcredit9StateJumpFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero11staffcredit9StateJumpFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateJumpAttack.s b/asm/src/StateJumpAttack.s index 6d081867..a2693f98 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 - .4byte 0x80246E98 ;# ptr - .4byte 0x80246E78 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4i$$1Fv + .byte4 create__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4i$$1Fv .global __vt__Q53scn4step4boss6common15StateJumpAttack __vt__Q53scn4step4boss6common15StateJumpAttack: .4byte 0 .4byte 0 - .4byte 0x80246C88 ;# ptr - .4byte 0x80246C8C ;# ptr - .4byte 0x80246CF8 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80246D40 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6common15StateJumpAttackFv + .byte4 procAnim__Q53scn4step4boss6common15StateJumpAttackFv + .byte4 procMove__Q53scn4step4boss6common15StateJumpAttackFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common15StateJumpAttackFv + .byte4 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 - .4byte 0x80261E0C ;# ptr - .4byte 0x80261E08 ;# ptr + .byte4 __dt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv + .byte4 create__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv .global __vt__Q53scn4step4boss9zankibble15StateJumpAttack __vt__Q53scn4step4boss9zankibble15StateJumpAttack: .4byte 0 .4byte 0 - .4byte 0x802619A4 ;# ptr - .4byte 0x802619A8 ;# ptr - .4byte 0x80261A14 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80261BDC ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9zankibble15StateJumpAttackFv + .byte4 procAnim__Q53scn4step4boss9zankibble15StateJumpAttackFv + .byte4 procMove__Q53scn4step4boss9zankibble15StateJumpAttackFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9zankibble15StateJumpAttackFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9sirkibble15StateJumpAttack __vt__Q53scn4step5enemy9sirkibble15StateJumpAttack: .4byte 0 .4byte 0 - .4byte 0x802E1E84 ;# ptr - .4byte 0x802E1E88 ;# ptr - .4byte 0x802E1FC4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E2038 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9sirkibble15StateJumpAttackFv + .byte4 procAnim__Q53scn4step5enemy9sirkibble15StateJumpAttackFv + .byte4 procMove__Q53scn4step5enemy9sirkibble15StateJumpAttackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9sirkibble15StateJumpAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage15StateJumpAttack __vt__Q53scn4step5enemy9tsukikage15StateJumpAttack: .4byte 0 .4byte 0 - .4byte 0x802EBF7C ;# ptr - .4byte 0x802EBAC4 ;# ptr - .4byte 0x802EBD38 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EBE24 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9tsukikage15StateJumpAttackFv + .byte4 procAnim__Q53scn4step5enemy9tsukikage15StateJumpAttackFv + .byte4 procMove__Q53scn4step5enemy9tsukikage15StateJumpAttackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9tsukikage15StateJumpAttackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256369 diff --git a/asm/src/StateJumpAttackStart.s b/asm/src/StateJumpAttackStart.s index c7e87726..cae45f3f 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 - .4byte 0x802470D0 ;# ptr - .4byte 0x802470AC ;# ptr + .byte4 __dt__Q24util144StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Ul$$1Fv + .byte4 create__Q24util144StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Ul$$1Fv .global __vt__Q53scn4step4boss6common20StateJumpAttackStart __vt__Q53scn4step4boss6common20StateJumpAttackStart: .4byte 0 .4byte 0 - .4byte 0x80246F5C ;# ptr - .4byte 0x80246F60 ;# ptr - .4byte 0x80247060 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802470A8 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6common20StateJumpAttackStartFv + .byte4 procAnim__Q53scn4step4boss6common20StateJumpAttackStartFv + .byte4 procMove__Q53scn4step4boss6common20StateJumpAttackStartFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common20StateJumpAttackStartFv + .byte4 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 - .4byte 0x80261F88 ;# ptr - .4byte 0x80261F3C ;# ptr + .byte4 __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1Fv + .byte4 create__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1Fv .global __vt__Q53scn4step4boss9zankibble20StateJumpAttackStart __vt__Q53scn4step4boss9zankibble20StateJumpAttackStart: .4byte 0 .4byte 0 - .4byte 0x80261E90 ;# ptr - .4byte 0x80261E94 ;# ptr - .4byte 0x80261F34 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80261F38 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9zankibble20StateJumpAttackStartFv + .byte4 procAnim__Q53scn4step4boss9zankibble20StateJumpAttackStartFv + .byte4 procMove__Q53scn4step4boss9zankibble20StateJumpAttackStartFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9zankibble20StateJumpAttackStartFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254946 diff --git a/asm/src/StateJumpBig.s b/asm/src/StateJumpBig.s index c7acd5f3..c6b64e27 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 - .4byte 0x802386C4 ;# ptr - .4byte 0x802386A8 ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss7bonkers12StateJumpBig __vt__Q53scn4step4boss7bonkers12StateJumpBig: .4byte 0 .4byte 0 - .4byte 0x80238394 ;# ptr - .4byte 0x80238414 ;# ptr - .4byte 0x802385C8 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802386A4 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss7bonkers12StateJumpBigFv + .byte4 procAnim__Q53scn4step4boss7bonkers12StateJumpBigFv + .byte4 procMove__Q53scn4step4boss7bonkers12StateJumpBigFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss7bonkers12StateJumpBigFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256288 diff --git a/asm/src/StateJumpBigStart.s b/asm/src/StateJumpBigStart.s index ad296835..20f6da2c 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 - .4byte 0x802387E8 ;# ptr - .4byte 0x802387CC ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers12StateJumpBig$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers12StateJumpBig$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss7bonkers17StateJumpBigStart __vt__Q53scn4step4boss7bonkers17StateJumpBigStart: .4byte 0 .4byte 0 - .4byte 0x80238728 ;# ptr - .4byte 0x8023872C ;# ptr - .4byte 0x802387C4 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802387C8 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss7bonkers17StateJumpBigStartFv + .byte4 procAnim__Q53scn4step4boss7bonkers17StateJumpBigStartFv + .byte4 procMove__Q53scn4step4boss7bonkers17StateJumpBigStartFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss7bonkers17StateJumpBigStartFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateJumpCenterAttack.s b/asm/src/StateJumpCenterAttack.s index d873633e..6e912df7 100644 --- a/asm/src/StateJumpCenterAttack.s +++ b/asm/src/StateJumpCenterAttack.s @@ -294,12 +294,12 @@ lbl_802542AC: __vt__Q53scn4step4boss8kingsdoo21StateJumpCenterAttack: .4byte 0 .4byte 0 - .4byte 0x80253FC8 ;# ptr - .4byte 0x80253FCC ;# ptr - .4byte 0x80254040 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80254220 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss8kingsdoo21StateJumpCenterAttackFv + .byte4 procAnim__Q53scn4step4boss8kingsdoo21StateJumpCenterAttackFv + .byte4 procMove__Q53scn4step4boss8kingsdoo21StateJumpCenterAttackFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss8kingsdoo21StateJumpCenterAttackFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256165 diff --git a/asm/src/StateJumpHold.s b/asm/src/StateJumpHold.s index 03aca241..5182dc3b 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 - .4byte 0x80365110 - .4byte 0x803650F0 + .byte4 __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .byte4 create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero6common13StateJumpHold __vt__Q53scn4step4hero6common13StateJumpHold: .4byte 0 .4byte 0 - .4byte 0x80364D8C - .4byte 0x80364E08 - .4byte 0x80364FB0 - .4byte 0x8035550C - .4byte 0x803650EC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common13StateJumpHoldFv + .byte4 procAnim__Q53scn4step4hero6common13StateJumpHoldFv + .byte4 procMove__Q53scn4step4hero6common13StateJumpHoldFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common13StateJumpHoldFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateJumpMachinegun.s b/asm/src/StateJumpMachinegun.s index 22d1189f..d1e3a667 100644 --- a/asm/src/StateJumpMachinegun.s +++ b/asm/src/StateJumpMachinegun.s @@ -407,12 +407,12 @@ reqMachinegun__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFv: __vt__Q53scn4step4boss8kingsdoo19StateJumpMachinegun: .4byte 0 .4byte 0 - .4byte 0x80254374 ;# ptr - .4byte 0x802543F4 ;# ptr - .4byte 0x802544F4 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80254610 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFv + .byte4 procAnim__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFv + .byte4 procMove__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256540 diff --git a/asm/src/StateJumpMachinegunStart.s b/asm/src/StateJumpMachinegunStart.s index 4f2b9d3d..94c32c87 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 - .4byte 0x802549C4 ;# ptr - .4byte 0x802549A8 ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo19StateJumpMachinegun$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo19StateJumpMachinegun$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart __vt__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStart: .4byte 0 .4byte 0 - .4byte 0x80254904 ;# ptr - .4byte 0x80254908 ;# ptr - .4byte 0x802549A0 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802549A4 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStartFv + .byte4 procAnim__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStartFv + .byte4 procMove__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStartFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStartFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateJumpStart.s b/asm/src/StateJumpStart.s index 12a8022e..4092b5b2 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 - .4byte 0x802472E4 ;# ptr - .4byte 0x802472E0 ;# ptr + .byte4 __dt__Q24util131StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Ul$$1Fv + .byte4 create__Q24util131StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Ul$$1Fv .global __vt__Q53scn4step4boss6common14StateJumpStart __vt__Q53scn4step4boss6common14StateJumpStart: .4byte 0 .4byte 0 - .4byte 0x802471D8 ;# ptr - .4byte 0x802471DC ;# ptr - .4byte 0x802472A0 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802472DC ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6common14StateJumpStartFv + .byte4 procAnim__Q53scn4step4boss6common14StateJumpStartFv + .byte4 procMove__Q53scn4step4boss6common14StateJumpStartFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common14StateJumpStartFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802DF2D4 ;# ptr - .4byte 0x802DF2B8 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5sheld14StateJumpStart __vt__Q53scn4step5enemy5sheld14StateJumpStart: .4byte 0 .4byte 0 - .4byte 0x802DF0F0 ;# ptr - .4byte 0x802DF0F4 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802DF1F4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5sheld14StateJumpStartFv + .byte4 procAnim__Q53scn4step5enemy5sheld14StateJumpStartFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5sheld14StateJumpStartFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound14StateJumpStart __vt__Q53scn4step5enemy11sisterbound14StateJumpStart: .4byte 0 .4byte 0 - .4byte 0x802E3178 ;# ptr - .4byte 0x802E317C ;# ptr - .4byte 0x802E320C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E332C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11sisterbound14StateJumpStartFv + .byte4 procAnim__Q53scn4step5enemy11sisterbound14StateJumpStartFv + .byte4 procMove__Q53scn4step5enemy11sisterbound14StateJumpStartFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11sisterbound14StateJumpStartFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80365620 - .4byte 0x803655DC + .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateJumpStart$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateJumpStart$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8036561C - .4byte 0x80365600 + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateJumpStart$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateJumpStart$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common14StateJumpStart __vt__Q53scn4step4hero6common14StateJumpStart: .4byte 0 .4byte 0 - .4byte 0x803653F0 - .4byte 0x80365480 - .4byte 0x803655D4 - .4byte 0x8035550C - .4byte 0x803655D8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common14StateJumpStartFv + .byte4 procAnim__Q53scn4step4hero6common14StateJumpStartFv + .byte4 procMove__Q53scn4step4hero6common14StateJumpStartFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common14StateJumpStartFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateKiss.s b/asm/src/StateKiss.s index c4cb2c58..ab492df6 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 - .4byte 0x803729C8 - .4byte 0x80372944 + .byte4 __dt__Q24util174StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference16StateKissReceive$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q43scn4step4hero11KissContext$$1Fv + .byte4 create__Q24util174StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference16StateKissReceive$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q43scn4step4hero11KissContext$$1Fv .global __vt__Q53scn4step4hero12interference9StateKiss __vt__Q53scn4step4hero12interference9StateKiss: .4byte 0 .4byte 0 - .4byte 0x8037218C - .4byte 0x803722F4 - .4byte 0x803726A4 - .4byte 0x8035550C - .4byte 0x803726A8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero12interference9StateKissFv + .byte4 procAnim__Q53scn4step4hero12interference9StateKissFv + .byte4 procMove__Q53scn4step4hero12interference9StateKissFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero12interference9StateKissFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateKissReceive.s b/asm/src/StateKissReceive.s index 2e8cfda7..a31b9eb1 100644 --- a/asm/src/StateKissReceive.s +++ b/asm/src/StateKissReceive.s @@ -446,13 +446,13 @@ procFixPos__Q53scn4step4hero12interference16StateKissReceiveFv: __vt__Q53scn4step4hero12interference16StateKissReceive: .4byte 0 .4byte 0 - .4byte 0x80372B6C - .4byte 0x80372CA8 - .4byte 0x80373034 - .4byte 0x8035550C - .4byte 0x80373038 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero12interference16StateKissReceiveFv + .byte4 procAnim__Q53scn4step4hero12interference16StateKissReceiveFv + .byte4 procMove__Q53scn4step4hero12interference16StateKissReceiveFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero12interference16StateKissReceiveFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateLadder.s b/asm/src/StateLadder.s index a3d8cfc5..e50b3b98 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 - .4byte 0x803665D0 - .4byte 0x803665B0 + .byte4 __dt__Q24util120StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateLadder$$4PQ43scn4step4hero4Hero$$4Q35mcoll6detail10LadderInfo$$1Fv + .byte4 create__Q24util120StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateLadder$$4PQ43scn4step4hero4Hero$$4Q35mcoll6detail10LadderInfo$$1Fv .global __vt__Q53scn4step4hero6common11StateLadder __vt__Q53scn4step4hero6common11StateLadder: .4byte 0 .4byte 0 - .4byte 0x80365EE4 - .4byte 0x80365FC0 - .4byte 0x803660E8 - .4byte 0x8035550C - .4byte 0x80366328 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common11StateLadderFv + .byte4 procAnim__Q53scn4step4hero6common11StateLadderFv + .byte4 procMove__Q53scn4step4hero6common11StateLadderFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common11StateLadderFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateLanding.s b/asm/src/StateLanding.s index dfa84acb..d1571843 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 - .4byte 0x802473A4 ;# ptr - .4byte 0x802473EC ;# ptr - .4byte 0x802473F0 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80247438 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6common12StateLandingFv + .byte4 procAnim__Q53scn4step4boss6common12StateLandingFv + .byte4 procMove__Q53scn4step4boss6common12StateLandingFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common12StateLandingFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common12StateLanding __vt__Q53scn4step5enemy6common12StateLanding: .4byte 0 .4byte 0 - .4byte 0x80292A64 ;# ptr - .4byte 0x80292A68 ;# ptr - .4byte 0x80292B98 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80292B9C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common12StateLandingFv + .byte4 procAnim__Q53scn4step5enemy6common12StateLandingFv + .byte4 procMove__Q53scn4step5enemy6common12StateLandingFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common12StateLandingFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper12StateLanding __vt__Q53scn4step5enemy7blipper12StateLanding: .4byte 0 .4byte 0 - .4byte 0x8029B298 ;# ptr - .4byte 0x8029B108 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029B1FC ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7blipper12StateLandingFv + .byte4 procAnim__Q53scn4step5enemy7blipper12StateLandingFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7blipper12StateLandingFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bonkersbomb12StateLanding __vt__Q53scn4step5enemy11bonkersbomb12StateLanding: .4byte 0 .4byte 0 - .4byte 0x8029C350 ;# ptr - .4byte 0x8029C354 ;# ptr - .4byte 0x8029C4E4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029C564 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11bonkersbomb12StateLandingFv + .byte4 procAnim__Q53scn4step5enemy11bonkersbomb12StateLandingFv + .byte4 procMove__Q53scn4step5enemy11bonkersbomb12StateLandingFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11bonkersbomb12StateLandingFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy12StateLanding __vt__Q53scn4step5enemy6bouncy12StateLanding: .4byte 0 .4byte 0 - .4byte 0x8029DC48 ;# ptr - .4byte 0x8029DC44 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6bouncy12StateLandingFv + .byte4 procAnim__Q53scn4step5enemy6bouncy12StateLandingFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6leafan12StateLanding __vt__Q53scn4step5enemy6leafan12StateLanding: .4byte 0 .4byte 0 - .4byte 0x802C3E38 ;# ptr - .4byte 0x802C3E3C ;# ptr - .4byte 0x802C3F6C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C3F70 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6leafan12StateLandingFv + .byte4 procAnim__Q53scn4step5enemy6leafan12StateLandingFv + .byte4 procMove__Q53scn4step5enemy6leafan12StateLandingFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6leafan12StateLandingFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802CCCF0 ;# ptr - .4byte 0x802CCCD4 ;# ptr + .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10parasoldee12StateLanding __vt__Q53scn4step5enemy10parasoldee12StateLanding: .4byte 0 .4byte 0 - .4byte 0x802CCA94 ;# ptr - .4byte 0x802CCB2C ;# ptr - .4byte 0x802CCBD0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802CCC24 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10parasoldee12StateLandingFv + .byte4 procAnim__Q53scn4step5enemy10parasoldee12StateLandingFv + .byte4 procMove__Q53scn4step5enemy10parasoldee12StateLandingFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10parasoldee12StateLandingFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802CEB3C ;# ptr - .4byte 0x802CEB20 ;# ptr + .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10parasoldoo12StateLanding __vt__Q53scn4step5enemy10parasoldoo12StateLanding: .4byte 0 .4byte 0 - .4byte 0x802CE8F8 ;# ptr - .4byte 0x802CE978 ;# ptr - .4byte 0x802CEA1C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802CEA70 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10parasoldoo12StateLandingFv + .byte4 procAnim__Q53scn4step5enemy10parasoldoo12StateLandingFv + .byte4 procMove__Q53scn4step5enemy10parasoldoo12StateLandingFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10parasoldoo12StateLandingFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10StateSlope$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10StateSlope$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802D4E3C ;# ptr - .4byte 0x802D4E20 ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10StateSlope$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10StateSlope$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5rocky12StateLanding __vt__Q53scn4step5enemy5rocky12StateLanding: .4byte 0 .4byte 0 - .4byte 0x802D4A74 ;# ptr - .4byte 0x802D4A78 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D4B60 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5rocky12StateLandingFv + .byte4 procAnim__Q53scn4step5enemy5rocky12StateLandingFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5rocky12StateLandingFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound12StateLanding __vt__Q53scn4step5enemy11sisterbound12StateLanding: .4byte 0 .4byte 0 - .4byte 0x802E3480 ;# ptr - .4byte 0x802E3484 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E3488 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11sisterbound12StateLandingFv + .byte4 procAnim__Q53scn4step5enemy11sisterbound12StateLandingFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11sisterbound12StateLandingFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage12StateLanding __vt__Q53scn4step5enemy9tsukikage12StateLanding: .4byte 0 .4byte 0 - .4byte 0x802EBFF8 ;# ptr - .4byte 0x802EC078 ;# ptr - .4byte 0x802EC108 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EC10C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9tsukikage12StateLandingFv + .byte4 procAnim__Q53scn4step5enemy9tsukikage12StateLandingFv + .byte4 procMove__Q53scn4step5enemy9tsukikage12StateLandingFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9tsukikage12StateLandingFv + .byte4 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 - .4byte 0x80390E68 - .4byte 0x80390E48 + .byte4 __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateWait$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .byte4 create__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateWait$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv .global __vt__Q53scn4step4hero5stone12StateLanding __vt__Q53scn4step4hero5stone12StateLanding: .4byte 0 .4byte 0 - .4byte 0x80390B14 - .4byte 0x80390B88 - .4byte 0x80390D50 - .4byte 0x8035550C - .4byte 0x80390D90 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5stone12StateLandingFv + .byte4 procAnim__Q53scn4step4hero5stone12StateLandingFv + .byte4 procMove__Q53scn4step4hero5stone12StateLandingFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5stone12StateLandingFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/StateLaugh.s b/asm/src/StateLaugh.s index 64e3c9cb..0c8b3a15 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 - .4byte 0x80240F48 ;# ptr - .4byte 0x80240F2C ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StateLaugh$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StateLaugh$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster10StateLaugh __vt__Q53scn4step4boss15challengemaster10StateLaugh: .4byte 0 .4byte 0 - .4byte 0x80240DE0 ;# ptr - .4byte 0x80240E60 ;# ptr - .4byte 0x80240F24 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80240F28 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster10StateLaughFv + .byte4 procAnim__Q53scn4step4boss15challengemaster10StateLaughFv + .byte4 procMove__Q53scn4step4boss15challengemaster10StateLaughFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster10StateLaughFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateLeaveChallengeDoor.s b/asm/src/StateLeaveChallengeDoor.s index 97ae1690..3720ed90 100644 --- a/asm/src/StateLeaveChallengeDoor.s +++ b/asm/src/StateLeaveChallengeDoor.s @@ -417,13 +417,13 @@ procFixPos__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFv: __vt__Q53scn4step4hero7gimmick23StateLeaveChallengeDoor: .4byte 0 .4byte 0 - .4byte 0x80380418 - .4byte 0x80380578 - .4byte 0x803807E8 - .4byte 0x8035550C - .4byte 0x80380830 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFv + .byte4 procAnim__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFv + .byte4 procMove__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateLeaveLvMapDoor.s b/asm/src/StateLeaveLvMapDoor.s index a0ae152c..a9f2df37 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 - .4byte 0x80380E54 - .4byte 0x80380E10 + .byte4 __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick20StateUnlockLvMapDoor$$4PQ43scn4step4hero4Hero$$4i$$1Fv + .byte4 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 - .4byte 0x80380E50 - .4byte 0x80380E30 + .byte4 __dt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick18StateAllStageClear$$4PQ43scn4step4hero4Hero$$4i$$1Fv + .byte4 create__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick18StateAllStageClear$$4PQ43scn4step4hero4Hero$$4i$$1Fv .global __vt__Q53scn4step4hero7gimmick19StateLeaveLvMapDoor __vt__Q53scn4step4hero7gimmick19StateLeaveLvMapDoor: .4byte 0 .4byte 0 - .4byte 0x803809C8 - .4byte 0x80380A7C - .4byte 0x80380DD0 - .4byte 0x8035550C - .4byte 0x80380E0C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick19StateLeaveLvMapDoorFv + .byte4 procAnim__Q53scn4step4hero7gimmick19StateLeaveLvMapDoorFv + .byte4 procMove__Q53scn4step4hero7gimmick19StateLeaveLvMapDoorFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick19StateLeaveLvMapDoorFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateLeaveMahoroa.s b/asm/src/StateLeaveMahoroa.s index f24407b5..6df8f471 100644 --- a/asm/src/StateLeaveMahoroa.s +++ b/asm/src/StateLeaveMahoroa.s @@ -356,13 +356,13 @@ distance__Q53scn4step4hero7gimmick17StateLeaveMahoroaFv: __vt__Q53scn4step4hero7gimmick17StateLeaveMahoroa: .4byte 0 .4byte 0 - .4byte 0x80380FB4 - .4byte 0x80381024 - .4byte 0x803812E0 - .4byte 0x8035550C - .4byte 0x803812E4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick17StateLeaveMahoroaFv + .byte4 procAnim__Q53scn4step4hero7gimmick17StateLeaveMahoroaFv + .byte4 procMove__Q53scn4step4hero7gimmick17StateLeaveMahoroaFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick17StateLeaveMahoroaFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateLeaveSubgameDoor.s b/asm/src/StateLeaveSubgameDoor.s index 566e27fa..a944b7b1 100644 --- a/asm/src/StateLeaveSubgameDoor.s +++ b/asm/src/StateLeaveSubgameDoor.s @@ -274,13 +274,13 @@ mfCinemaScopeDisable__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFv: __vt__Q53scn4step4hero7gimmick21StateLeaveSubgameDoor: .4byte 0 .4byte 0 - .4byte 0x803814E8 - .4byte 0x803815B8 - .4byte 0x803816BC - .4byte 0x8035550C - .4byte 0x803816C0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFv + .byte4 procAnim__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFv + .byte4 procMove__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateLink.s b/asm/src/StateLink.s index 0060b2d5..ac6cfa80 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 - .4byte 0x802CB3CC ;# ptr - .4byte 0x802CB3AC ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateRise$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateRise$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy7parasol9StateLink __vt__Q53scn4step5enemy7parasol9StateLink: .4byte 0 .4byte 0 - .4byte 0x802CB3C8 ;# ptr - .4byte 0x802CB2AC ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7parasol9StateLinkFv + .byte4 procAnim__Q53scn4step5enemy7parasol9StateLinkFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256687 diff --git a/asm/src/StateLogout.s b/asm/src/StateLogout.s index e082deb4..422ebe5a 100644 --- a/asm/src/StateLogout.s +++ b/asm/src/StateLogout.s @@ -220,11 +220,11 @@ procFixPos__Q53scn4step4hero6common11StateLogoutFv: __vt__Q53scn4step4hero6common11StateLogout: .4byte 0 .4byte 0 - .4byte 0x803668BC - .4byte 0x803668C0 - .4byte 0x803668C4 - .4byte 0x8035550C - .4byte 0x803668C8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common11StateLogoutFv + .byte4 procAnim__Q53scn4step4hero6common11StateLogoutFv + .byte4 procMove__Q53scn4step4hero6common11StateLogoutFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common11StateLogoutFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateLookAround.s b/asm/src/StateLookAround.s index 58f80b7c..5a14d27f 100644 --- a/asm/src/StateLookAround.s +++ b/asm/src/StateLookAround.s @@ -45,9 +45,9 @@ __dt__Q53scn4step5enemy6chilly15StateLookAroundFv: __vt__Q53scn4step5enemy6chilly15StateLookAround: .4byte 0 .4byte 0 - .4byte 0x802A68EC ;# ptr - .4byte 0x802A68E4 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A68E8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6chilly15StateLookAroundFv + .byte4 procAnim__Q53scn4step5enemy6chilly15StateLookAroundFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6chilly15StateLookAroundFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateLookBoss.s b/asm/src/StateLookBoss.s index 8793d2d2..6ea53d8f 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 - .4byte 0x803A4D94 - .4byte 0x803A4D74 + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 - .4byte 0x803A4D90 - .4byte 0x803A4D54 + .byte4 __dt__Q24util129StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit13StateLookBoss$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv + .byte4 create__Q24util129StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit13StateLookBoss$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv .global __vt__Q53scn4step4hero11staffcredit13StateLookBoss __vt__Q53scn4step4hero11staffcredit13StateLookBoss: .4byte 0 .4byte 0 - .4byte 0x803A4760 - .4byte 0x803A47DC - .4byte 0x803A49E4 - .4byte 0x8035550C - .4byte 0x803A49E8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero11staffcredit13StateLookBossFv + .byte4 procAnim__Q53scn4step4hero11staffcredit13StateLookBossFv + .byte4 procMove__Q53scn4step4hero11staffcredit13StateLookBossFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero11staffcredit13StateLookBossFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateLose.s b/asm/src/StateLose.s index 24fb0784..4947ba85 100644 --- a/asm/src/StateLose.s +++ b/asm/src/StateLose.s @@ -88,9 +88,9 @@ procFixPos__Q53scn4step4boss15challengemaster9StateLoseFv: __vt__Q53scn4step4boss15challengemaster9StateLose: .4byte 0 .4byte 0 - .4byte 0x80241030 ;# ptr - .4byte 0x80241034 ;# ptr - .4byte 0x80241038 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024103C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster9StateLoseFv + .byte4 procAnim__Q53scn4step4boss15challengemaster9StateLoseFv + .byte4 procMove__Q53scn4step4boss15challengemaster9StateLoseFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster9StateLoseFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateLoseFly.s b/asm/src/StateLoseFly.s index ed9379fe..3464bd96 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 - .4byte 0x802416BC ;# ptr + .byte4 __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 - .4byte 0x802416B8 ;# ptr - .4byte 0x8024169C ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateLose$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateLose$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster12StateLoseFly __vt__Q53scn4step4boss15challengemaster12StateLoseFly: .4byte 0 .4byte 0 - .4byte 0x80241178 ;# ptr - .4byte 0x8024117C ;# ptr - .4byte 0x80241340 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802415F8 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster12StateLoseFlyFv + .byte4 procAnim__Q53scn4step4boss15challengemaster12StateLoseFlyFv + .byte4 procMove__Q53scn4step4boss15challengemaster12StateLoseFlyFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster12StateLoseFlyFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256401 diff --git a/asm/src/StateLostHat.s b/asm/src/StateLostHat.s index 55f347a3..a2a37365 100644 --- a/asm/src/StateLostHat.s +++ b/asm/src/StateLostHat.s @@ -123,9 +123,9 @@ procFixPos__Q53scn4step5enemy5cappy12StateLostHatFv: __vt__Q53scn4step5enemy5cappy12StateLostHat: .4byte 0 .4byte 0 - .4byte 0x802A337C ;# ptr - .4byte 0x802A3380 ;# ptr - .4byte 0x802A3448 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A349C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5cappy12StateLostHatFv + .byte4 procAnim__Q53scn4step5enemy5cappy12StateLostHatFv + .byte4 procMove__Q53scn4step5enemy5cappy12StateLostHatFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5cappy12StateLostHatFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateMain.s b/asm/src/StateMain.s index a1b397b8..195a09ae 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 - .4byte 0x802C4904 ;# ptr - .4byte 0x802C4908 ;# ptr - .4byte 0x802C4960 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C49E8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9mbossdead9StateMainFv + .byte4 procAnim__Q53scn4step5enemy9mbossdead9StateMainFv + .byte4 procMove__Q53scn4step5enemy9mbossdead9StateMainFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9mbossdead9StateMainFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon7airball9StateMain __vt__Q53scn4step6weapon7airball9StateMain: .4byte 0 .4byte 0 - .4byte 0x803DB650 - .4byte 0x803DB3D4 - .4byte 0x803DB444 - .4byte 0x803D895C - .4byte 0x803DB4C8 - .4byte 0x803DB53C + .byte4 __dt__Q53scn4step6weapon7airball9StateMainFv + .byte4 procAnim__Q53scn4step6weapon7airball9StateMainFv + .byte4 procMove__Q53scn4step6weapon7airball9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon7airball9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon7airball9StateMainFv .global __vt__Q53scn4step6weapon17fireburningbullet9StateMain __vt__Q53scn4step6weapon17fireburningbullet9StateMain: .4byte 0 .4byte 0 - .4byte 0x803DB768 - .4byte 0x803DB76C - .4byte 0x803DB8C8 - .4byte 0x803D895C - .4byte 0x803DB92C - .4byte 0x803DBAA8 + .byte4 __dt__Q53scn4step6weapon17fireburningbullet9StateMainFv + .byte4 procAnim__Q53scn4step6weapon17fireburningbullet9StateMainFv + .byte4 procMove__Q53scn4step6weapon17fireburningbullet9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon17fireburningbullet9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon17fireburningbullet9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon11starshotlv19StateMain __vt__Q53scn4step6weapon11starshotlv19StateMain: .4byte 0 .4byte 0 - .4byte 0x803DC4A4 - .4byte 0x803DC51C - .4byte 0x803DC774 - .4byte 0x803D895C - .4byte 0x803DC7C4 - .4byte 0x803DC7C8 + .byte4 __dt__Q53scn4step6weapon11starshotlv19StateMainFv + .byte4 procAnim__Q53scn4step6weapon11starshotlv19StateMainFv + .byte4 procMove__Q53scn4step6weapon11starshotlv19StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon11starshotlv19StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon11starshotlv19StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon11starshotlv29StateMain __vt__Q53scn4step6weapon11starshotlv29StateMain: .4byte 0 .4byte 0 - .4byte 0x803DCDD0 - .4byte 0x803DCE48 - .4byte 0x803DD054 - .4byte 0x803D895C - .4byte 0x803DD058 - .4byte 0x803DD05C + .byte4 __dt__Q53scn4step6weapon11starshotlv29StateMainFv + .byte4 procAnim__Q53scn4step6weapon11starshotlv29StateMainFv + .byte4 procMove__Q53scn4step6weapon11starshotlv29StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon11starshotlv29StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon11starshotlv29StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon11starshotlv39StateMain __vt__Q53scn4step6weapon11starshotlv39StateMain: .4byte 0 .4byte 0 - .4byte 0x803DD524 - .4byte 0x803DD528 - .4byte 0x803DD7A0 - .4byte 0x803D895C - .4byte 0x803DD7A4 - .4byte 0x803DD7A8 + .byte4 __dt__Q53scn4step6weapon11starshotlv39StateMainFv + .byte4 procAnim__Q53scn4step6weapon11starshotlv39StateMainFv + .byte4 procMove__Q53scn4step6weapon11starshotlv39StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon11starshotlv39StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon11starshotlv39StateMainFv .global __vt__Q53scn4step6weapon11waterpistol9StateMain __vt__Q53scn4step6weapon11waterpistol9StateMain: .4byte 0 .4byte 0 - .4byte 0x803DE040 - .4byte 0x803DDA38 - .4byte 0x803DDA9C - .4byte 0x803D895C - .4byte 0x803DDD90 - .4byte 0x803DDE04 + .byte4 __dt__Q53scn4step6weapon11waterpistol9StateMainFv + .byte4 procAnim__Q53scn4step6weapon11waterpistol9StateMainFv + .byte4 procMove__Q53scn4step6weapon11waterpistol9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon11waterpistol9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon11waterpistol9StateMainFv .global __vt__Q53scn4step6weapon9swordbeam9StateMain __vt__Q53scn4step6weapon9swordbeam9StateMain: .4byte 0 .4byte 0 - .4byte 0x803DE3FC - .4byte 0x803DE288 - .4byte 0x803DE2E0 - .4byte 0x803D895C - .4byte 0x803DE358 - .4byte 0x803DE35C + .byte4 __dt__Q53scn4step6weapon9swordbeam9StateMainFv + .byte4 procAnim__Q53scn4step6weapon9swordbeam9StateMainFv + .byte4 procMove__Q53scn4step6weapon9swordbeam9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon9swordbeam9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon9swordbeam9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13whispyairball9StateMain __vt__Q53scn4step6weapon13whispyairball9StateMain: .4byte 0 .4byte 0 - .4byte 0x803DEA3C - .4byte 0x803DE6E4 - .4byte 0x803DE6E8 - .4byte 0x803D895C - .4byte 0x803DE6EC - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon13whispyairball9StateMainFv + .byte4 procAnim__Q53scn4step6weapon13whispyairball9StateMainFv + .byte4 procMove__Q53scn4step6weapon13whispyairball9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon13whispyairball9StateMainFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon7rollexp9StateMain __vt__Q53scn4step6weapon7rollexp9StateMain: .4byte 0 .4byte 0 - .4byte 0x803DF074 - .4byte 0x803DEF88 - .4byte 0x803D8958 - .4byte 0x803D895C - .4byte 0x803D8960 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon7rollexp9StateMainFv + .byte4 procAnim__Q53scn4step6weapon7rollexp9StateMainFv + .byte4 procMove__Q43scn4step6weapon9StateBaseFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q43scn4step6weapon9StateBaseFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12leafanpollen9StateMain __vt__Q53scn4step6weapon12leafanpollen9StateMain: .4byte 0 .4byte 0 - .4byte 0x803DF644 - .4byte 0x803DF2B0 - .4byte 0x803DF3B4 - .4byte 0x803D895C - .4byte 0x803DF490 - .4byte 0x803DF54C + .byte4 __dt__Q53scn4step6weapon12leafanpollen9StateMainFv + .byte4 procAnim__Q53scn4step6weapon12leafanpollen9StateMainFv + .byte4 procMove__Q53scn4step6weapon12leafanpollen9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon12leafanpollen9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon12leafanpollen9StateMainFv .global __vt__Q53scn4step6weapon16kingsdoowaveshot9StateMain __vt__Q53scn4step6weapon16kingsdoowaveshot9StateMain: .4byte 0 .4byte 0 - .4byte 0x803DFC14 - .4byte 0x803DF850 - .4byte 0x803DF8A8 - .4byte 0x803D895C - .4byte 0x803DF8EC - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon16kingsdoowaveshot9StateMainFv + .byte4 procAnim__Q53scn4step6weapon16kingsdoowaveshot9StateMainFv + .byte4 procMove__Q53scn4step6weapon16kingsdoowaveshot9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon16kingsdoowaveshot9StateMainFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .global __vt__Q53scn4step6weapon14gigantedgeshot9StateMain __vt__Q53scn4step6weapon14gigantedgeshot9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E0170 - .4byte 0x803DFEC8 - .4byte 0x803DFF20 - .4byte 0x803D895C - .4byte 0x803DFF24 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon14gigantedgeshot9StateMainFv + .byte4 procAnim__Q53scn4step6weapon14gigantedgeshot9StateMainFv + .byte4 procMove__Q53scn4step6weapon14gigantedgeshot9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon14gigantedgeshot9StateMainFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13gigatzobullet9StateMain __vt__Q53scn4step6weapon13gigatzobullet9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E1F48 - .4byte 0x803E0954 - .4byte 0x803E0A04 - .4byte 0x803D895C - .4byte 0x803E0B14 - .4byte 0x803E0CF8 + .byte4 __dt__Q53scn4step6weapon13gigatzobullet9StateMainFv + .byte4 procAnim__Q53scn4step6weapon13gigatzobullet9StateMainFv + .byte4 procMove__Q53scn4step6weapon13gigatzobullet9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon13gigatzobullet9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon13gigatzobullet9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10comothread9StateMain __vt__Q53scn4step6weapon10comothread9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E2738 - .4byte 0x803E23DC - .4byte 0x803E23E0 - .4byte 0x803D895C - .4byte 0x803E23E4 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon10comothread9StateMainFv + .byte4 procAnim__Q53scn4step6weapon10comothread9StateMainFv + .byte4 procMove__Q53scn4step6weapon10comothread9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon10comothread9StateMainFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .global __vt__Q53scn4step6weapon18watergalboroswater9StateMain __vt__Q53scn4step6weapon18watergalboroswater9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E2814 - .4byte 0x803E2818 - .4byte 0x803E287C - .4byte 0x803D895C - .4byte 0x803E28D4 - .4byte 0x803E2918 + .byte4 __dt__Q53scn4step6weapon18watergalboroswater9StateMainFv + .byte4 procAnim__Q53scn4step6weapon18watergalboroswater9StateMainFv + .byte4 procMove__Q53scn4step6weapon18watergalboroswater9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon18watergalboroswater9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon18watergalboroswater9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon16enemywaterbullet9StateMain __vt__Q53scn4step6weapon16enemywaterbullet9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E2E00 - .4byte 0x803E2E9C - .4byte 0x803E3088 - .4byte 0x803E3158 - .4byte 0x803E3254 - .4byte 0x803E337C + .byte4 __dt__Q53scn4step6weapon16enemywaterbullet9StateMainFv + .byte4 procAnim__Q53scn4step6weapon16enemywaterbullet9StateMainFv + .byte4 procMove__Q53scn4step6weapon16enemywaterbullet9StateMainFv + .byte4 procConstraint__Q53scn4step6weapon16enemywaterbullet9StateMainFv + .byte4 procFixPos__Q53scn4step6weapon16enemywaterbullet9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon16enemywaterbullet9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon20enemywaterbulletwarp9StateMain __vt__Q53scn4step6weapon20enemywaterbulletwarp9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E37E8 - .4byte 0x803D8954 - .4byte 0x803D8958 - .4byte 0x803D895C - .4byte 0x803D8960 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon20enemywaterbulletwarp9StateMainFv + .byte4 procAnim__Q43scn4step6weapon9StateBaseFv + .byte4 procMove__Q43scn4step6weapon9StateBaseFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q43scn4step6weapon9StateBaseFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .global __vt__Q53scn4step6weapon15cutterfinalwave9StateMain __vt__Q53scn4step6weapon15cutterfinalwave9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E390C - .4byte 0x803E3910 - .4byte 0x803E396C - .4byte 0x803D895C - .4byte 0x803E39D0 - .4byte 0x803E3A24 + .byte4 __dt__Q53scn4step6weapon15cutterfinalwave9StateMainFv + .byte4 procAnim__Q53scn4step6weapon15cutterfinalwave9StateMainFv + .byte4 procMove__Q53scn4step6weapon15cutterfinalwave9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon15cutterfinalwave9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon15cutterfinalwave9StateMainFv .global __vt__Q53scn4step6weapon12sparkshotlv19StateMain __vt__Q53scn4step6weapon12sparkshotlv19StateMain: .4byte 0 .4byte 0 - .4byte 0x803E3CA0 - .4byte 0x803E3BA8 - .4byte 0x803E3C00 - .4byte 0x803D895C - .4byte 0x803E3C04 - .4byte 0x803E3C08 + .byte4 __dt__Q53scn4step6weapon12sparkshotlv19StateMainFv + .byte4 procAnim__Q53scn4step6weapon12sparkshotlv19StateMainFv + .byte4 procMove__Q53scn4step6weapon12sparkshotlv19StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon12sparkshotlv19StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon12sparkshotlv19StateMainFv .global __vt__Q53scn4step6weapon12sparkshotlv29StateMain __vt__Q53scn4step6weapon12sparkshotlv29StateMain: .4byte 0 .4byte 0 - .4byte 0x803E3E30 - .4byte 0x803E3D74 - .4byte 0x803E3DCC - .4byte 0x803D895C - .4byte 0x803E3DD0 - .4byte 0x803E3DD4 + .byte4 __dt__Q53scn4step6weapon12sparkshotlv29StateMainFv + .byte4 procAnim__Q53scn4step6weapon12sparkshotlv29StateMainFv + .byte4 procMove__Q53scn4step6weapon12sparkshotlv29StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon12sparkshotlv29StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon12sparkshotlv29StateMainFv .global __vt__Q53scn4step6weapon12sparkshotlv39StateMain __vt__Q53scn4step6weapon12sparkshotlv39StateMain: .4byte 0 .4byte 0 - .4byte 0x803E3F60 - .4byte 0x803E3EFC - .4byte 0x803E3F54 - .4byte 0x803D895C - .4byte 0x803E3F58 - .4byte 0x803E3F5C + .byte4 __dt__Q53scn4step6weapon12sparkshotlv39StateMainFv + .byte4 procAnim__Q53scn4step6weapon12sparkshotlv39StateMainFv + .byte4 procMove__Q53scn4step6weapon12sparkshotlv39StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon12sparkshotlv39StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon12sparkshotlv39StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803E463C - .4byte 0x803E4614 + .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 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 - .4byte 0x803E4638 - .4byte 0x803E45B4 + .byte4 __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .byte4 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 - .4byte 0x803E4634 - .4byte 0x803E45D4 + .byte4 __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .byte4 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 - .4byte 0x803E4630 - .4byte 0x803E45F4 + .byte4 __dt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .byte4 create__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv .global __vt__Q53scn4step6weapon10spearspear9StateMain __vt__Q53scn4step6weapon10spearspear9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E41C4 - .4byte 0x803E4250 - .4byte 0x803E42BC - .4byte 0x803E4314 - .4byte 0x803E4470 - .4byte 0x803E45B0 + .byte4 __dt__Q53scn4step6weapon10spearspear9StateMainFv + .byte4 procAnim__Q53scn4step6weapon10spearspear9StateMainFv + .byte4 procMove__Q53scn4step6weapon10spearspear9StateMainFv + .byte4 procConstraint__Q53scn4step6weapon10spearspear9StateMainFv + .byte4 procFixPos__Q53scn4step6weapon10spearspear9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon10spearspear9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803E5AF0 - .4byte 0x803E5AD4 + .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon12hammerhammer9StateMain __vt__Q53scn4step6weapon12hammerhammer9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E5880 - .4byte 0x803E58FC - .4byte 0x803E59C4 - .4byte 0x803D895C - .4byte 0x803E59C8 - .4byte 0x803E59CC + .byte4 __dt__Q53scn4step6weapon12hammerhammer9StateMainFv + .byte4 procAnim__Q53scn4step6weapon12hammerhammer9StateMainFv + .byte4 procMove__Q53scn4step6weapon12hammerhammer9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon12hammerhammer9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon12hammerhammer9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8wingshot9StateMain __vt__Q53scn4step6weapon8wingshot9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E5DA8 - .4byte 0x803E5DAC - .4byte 0x803E5E8C - .4byte 0x803D895C - .4byte 0x803E5EE0 - .4byte 0x803E5EE4 + .byte4 __dt__Q53scn4step6weapon8wingshot9StateMainFv + .byte4 procAnim__Q53scn4step6weapon8wingshot9StateMainFv + .byte4 procMove__Q53scn4step6weapon8wingshot9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon8wingshot9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon8wingshot9StateMainFv .global __vt__Q53scn4step6weapon13wingshockwave9StateMain __vt__Q53scn4step6weapon13wingshockwave9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E6080 - .4byte 0x803E6084 - .4byte 0x803E6164 - .4byte 0x803D895C - .4byte 0x803E61C8 - .4byte 0x803E61CC + .byte4 __dt__Q53scn4step6weapon13wingshockwave9StateMainFv + .byte4 procAnim__Q53scn4step6weapon13wingshockwave9StateMainFv + .byte4 procMove__Q53scn4step6weapon13wingshockwave9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon13wingshockwave9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon13wingshockwave9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803E6698 - .4byte 0x803E667C + .byte4 __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon16fightersmashshot9StateMain __vt__Q53scn4step6weapon16fightersmashshot9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E6490 - .4byte 0x803E650C - .4byte 0x803E6580 - .4byte 0x803D895C - .4byte 0x803E65E4 - .4byte 0x803E65E8 + .byte4 __dt__Q53scn4step6weapon16fightersmashshot9StateMainFv + .byte4 procAnim__Q53scn4step6weapon16fightersmashshot9StateMainFv + .byte4 procMove__Q53scn4step6weapon16fightersmashshot9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon16fightersmashshot9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon16fightersmashshot9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803E6AB0 - .4byte 0x803E6A94 + .byte4 __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon15fighterkickshot9StateMain __vt__Q53scn4step6weapon15fighterkickshot9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E68A8 - .4byte 0x803E6924 - .4byte 0x803E6998 - .4byte 0x803D895C - .4byte 0x803E69FC - .4byte 0x803E6A00 + .byte4 __dt__Q53scn4step6weapon15fighterkickshot9StateMainFv + .byte4 procAnim__Q53scn4step6weapon15fighterkickshot9StateMainFv + .byte4 procMove__Q53scn4step6weapon15fighterkickshot9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon15fighterkickshot9StateMainFv + .byte4 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 - .4byte 0x803E728C - .4byte 0x803E726C + .byte4 __dt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1Fv + .byte4 create__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1Fv .global __vt__Q53scn4step6weapon16fighterhadoushot9StateMain __vt__Q53scn4step6weapon16fighterhadoushot9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E7040 - .4byte 0x803E70CC - .4byte 0x803E7104 - .4byte 0x803D895C - .4byte 0x803E7108 - .4byte 0x803E710C + .byte4 __dt__Q53scn4step6weapon16fighterhadoushot9StateMainFv + .byte4 procAnim__Q53scn4step6weapon16fighterhadoushot9StateMainFv + .byte4 procMove__Q53scn4step6weapon16fighterhadoushot9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon16fighterhadoushot9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon16fighterhadoushot9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12shotzobullet9StateMain __vt__Q53scn4step6weapon12shotzobullet9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E77F0 - .4byte 0x803E7564 - .4byte 0x803E768C - .4byte 0x803D895C - .4byte 0x803D8960 - .4byte 0x803E7730 + .byte4 __dt__Q53scn4step6weapon12shotzobullet9StateMainFv + .byte4 procAnim__Q53scn4step6weapon12shotzobullet9StateMainFv + .byte4 procMove__Q53scn4step6weapon12shotzobullet9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q43scn4step6weapon9StateBaseFv + .byte4 procObjCollReact__Q53scn4step6weapon12shotzobullet9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon15sirkibblecutter9StateMain __vt__Q53scn4step6weapon15sirkibblecutter9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E7B54 - .4byte 0x803E7BCC - .4byte 0x803E7C30 - .4byte 0x803D895C - .4byte 0x803E7CEC - .4byte 0x803E7EDC + .byte4 __dt__Q53scn4step6weapon15sirkibblecutter9StateMainFv + .byte4 procAnim__Q53scn4step6weapon15sirkibblecutter9StateMainFv + .byte4 procMove__Q53scn4step6weapon15sirkibblecutter9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon15sirkibblecutter9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon15sirkibblecutter9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13owgulffeather9StateMain __vt__Q53scn4step6weapon13owgulffeather9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E8284 - .4byte 0x803E8300 - .4byte 0x803E837C - .4byte 0x803D895C - .4byte 0x803D8960 - .4byte 0x803E8380 + .byte4 __dt__Q53scn4step6weapon13owgulffeather9StateMainFv + .byte4 procAnim__Q53scn4step6weapon13owgulffeather9StateMainFv + .byte4 procMove__Q53scn4step6weapon13owgulffeather9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q43scn4step6weapon9StateBaseFv + .byte4 procObjCollReact__Q53scn4step6weapon13owgulffeather9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon9foleyleaf9StateMain __vt__Q53scn4step6weapon9foleyleaf9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E87F0 - .4byte 0x803D8954 - .4byte 0x803E86FC - .4byte 0x803D895C - .4byte 0x803E8774 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon9foleyleaf9StateMainFv + .byte4 procAnim__Q43scn4step6weapon9StateBaseFv + .byte4 procMove__Q53scn4step6weapon9foleyleaf9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon9foleyleaf9StateMainFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10bowbyarrow9StateMain __vt__Q53scn4step6weapon10bowbyarrow9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E9490 - .4byte 0x803E8EB8 - .4byte 0x803E9074 - .4byte 0x803D895C - .4byte 0x803E9208 - .4byte 0x803E93B0 + .byte4 __dt__Q53scn4step6weapon10bowbyarrow9StateMainFv + .byte4 procAnim__Q53scn4step6weapon10bowbyarrow9StateMainFv + .byte4 procMove__Q53scn4step6weapon10bowbyarrow9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon10bowbyarrow9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon10bowbyarrow9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12jucklecutter9StateMain __vt__Q53scn4step6weapon12jucklecutter9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E98C4 - .4byte 0x803E9694 - .4byte 0x803E9730 - .4byte 0x803D895C - .4byte 0x803E97A4 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon12jucklecutter9StateMainFv + .byte4 procAnim__Q53scn4step6weapon12jucklecutter9StateMainFv + .byte4 procMove__Q53scn4step6weapon12jucklecutter9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon12jucklecutter9StateMainFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon17tsukikageshuriken9StateMain __vt__Q53scn4step6weapon17tsukikageshuriken9StateMain: .4byte 0 .4byte 0 - .4byte 0x803E9F68 - .4byte 0x803D8954 - .4byte 0x803E9CE4 - .4byte 0x803D895C - .4byte 0x803E9CE8 - .4byte 0x803E9E78 + .byte4 __dt__Q53scn4step6weapon17tsukikageshuriken9StateMainFv + .byte4 procAnim__Q43scn4step6weapon9StateBaseFv + .byte4 procMove__Q53scn4step6weapon17tsukikageshuriken9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon17tsukikageshuriken9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon17tsukikageshuriken9StateMainFv .global __vt__Q53scn4step6weapon15knucklejoehadou9StateMain __vt__Q53scn4step6weapon15knucklejoehadou9StateMain: .4byte 0 .4byte 0 - .4byte 0x803EA078 - .4byte 0x803EA0F4 - .4byte 0x803EA164 - .4byte 0x803D895C - .4byte 0x803EA1E8 - .4byte 0x803EA22C + .byte4 __dt__Q53scn4step6weapon15knucklejoehadou9StateMainFv + .byte4 procAnim__Q53scn4step6weapon15knucklejoehadou9StateMainFv + .byte4 procMove__Q53scn4step6weapon15knucklejoehadou9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon15knucklejoehadou9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon15knucklejoehadou9StateMainFv .global __vt__Q53scn4step6weapon9snowlball9StateMain __vt__Q53scn4step6weapon9snowlball9StateMain: .4byte 0 .4byte 0 - .4byte 0x803EA520 - .4byte 0x803D8954 - .4byte 0x803EA370 - .4byte 0x803D895C - .4byte 0x803EA374 - .4byte 0x803EA42C + .byte4 __dt__Q53scn4step6weapon9snowlball9StateMainFv + .byte4 procAnim__Q43scn4step6weapon9StateBaseFv + .byte4 procMove__Q53scn4step6weapon9snowlball9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon9snowlball9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon9snowlball9StateMainFv .global __vt__Q53scn4step6weapon10floweffect9StateMain __vt__Q53scn4step6weapon10floweffect9StateMain: .4byte 0 .4byte 0 - .4byte 0x803EA5C0 - .4byte 0x803EA5B0 - .4byte 0x803EA5B4 - .4byte 0x803D895C - .4byte 0x803EA5B8 - .4byte 0x803EA5BC + .byte4 __dt__Q53scn4step6weapon10floweffect9StateMainFv + .byte4 procAnim__Q53scn4step6weapon10floweffect9StateMainFv + .byte4 procMove__Q53scn4step6weapon10floweffect9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon10floweffect9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon10floweffect9StateMainFv .global __vt__Q53scn4step6weapon13whispytornado9StateMain __vt__Q53scn4step6weapon13whispytornado9StateMain: .4byte 0 .4byte 0 - .4byte 0x803EA764 - .4byte 0x803EA6B0 - .4byte 0x803EA6B4 - .4byte 0x803D895C - .4byte 0x803EA760 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon13whispytornado9StateMainFv + .byte4 procAnim__Q53scn4step6weapon13whispytornado9StateMainFv + .byte4 procMove__Q53scn4step6weapon13whispytornado9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon13whispytornado9StateMainFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10whispyroot9StateMain __vt__Q53scn4step6weapon10whispyroot9StateMain: .4byte 0 .4byte 0 - .4byte 0x803EACA8 - .4byte 0x803EAA5C - .4byte 0x803EAB24 - .4byte 0x803D895C - .4byte 0x803EACA4 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon10whispyroot9StateMainFv + .byte4 procAnim__Q53scn4step6weapon10whispyroot9StateMainFv + .byte4 procMove__Q53scn4step6weapon10whispyroot9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon10whispyroot9StateMainFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon18combinationairball9StateMain __vt__Q53scn4step6weapon18combinationairball9StateMain: .4byte 0 .4byte 0 - .4byte 0x803EAF9C - .4byte 0x803EB018 - .4byte 0x803EB090 - .4byte 0x803D895C - .4byte 0x803EB094 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon18combinationairball9StateMainFv + .byte4 procAnim__Q53scn4step6weapon18combinationairball9StateMainFv + .byte4 procMove__Q53scn4step6weapon18combinationairball9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon18combinationairball9StateMainFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .global __vt__Q53scn4step6weapon19combinationmetabeam9StateMain __vt__Q53scn4step6weapon19combinationmetabeam9StateMain: .4byte 0 .4byte 0 - .4byte 0x803EB868 - .4byte 0x803EB668 - .4byte 0x803EB72C - .4byte 0x803D895C - .4byte 0x803EB780 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon19combinationmetabeam9StateMainFv + .byte4 procAnim__Q53scn4step6weapon19combinationmetabeam9StateMainFv + .byte4 procMove__Q53scn4step6weapon19combinationmetabeam9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon19combinationmetabeam9StateMainFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803EBE2C - .4byte 0x803EBE10 + .byte4 __dt__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon23combinationdededebomber9StateMain __vt__Q53scn4step6weapon23combinationdededebomber9StateMain: .4byte 0 .4byte 0 - .4byte 0x803EBC0C - .4byte 0x803EBC10 - .4byte 0x803EBC6C - .4byte 0x803D895C - .4byte 0x803EBCC0 - .4byte 0x803EBCC4 + .byte4 __dt__Q53scn4step6weapon23combinationdededebomber9StateMainFv + .byte4 procAnim__Q53scn4step6weapon23combinationdededebomber9StateMainFv + .byte4 procMove__Q53scn4step6weapon23combinationdededebomber9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon23combinationdededebomber9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon23combinationdededebomber9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon18combinationdeeshot9StateMain __vt__Q53scn4step6weapon18combinationdeeshot9StateMain: .4byte 0 .4byte 0 - .4byte 0x803EC010 - .4byte 0x803EC014 - .4byte 0x803EC070 - .4byte 0x803D895C - .4byte 0x803EC074 - .4byte 0x803EC078 + .byte4 __dt__Q53scn4step6weapon18combinationdeeshot9StateMainFv + .byte4 procAnim__Q53scn4step6weapon18combinationdeeshot9StateMainFv + .byte4 procMove__Q53scn4step6weapon18combinationdeeshot9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon18combinationdeeshot9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon18combinationdeeshot9StateMainFv .global __vt__Q53scn4step6weapon8metabeam9StateMain __vt__Q53scn4step6weapon8metabeam9StateMain: .4byte 0 .4byte 0 - .4byte 0x803EC4D0 - .4byte 0x803EC3AC - .4byte 0x803EC404 - .4byte 0x803D895C - .4byte 0x803EC458 - .4byte 0x803EC45C + .byte4 __dt__Q53scn4step6weapon8metabeam9StateMainFv + .byte4 procAnim__Q53scn4step6weapon8metabeam9StateMainFv + .byte4 procMove__Q53scn4step6weapon8metabeam9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon8metabeam9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon8metabeam9StateMainFv .global __vt__Q53scn4step6weapon13metashockwave9StateMain __vt__Q53scn4step6weapon13metashockwave9StateMain: .4byte 0 .4byte 0 - .4byte 0x803EC620 - .4byte 0x803EC624 - .4byte 0x803EC67C - .4byte 0x803D895C - .4byte 0x803EC6E0 - .4byte 0x803EC6E4 + .byte4 __dt__Q53scn4step6weapon13metashockwave9StateMainFv + .byte4 procAnim__Q53scn4step6weapon13metashockwave9StateMainFv + .byte4 procMove__Q53scn4step6weapon13metashockwave9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon13metashockwave9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon13metashockwave9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803ECF84 - .4byte 0x803ECF68 + .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon12dededehammer9StateMain __vt__Q53scn4step6weapon12dededehammer9StateMain: .4byte 0 .4byte 0 - .4byte 0x803ECCF8 - .4byte 0x803ECD74 - .4byte 0x803ECE58 - .4byte 0x803D895C - .4byte 0x803ECE5C - .4byte 0x803ECE60 + .byte4 __dt__Q53scn4step6weapon12dededehammer9StateMainFv + .byte4 procAnim__Q53scn4step6weapon12dededehammer9StateMainFv + .byte4 procMove__Q53scn4step6weapon12dededehammer9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon12dededehammer9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon12dededehammer9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1: .4byte 0 .4byte 0 - .4byte 0x803ED650 - .4byte 0x803ED628 + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 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 - .4byte 0x803ED64C - .4byte 0x803ED5C8 + .byte4 __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear13StateStickObj$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .byte4 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 - .4byte 0x803ED648 - .4byte 0x803ED5E8 + .byte4 __dt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear11StateVanish$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .byte4 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 - .4byte 0x803ED644 - .4byte 0x803ED608 + .byte4 __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv + .byte4 create__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear14StateStickWall$$4PQ43scn4step6weapon6Weapon$$4f$$1Fv .global __vt__Q53scn4step6weapon8deespear9StateMain __vt__Q53scn4step6weapon8deespear9StateMain: .4byte 0 .4byte 0 - .4byte 0x803ED1E8 - .4byte 0x803ED264 - .4byte 0x803ED2D0 - .4byte 0x803ED328 - .4byte 0x803ED484 - .4byte 0x803ED5C4 + .byte4 __dt__Q53scn4step6weapon8deespear9StateMainFv + .byte4 procAnim__Q53scn4step6weapon8deespear9StateMainFv + .byte4 procMove__Q53scn4step6weapon8deespear9StateMainFv + .byte4 procConstraint__Q53scn4step6weapon8deespear9StateMainFv + .byte4 procFixPos__Q53scn4step6weapon8deespear9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon8deespear9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13vacuumedblock9StateMain __vt__Q53scn4step6weapon13vacuumedblock9StateMain: .4byte 0 .4byte 0 - .4byte 0x803EEEA4 - .4byte 0x803EEEA8 - .4byte 0x803EEEAC - .4byte 0x803D895C - .4byte 0x803EEEB0 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon13vacuumedblock9StateMainFv + .byte4 procAnim__Q53scn4step6weapon13vacuumedblock9StateMainFv + .byte4 procMove__Q53scn4step6weapon13vacuumedblock9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon13vacuumedblock9StateMainFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon11hotheadfire9StateMain __vt__Q53scn4step6weapon11hotheadfire9StateMain: .4byte 0 .4byte 0 - .4byte 0x803EF988 - .4byte 0x803D8954 - .4byte 0x803EF81C - .4byte 0x803D895C - .4byte 0x803EF820 - .4byte 0x803EF8AC + .byte4 __dt__Q53scn4step6weapon11hotheadfire9StateMainFv + .byte4 procAnim__Q43scn4step6weapon9StateBaseFv + .byte4 procMove__Q53scn4step6weapon11hotheadfire9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon11hotheadfire9StateMainFv + .byte4 procObjCollReact__Q53scn4step6weapon11hotheadfire9StateMainFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon26challengemastersummonlight9StateMain __vt__Q53scn4step6weapon26challengemastersummonlight9StateMain: .4byte 0 .4byte 0 - .4byte 0x803F0210 - .4byte 0x803EFBE4 - .4byte 0x803EFCE4 - .4byte 0x803D895C - .4byte 0x803EFFFC - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon26challengemastersummonlight9StateMainFv + .byte4 procAnim__Q53scn4step6weapon26challengemastersummonlight9StateMainFv + .byte4 procMove__Q53scn4step6weapon26challengemastersummonlight9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon26challengemastersummonlight9StateMainFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon19challengemastershot9StateMain __vt__Q53scn4step6weapon19challengemastershot9StateMain: .4byte 0 .4byte 0 - .4byte 0x803F0784 - .4byte 0x803F0724 - .4byte 0x803F077C - .4byte 0x803D895C - .4byte 0x803F0780 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon19challengemastershot9StateMainFv + .byte4 procAnim__Q53scn4step6weapon19challengemastershot9StateMainFv + .byte4 procMove__Q53scn4step6weapon19challengemastershot9StateMainFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon19challengemastershot9StateMainFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256519 diff --git a/asm/src/StateMasterSummon.s b/asm/src/StateMasterSummon.s index af7dd252..bceaad92 100644 --- a/asm/src/StateMasterSummon.s +++ b/asm/src/StateMasterSummon.s @@ -564,12 +564,12 @@ lbl_8029343C: __vt__Q53scn4step5enemy6common17StateMasterSummon: .4byte 0 .4byte 0 - .4byte 0x80292E20 ;# ptr - .4byte 0x80292ED4 ;# ptr - .4byte 0x80293104 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80293158 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common17StateMasterSummonFv + .byte4 procAnim__Q53scn4step5enemy6common17StateMasterSummonFv + .byte4 procMove__Q53scn4step5enemy6common17StateMasterSummonFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common17StateMasterSummonFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257050 diff --git a/asm/src/StateMasterSummonWait.s b/asm/src/StateMasterSummonWait.s index 3ee181cc..10c480c3 100644 --- a/asm/src/StateMasterSummonWait.s +++ b/asm/src/StateMasterSummonWait.s @@ -323,9 +323,9 @@ lbl_8029389C: __vt__Q53scn4step5enemy6common21StateMasterSummonWait: .4byte 0 .4byte 0 - .4byte 0x80293508 ;# ptr - .4byte 0x802935D4 ;# ptr - .4byte 0x802935F0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802935F4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common21StateMasterSummonWaitFv + .byte4 procAnim__Q53scn4step5enemy6common21StateMasterSummonWaitFv + .byte4 procMove__Q53scn4step5enemy6common21StateMasterSummonWaitFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common21StateMasterSummonWaitFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateMix.s b/asm/src/StateMix.s index d2ad4d89..be257ac0 100644 --- a/asm/src/StateMix.s +++ b/asm/src/StateMix.s @@ -572,11 +572,11 @@ lbl_803670E0: __vt__Q53scn4step4hero6common8StateMix: .4byte 0 .4byte 0 - .4byte 0x80366BC0 - .4byte 0x80366D8C - .4byte 0x80366E20 - .4byte 0x8035550C - .4byte 0x80366E24 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common8StateMixFv + .byte4 procAnim__Q53scn4step4hero6common8StateMixFv + .byte4 procMove__Q53scn4step4hero6common8StateMixFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common8StateMixFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateMixPre.s b/asm/src/StateMixPre.s index 6c03865c..54f71449 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 - .4byte 0x80367348 - .4byte 0x80367328 + .byte4 __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common8StateMix$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv + .byte4 create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common8StateMix$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv .global __vt__Q53scn4step4hero6common11StateMixPre __vt__Q53scn4step4hero6common11StateMixPre: .4byte 0 .4byte 0 - .4byte 0x80367194 - .4byte 0x80367234 - .4byte 0x80355508 - .4byte 0x8035550C - .4byte 0x80355510 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common11StateMixPreFv + .byte4 procAnim__Q53scn4step4hero6common11StateMixPreFv + .byte4 procMove__Q43scn4step4hero9StateBaseFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q43scn4step4hero9StateBaseFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateMoonSault.s b/asm/src/StateMoonSault.s index 72e038c8..7644ed46 100644 --- a/asm/src/StateMoonSault.s +++ b/asm/src/StateMoonSault.s @@ -204,11 +204,11 @@ procFixPos__Q53scn4step4hero7fighter14StateMoonSaultFv: __vt__Q53scn4step4hero7fighter14StateMoonSault: .4byte 0 .4byte 0 - .4byte 0x8039DB98 - .4byte 0x8039DC48 - .4byte 0x8039DD30 - .4byte 0x8035550C - .4byte 0x8039DDB4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter14StateMoonSaultFv + .byte4 procAnim__Q53scn4step4hero7fighter14StateMoonSaultFv + .byte4 procMove__Q53scn4step4hero7fighter14StateMoonSaultFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter14StateMoonSaultFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateMove.s b/asm/src/StateMove.s index e9323d9d..341425d9 100644 --- a/asm/src/StateMove.s +++ b/asm/src/StateMove.s @@ -7540,48 +7540,48 @@ lbl_802E9CA4: __vt__Q53scn4step5enemy7blipper9StateMove: .4byte 0 .4byte 0 - .4byte 0x8029BB7C ;# ptr - .4byte 0x8029B4FC ;# ptr - .4byte 0x8029B6DC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029B7C0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7blipper9StateMoveFv + .byte4 procAnim__Q53scn4step5enemy7blipper9StateMoveFv + .byte4 procMove__Q53scn4step5enemy7blipper9StateMoveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7blipper9StateMoveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly9StateMove __vt__Q53scn4step5enemy6chilly9StateMove: .4byte 0 .4byte 0 - .4byte 0x802A6BCC ;# ptr - .4byte 0x802A69F4 ;# ptr - .4byte 0x802A6A88 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A6BC8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6chilly9StateMoveFv + .byte4 procAnim__Q53scn4step5enemy6chilly9StateMoveFv + .byte4 procMove__Q53scn4step5enemy6chilly9StateMoveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6chilly9StateMoveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8dubiorjr9StateMove __vt__Q53scn4step5enemy8dubiorjr9StateMove: .4byte 0 .4byte 0 - .4byte 0x802AE980 ;# ptr - .4byte 0x802AEA2C ;# ptr - .4byte 0x802AEB48 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802AEB9C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8dubiorjr9StateMoveFv + .byte4 procAnim__Q53scn4step5enemy8dubiorjr9StateMoveFv + .byte4 procMove__Q53scn4step5enemy8dubiorjr9StateMoveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy8dubiorjr9StateMoveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4elec9StateMove __vt__Q53scn4step5enemy4elec9StateMove: .4byte 0 .4byte 0 - .4byte 0x802B04EC ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802B0568 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B0A30 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy4elec9StateMoveFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy4elec9StateMoveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4elec9StateMoveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .4byte 0 .4byte 0 @@ -7590,12 +7590,12 @@ __vt__Q53scn4step5enemy4elec9StateMove: __vt__Q53scn4step5enemy6flamer9StateMove: .4byte 0 .4byte 0 - .4byte 0x802B1A98 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802B36D4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B3B20 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6flamer9StateMoveFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy6flamer9StateMoveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6flamer9StateMoveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .4byte 0 .4byte 0 @@ -7604,84 +7604,84 @@ __vt__Q53scn4step5enemy6flamer9StateMove: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802B52D8 ;# ptr - .4byte 0x802B52BC ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5foley9StateMove __vt__Q53scn4step5enemy5foley9StateMove: .4byte 0 .4byte 0 - .4byte 0x802B50C8 ;# ptr - .4byte 0x802B50CC ;# ptr - .4byte 0x802B51BC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B5224 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5foley9StateMoveFv + .byte4 procAnim__Q53scn4step5enemy5foley9StateMoveFv + .byte4 procMove__Q53scn4step5enemy5foley9StateMoveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5foley9StateMoveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu9StateMove __vt__Q53scn4step5enemy4kabu9StateMove: .4byte 0 .4byte 0 - .4byte 0x802BDDC0 ;# ptr - .4byte 0x802BDDC4 ;# ptr - .4byte 0x802BDE68 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802BDF0C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy4kabu9StateMoveFv + .byte4 procAnim__Q53scn4step5enemy4kabu9StateMoveFv + .byte4 procMove__Q53scn4step5enemy4kabu9StateMoveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4kabu9StateMoveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10poppybrojr9StateMove __vt__Q53scn4step5enemy10poppybrojr9StateMove: .4byte 0 .4byte 0 - .4byte 0x802D259C ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802D2078 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D2598 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10poppybrojr9StateMoveFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy10poppybrojr9StateMoveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10poppybrojr9StateMoveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball11StateDamage$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball11StateDamage$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802D87F4 ;# ptr - .4byte 0x802D87D8 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball11StateDamage$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball11StateDamage$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy8rollball9StateMove __vt__Q53scn4step5enemy8rollball9StateMove: .4byte 0 .4byte 0 - .4byte 0x802D6CD0 ;# ptr - .4byte 0x802D6CD4 ;# ptr - .4byte 0x802D6DF0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D6F18 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8rollball9StateMoveFv + .byte4 procAnim__Q53scn4step5enemy8rollball9StateMoveFv + .byte4 procMove__Q53scn4step5enemy8rollball9StateMoveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy8rollball9StateMoveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8searches9StateMove __vt__Q53scn4step5enemy8searches9StateMove: .4byte 0 .4byte 0 - .4byte 0x802DC554 ;# ptr - .4byte 0x802DC354 ;# ptr - .4byte 0x802DC358 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802DC39C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8searches9StateMoveFv + .byte4 procAnim__Q53scn4step5enemy8searches9StateMoveFv + .byte4 procMove__Q53scn4step5enemy8searches9StateMoveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy8searches9StateMoveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy3sun9StateMove __vt__Q53scn4step5enemy3sun9StateMove: .4byte 0 .4byte 0 - .4byte 0x802E9568 ;# ptr - .4byte 0x802E956C ;# ptr - .4byte 0x802E9570 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E96F4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy3sun9StateMoveFv + .byte4 procAnim__Q53scn4step5enemy3sun9StateMoveFv + .byte4 procMove__Q53scn4step5enemy3sun9StateMoveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy3sun9StateMoveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255763 diff --git a/asm/src/StateMoveAround.s b/asm/src/StateMoveAround.s index d62a2464..46773bd8 100644 --- a/asm/src/StateMoveAround.s +++ b/asm/src/StateMoveAround.s @@ -301,12 +301,12 @@ turn__Q53scn4step5enemy4kabu15StateMoveAroundFv: __vt__Q53scn4step5enemy4kabu15StateMoveAround: .4byte 0 .4byte 0 - .4byte 0x802BE17C ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802BE180 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802BE220 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy4kabu15StateMoveAroundFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy4kabu15StateMoveAroundFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4kabu15StateMoveAroundFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256041 diff --git a/asm/src/StateMoveBack.s b/asm/src/StateMoveBack.s index ede1d040..1bcf6bf7 100644 --- a/asm/src/StateMoveBack.s +++ b/asm/src/StateMoveBack.s @@ -85,9 +85,9 @@ procFixPos__Q53scn4step4boss6common13StateMoveBackFv: __vt__Q53scn4step4boss6common13StateMoveBack: .4byte 0 .4byte 0 - .4byte 0x802474D4 ;# ptr - .4byte 0x802474D8 ;# ptr - .4byte 0x802474DC ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80247538 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6common13StateMoveBackFv + .byte4 procAnim__Q53scn4step4boss6common13StateMoveBackFv + .byte4 procMove__Q53scn4step4boss6common13StateMoveBackFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common13StateMoveBackFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateMoveCircle.s b/asm/src/StateMoveCircle.s index 74638e5a..89d190e4 100644 --- a/asm/src/StateMoveCircle.s +++ b/asm/src/StateMoveCircle.s @@ -241,12 +241,12 @@ __dt__Q53scn4step5enemy5gordo15StateMoveCircleFv: __vt__Q53scn4step5enemy5gordo15StateMoveCircle: .4byte 0 .4byte 0 - .4byte 0x802B9490 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802B9328 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5gordo15StateMoveCircleFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy5gordo15StateMoveCircleFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255034 diff --git a/asm/src/StateMoveForward.s b/asm/src/StateMoveForward.s index d203051b..5bffa9ef 100644 --- a/asm/src/StateMoveForward.s +++ b/asm/src/StateMoveForward.s @@ -241,24 +241,24 @@ procFixPos__Q53scn4step4boss9moundeath16StateMoveForwardFv: __vt__Q53scn4step4boss6common16StateMoveForward: .4byte 0 .4byte 0 - .4byte 0x802475D4 ;# ptr - .4byte 0x802475D8 ;# ptr - .4byte 0x802475DC ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80247634 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6common16StateMoveForwardFv + .byte4 procAnim__Q53scn4step4boss6common16StateMoveForwardFv + .byte4 procMove__Q53scn4step4boss6common16StateMoveForwardFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common16StateMoveForwardFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9moundeath16StateMoveForward __vt__Q53scn4step4boss9moundeath16StateMoveForward: .4byte 0 .4byte 0 - .4byte 0x80255E64 ;# ptr - .4byte 0x80255E68 ;# ptr - .4byte 0x80255ECC ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80256018 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9moundeath16StateMoveForwardFv + .byte4 procAnim__Q53scn4step4boss9moundeath16StateMoveForwardFv + .byte4 procMove__Q53scn4step4boss9moundeath16StateMoveForwardFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9moundeath16StateMoveForwardFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254872 diff --git a/asm/src/StateMoveJoint.s b/asm/src/StateMoveJoint.s index 1078ba70..39b7dd33 100644 --- a/asm/src/StateMoveJoint.s +++ b/asm/src/StateMoveJoint.s @@ -92,9 +92,9 @@ procFixPos__Q53scn4step4boss6common14StateMoveJointFv: __vt__Q53scn4step4boss6common14StateMoveJoint: .4byte 0 .4byte 0 - .4byte 0x802476B0 ;# ptr - .4byte 0x802476B4 ;# ptr - .4byte 0x80247714 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024774C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6common14StateMoveJointFv + .byte4 procAnim__Q53scn4step4boss6common14StateMoveJointFv + .byte4 procMove__Q53scn4step4boss6common14StateMoveJointFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common14StateMoveJointFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateMoveSinCurve.s b/asm/src/StateMoveSinCurve.s index 69e7d83f..c77617a5 100644 --- a/asm/src/StateMoveSinCurve.s +++ b/asm/src/StateMoveSinCurve.s @@ -313,12 +313,12 @@ __dt__Q53scn4step5enemy5gordo17StateMoveSinCurveFv: __vt__Q53scn4step5enemy5gordo17StateMoveSinCurve: .4byte 0 .4byte 0 - .4byte 0x802B98F8 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802B9568 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B96D0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5gordo17StateMoveSinCurveFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy5gordo17StateMoveSinCurveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5gordo17StateMoveSinCurveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255872 diff --git a/asm/src/StateMoveStraight.s b/asm/src/StateMoveStraight.s index dbb4813f..f5712ee0 100644 --- a/asm/src/StateMoveStraight.s +++ b/asm/src/StateMoveStraight.s @@ -171,12 +171,12 @@ __dt__Q53scn4step5enemy5gordo17StateMoveStraightFv: __vt__Q53scn4step5enemy5gordo17StateMoveStraight: .4byte 0 .4byte 0 - .4byte 0x802B9B44 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802B99A0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B9A70 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5gordo17StateMoveStraightFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy5gordo17StateMoveStraightFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5gordo17StateMoveStraightFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255765 diff --git a/asm/src/StateMoveThunder.s b/asm/src/StateMoveThunder.s index a71c3178..508bbf12 100644 --- a/asm/src/StateMoveThunder.s +++ b/asm/src/StateMoveThunder.s @@ -476,12 +476,12 @@ procFixPos__Q53scn4step4boss6dubior16StateMoveThunderFv: __vt__Q53scn4step4boss6dubior16StateMoveThunder: .4byte 0 .4byte 0 - .4byte 0x8024F440 ;# ptr - .4byte 0x8024F4BC ;# ptr - .4byte 0x8024F834 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024F978 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6dubior16StateMoveThunderFv + .byte4 procAnim__Q53scn4step4boss6dubior16StateMoveThunderFv + .byte4 procMove__Q53scn4step4boss6dubior16StateMoveThunderFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6dubior16StateMoveThunderFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257085 diff --git a/asm/src/StateMoveThunderStart.s b/asm/src/StateMoveThunderStart.s index 5da4bc67..d7426e20 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 - .4byte 0x8024FD38 ;# ptr - .4byte 0x8024FD1C ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateMoveThunder$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateMoveThunder$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6dubior21StateMoveThunderStart __vt__Q53scn4step4boss6dubior21StateMoveThunderStart: .4byte 0 .4byte 0 - .4byte 0x8024FB2C ;# ptr - .4byte 0x8024FB30 ;# ptr - .4byte 0x8024FBDC ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024FD18 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6dubior21StateMoveThunderStartFv + .byte4 procAnim__Q53scn4step4boss6dubior21StateMoveThunderStartFv + .byte4 procMove__Q53scn4step4boss6dubior21StateMoveThunderStartFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6dubior21StateMoveThunderStartFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256036 diff --git a/asm/src/StateMoveToOtherSide.s b/asm/src/StateMoveToOtherSide.s index 73a34230..dee56815 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 - .4byte 0x802500E0 ;# ptr - .4byte 0x80250170 ;# ptr - .4byte 0x8025027C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80250330 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6dubior20StateMoveToOtherSideFv + .byte4 procAnim__Q53scn4step4boss6dubior20StateMoveToOtherSideFv + .byte4 procMove__Q53scn4step4boss6dubior20StateMoveToOtherSideFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6dubior20StateMoveToOtherSideFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256237 diff --git a/asm/src/StateNormal.s b/asm/src/StateNormal.s index 14437cb9..dd94a098 100644 --- a/asm/src/StateNormal.s +++ b/asm/src/StateNormal.s @@ -104,12 +104,12 @@ lbl_803D8B34: __vt__Q43scn4step6weapon11StateNormal: .4byte 0 .4byte 0 - .4byte 0x803D8A40 - .4byte 0x803D8A9C - .4byte 0x803D8AA0 - .4byte 0x803D895C - .4byte 0x803D8B00 - .4byte 0x803D8964 + .byte4 __dt__Q43scn4step6weapon11StateNormalFv + .byte4 procAnim__Q43scn4step6weapon11StateNormalFv + .byte4 procMove__Q43scn4step6weapon11StateNormalFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q43scn4step6weapon11StateNormalFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256141 diff --git a/asm/src/StateNoseDive.s b/asm/src/StateNoseDive.s index 654dbc09..37e3c88a 100644 --- a/asm/src/StateNoseDive.s +++ b/asm/src/StateNoseDive.s @@ -567,24 +567,24 @@ __dt__Q53scn4step5enemy10parasoldoo13StateNoseDiveFv: __vt__Q53scn4step5enemy10parasoldee13StateNoseDive: .4byte 0 .4byte 0 - .4byte 0x802CD100 ;# ptr - .4byte 0x802CCE28 ;# ptr - .4byte 0x802CCFBC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802CD028 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10parasoldee13StateNoseDiveFv + .byte4 procAnim__Q53scn4step5enemy10parasoldee13StateNoseDiveFv + .byte4 procMove__Q53scn4step5enemy10parasoldee13StateNoseDiveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10parasoldee13StateNoseDiveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo13StateNoseDive __vt__Q53scn4step5enemy10parasoldoo13StateNoseDive: .4byte 0 .4byte 0 - .4byte 0x802CEF3C ;# ptr - .4byte 0x802CEC74 ;# ptr - .4byte 0x802CEE08 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802CEE74 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10parasoldoo13StateNoseDiveFv + .byte4 procAnim__Q53scn4step5enemy10parasoldoo13StateNoseDiveFv + .byte4 procMove__Q53scn4step5enemy10parasoldoo13StateNoseDiveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10parasoldoo13StateNoseDiveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257074 diff --git a/asm/src/StatePanic.s b/asm/src/StatePanic.s index 8a845330..09342b0d 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 - .4byte 0x80241A34 ;# ptr - .4byte 0x80241A18 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StatePanic$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StatePanic$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster10StatePanic __vt__Q53scn4step4boss15challengemaster10StatePanic: .4byte 0 .4byte 0 - .4byte 0x8024186C ;# ptr - .4byte 0x80241870 ;# ptr - .4byte 0x8024198C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80241990 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster10StatePanicFv + .byte4 procAnim__Q53scn4step4boss15challengemaster10StatePanicFv + .byte4 procMove__Q53scn4step4boss15challengemaster10StatePanicFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster10StatePanicFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateParasolCapture.s b/asm/src/StateParasolCapture.s index f6339f50..37137c09 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 - .4byte 0x80392DD4 + .byte4 __sinit_$$3StateParasolCapture_cpp .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7parasol19StateParasolCapture __vt__Q53scn4step4hero7parasol19StateParasolCapture: .4byte 0 .4byte 0 - .4byte 0x803929BC - .4byte 0x80392AA0 - .4byte 0x80392B68 - .4byte 0x8035550C - .4byte 0x80392B6C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7parasol19StateParasolCaptureFv + .byte4 procAnim__Q53scn4step4hero7parasol19StateParasolCaptureFv + .byte4 procMove__Q53scn4step4hero7parasol19StateParasolCaptureFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7parasol19StateParasolCaptureFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateParasolDive.s b/asm/src/StateParasolDive.s index 8ac53440..47c9a7ca 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 - .4byte 0x803934C0 - .4byte 0x80393484 + .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolParachuteFall$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolParachuteFall$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol16StateParasolDive$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol16StateParasolDive$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x803934BC - .4byte 0x803934A0 + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol16StateParasolDive$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol16StateParasolDive$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7parasol16StateParasolDive __vt__Q53scn4step4hero7parasol16StateParasolDive: .4byte 0 .4byte 0 - .4byte 0x80393128 - .4byte 0x80393224 - .4byte 0x80393360 - .4byte 0x8035550C - .4byte 0x8039340C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7parasol16StateParasolDiveFv + .byte4 procAnim__Q53scn4step4hero7parasol16StateParasolDiveFv + .byte4 procMove__Q53scn4step4hero7parasol16StateParasolDiveFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7parasol16StateParasolDiveFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateParasolDrill.s b/asm/src/StateParasolDrill.s index 49e4a785..588150fa 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 - .4byte 0x80393A68 - .4byte 0x80393A2C + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol20StateParasolDrillEnd$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol20StateParasolDrillEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolDrill$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolDrill$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80393A64 - .4byte 0x80393A48 + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolDrill$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolDrill$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7parasol17StateParasolDrill __vt__Q53scn4step4hero7parasol17StateParasolDrill: .4byte 0 .4byte 0 - .4byte 0x803936F0 - .4byte 0x803937F4 - .4byte 0x803939A8 - .4byte 0x8035550C - .4byte 0x80393A28 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7parasol17StateParasolDrillFv + .byte4 procAnim__Q53scn4step4hero7parasol17StateParasolDrillFv + .byte4 procMove__Q53scn4step4hero7parasol17StateParasolDrillFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7parasol17StateParasolDrillFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateParasolDrillEnd.s b/asm/src/StateParasolDrillEnd.s index 6639c7e0..8f4bd67a 100644 --- a/asm/src/StateParasolDrillEnd.s +++ b/asm/src/StateParasolDrillEnd.s @@ -109,11 +109,11 @@ procFixPos__Q53scn4step4hero7parasol20StateParasolDrillEndFv: __vt__Q53scn4step4hero7parasol20StateParasolDrillEnd: .4byte 0 .4byte 0 - .4byte 0x80393AFC - .4byte 0x80393BB8 - .4byte 0x80393BBC - .4byte 0x8035550C - .4byte 0x80393BC0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7parasol20StateParasolDrillEndFv + .byte4 procAnim__Q53scn4step4hero7parasol20StateParasolDrillEndFv + .byte4 procMove__Q53scn4step4hero7parasol20StateParasolDrillEndFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7parasol20StateParasolDrillEndFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateParasolFall.s b/asm/src/StateParasolFall.s index 00b8952b..916ec9b6 100644 --- a/asm/src/StateParasolFall.s +++ b/asm/src/StateParasolFall.s @@ -476,24 +476,24 @@ __dt__Q53scn4step5enemy10parasoldoo16StateParasolFallFv: __vt__Q53scn4step5enemy10parasoldee16StateParasolFall: .4byte 0 .4byte 0 - .4byte 0x802CD454 ;# ptr - .4byte 0x802CD230 ;# ptr - .4byte 0x802CD2F0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802CD35C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10parasoldee16StateParasolFallFv + .byte4 procAnim__Q53scn4step5enemy10parasoldee16StateParasolFallFv + .byte4 procMove__Q53scn4step5enemy10parasoldee16StateParasolFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10parasoldee16StateParasolFallFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo16StateParasolFall __vt__Q53scn4step5enemy10parasoldoo16StateParasolFall: .4byte 0 .4byte 0 - .4byte 0x802CF284 ;# ptr - .4byte 0x802CF06C ;# ptr - .4byte 0x802CF12C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802CF198 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10parasoldoo16StateParasolFallFv + .byte4 procAnim__Q53scn4step5enemy10parasoldoo16StateParasolFallFv + .byte4 procMove__Q53scn4step5enemy10parasoldoo16StateParasolFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10parasoldoo16StateParasolFallFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256866 diff --git a/asm/src/StateParasolParachute.s b/asm/src/StateParasolParachute.s index 85b27053..10fd4e50 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 - .4byte 0x803942A8 - .4byte 0x8039428C + .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolParachute$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolParachute$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7parasol21StateParasolParachute __vt__Q53scn4step4hero7parasol21StateParasolParachute: .4byte 0 .4byte 0 - .4byte 0x80393D8C - .4byte 0x80393E24 - .4byte 0x80393FA4 - .4byte 0x8035550C - .4byte 0x80394238 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7parasol21StateParasolParachuteFv + .byte4 procAnim__Q53scn4step4hero7parasol21StateParasolParachuteFv + .byte4 procMove__Q53scn4step4hero7parasol21StateParasolParachuteFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7parasol21StateParasolParachuteFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateParasolParachuteFall.s b/asm/src/StateParasolParachuteFall.s index d8e5af3e..171134f1 100644 --- a/asm/src/StateParasolParachuteFall.s +++ b/asm/src/StateParasolParachuteFall.s @@ -314,13 +314,13 @@ lbl_803946FC: __vt__Q53scn4step4hero7parasol25StateParasolParachuteFall: .4byte 0 .4byte 0 - .4byte 0x80394374 - .4byte 0x80394418 - .4byte 0x803946C0 - .4byte 0x8035550C - .4byte 0x803946C4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7parasol25StateParasolParachuteFallFv + .byte4 procAnim__Q53scn4step4hero7parasol25StateParasolParachuteFallFv + .byte4 procMove__Q53scn4step4hero7parasol25StateParasolParachuteFallFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7parasol25StateParasolParachuteFallFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateParasolRelease.s b/asm/src/StateParasolRelease.s index 22569387..46035b8f 100644 --- a/asm/src/StateParasolRelease.s +++ b/asm/src/StateParasolRelease.s @@ -365,12 +365,12 @@ procObjCollReact__Q53scn4step5enemy6damage19StateParasolReleaseFv: __vt__Q53scn4step5enemy6damage19StateParasolRelease: .4byte 0 .4byte 0 - .4byte 0x802AB7E0 ;# ptr - .4byte 0x802AB898 ;# ptr - .4byte 0x802AB964 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802AB9E4 ;# ptr - .4byte 0x802ABB34 ;# ptr + .byte4 __dt__Q53scn4step5enemy6damage19StateParasolReleaseFv + .byte4 procAnim__Q53scn4step5enemy6damage19StateParasolReleaseFv + .byte4 procMove__Q53scn4step5enemy6damage19StateParasolReleaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6damage19StateParasolReleaseFv + .byte4 procObjCollReact__Q53scn4step5enemy6damage19StateParasolReleaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257646 diff --git a/asm/src/StateParasolShield.s b/asm/src/StateParasolShield.s index 25576503..3780cd16 100644 --- a/asm/src/StateParasolShield.s +++ b/asm/src/StateParasolShield.s @@ -130,11 +130,11 @@ procFixPos__Q53scn4step4hero7parasol18StateParasolShieldFv: __vt__Q53scn4step4hero7parasol18StateParasolShield: .4byte 0 .4byte 0 - .4byte 0x803947A0 - .4byte 0x8039485C - .4byte 0x803948B0 - .4byte 0x8035550C - .4byte 0x803948B4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7parasol18StateParasolShieldFv + .byte4 procAnim__Q53scn4step4hero7parasol18StateParasolShieldFv + .byte4 procMove__Q53scn4step4hero7parasol18StateParasolShieldFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7parasol18StateParasolShieldFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateParasolSwing.s b/asm/src/StateParasolSwing.s index ad18c8e8..5cd90b3d 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 - .4byte 0x80395288 - .4byte 0x8039520C + .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedParasol$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedParasol$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol19StateParasolCapture$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol19StateParasolCapture$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80395284 - .4byte 0x80395228 + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol19StateParasolCapture$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol19StateParasolCapture$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol18StateParasolShield$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol18StateParasolShield$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80395280 - .4byte 0x80395244 + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol18StateParasolShield$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol18StateParasolShield$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolSwing$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolSwing$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8039527C - .4byte 0x80395260 + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolSwing$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolSwing$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7parasol17StateParasolSwing __vt__Q53scn4step4hero7parasol17StateParasolSwing: .4byte 0 .4byte 0 - .4byte 0x80394A84 - .4byte 0x80394B40 - .4byte 0x80394D94 - .4byte 0x8035550C - .4byte 0x80394D98 - .4byte 0x80394D9C - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7parasol17StateParasolSwingFv + .byte4 procAnim__Q53scn4step4hero7parasol17StateParasolSwingFv + .byte4 procMove__Q53scn4step4hero7parasol17StateParasolSwingFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7parasol17StateParasolSwingFv + .byte4 procObjCollReact__Q53scn4step4hero7parasol17StateParasolSwingFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateParasolUnder.s b/asm/src/StateParasolUnder.s index cb2d2308..7fdf4fb5 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 - .4byte 0x803956AC - .4byte 0x80395690 + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolUnder$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolUnder$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7parasol17StateParasolUnder __vt__Q53scn4step4hero7parasol17StateParasolUnder: .4byte 0 .4byte 0 - .4byte 0x8039543C - .4byte 0x80395574 - .4byte 0x803955C8 - .4byte 0x8035550C - .4byte 0x8039568C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7parasol17StateParasolUnderFv + .byte4 procAnim__Q53scn4step4hero7parasol17StateParasolUnderFv + .byte4 procMove__Q53scn4step4hero7parasol17StateParasolUnderFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7parasol17StateParasolUnderFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateParasolWaterDive.s b/asm/src/StateParasolWaterDive.s index df4ce09f..eb790a19 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 - .4byte 0x80395E0C - .4byte 0x80395DF0 + .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolWaterDive$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolWaterDive$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7parasol21StateParasolWaterDive __vt__Q53scn4step4hero7parasol21StateParasolWaterDive: .4byte 0 .4byte 0 - .4byte 0x803958E8 - .4byte 0x803959E4 - .4byte 0x80395C48 - .4byte 0x8035550C - .4byte 0x80395CF4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7parasol21StateParasolWaterDiveFv + .byte4 procAnim__Q53scn4step4hero7parasol21StateParasolWaterDiveFv + .byte4 procMove__Q53scn4step4hero7parasol21StateParasolWaterDiveFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7parasol21StateParasolWaterDiveFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateParasolWaterDrill.s b/asm/src/StateParasolWaterDrill.s index c03322b7..88211ac7 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 - .4byte 0x803965F0 - .4byte 0x803965B4 + .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolWaterDrillEnd$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolWaterDrillEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol22StateParasolWaterDrill$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol22StateParasolWaterDrill$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x803965EC - .4byte 0x803965D0 + .byte4 __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol22StateParasolWaterDrill$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol22StateParasolWaterDrill$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7parasol22StateParasolWaterDrill __vt__Q53scn4step4hero7parasol22StateParasolWaterDrill: .4byte 0 .4byte 0 - .4byte 0x80396010 - .4byte 0x80396114 - .4byte 0x8039630C - .4byte 0x8035550C - .4byte 0x803963C8 - .4byte 0x803963CC - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7parasol22StateParasolWaterDrillFv + .byte4 procAnim__Q53scn4step4hero7parasol22StateParasolWaterDrillFv + .byte4 procMove__Q53scn4step4hero7parasol22StateParasolWaterDrillFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7parasol22StateParasolWaterDrillFv + .byte4 procObjCollReact__Q53scn4step4hero7parasol22StateParasolWaterDrillFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateParasolWaterDrillEnd.s b/asm/src/StateParasolWaterDrillEnd.s index d49cdd33..90a55298 100644 --- a/asm/src/StateParasolWaterDrillEnd.s +++ b/asm/src/StateParasolWaterDrillEnd.s @@ -198,11 +198,11 @@ procFixPos__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFv: __vt__Q53scn4step4hero7parasol25StateParasolWaterDrillEnd: .4byte 0 .4byte 0 - .4byte 0x803966B0 - .4byte 0x8039676C - .4byte 0x8039682C - .4byte 0x8035550C - .4byte 0x80396894 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFv + .byte4 procAnim__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFv + .byte4 procMove__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StatePick.s b/asm/src/StatePick.s index 69398215..fd91f18d 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 - .4byte 0x802494A0 ;# ptr - .4byte 0x80249484 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee8StateRun$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee8StateRun$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9creditdee9StatePick __vt__Q53scn4step4boss9creditdee9StatePick: .4byte 0 .4byte 0 - .4byte 0x80249268 ;# ptr - .4byte 0x8024926C ;# ptr - .4byte 0x802493A0 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80249480 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9creditdee9StatePickFv + .byte4 procAnim__Q53scn4step4boss9creditdee9StatePickFv + .byte4 procMove__Q53scn4step4boss9creditdee9StatePickFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9creditdee9StatePickFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255433 diff --git a/asm/src/StatePiggyback.s b/asm/src/StatePiggyback.s index 2c5d78a6..9ee752b5 100644 --- a/asm/src/StatePiggyback.s +++ b/asm/src/StatePiggyback.s @@ -376,13 +376,13 @@ procFixPos__Q53scn4step4hero12interference14StatePiggybackFv: __vt__Q53scn4step4hero12interference14StatePiggyback: .4byte 0 .4byte 0 - .4byte 0x80373308 - .4byte 0x803733E0 - .4byte 0x80373588 - .4byte 0x8037358C - .4byte 0x80373590 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero12interference14StatePiggybackFv + .byte4 procAnim__Q53scn4step4hero12interference14StatePiggybackFv + .byte4 procMove__Q53scn4step4hero12interference14StatePiggybackFv + .byte4 procConstraint__Q53scn4step4hero12interference14StatePiggybackFv + .byte4 procFixPos__Q53scn4step4hero12interference14StatePiggybackFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StatePlancher.s b/asm/src/StatePlancher.s index aa119e17..75f0c4b6 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 - .4byte 0x803678A0 - .4byte 0x80367884 + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StatePlancherHit$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StatePlancherHit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common13StatePlancher __vt__Q53scn4step4hero6common13StatePlancher: .4byte 0 .4byte 0 - .4byte 0x80367570 - .4byte 0x80367600 - .4byte 0x80367748 - .4byte 0x8035550C - .4byte 0x8036774C - .4byte 0x803677DC - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common13StatePlancherFv + .byte4 procAnim__Q53scn4step4hero6common13StatePlancherFv + .byte4 procMove__Q53scn4step4hero6common13StatePlancherFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common13StatePlancherFv + .byte4 procObjCollReact__Q53scn4step4hero6common13StatePlancherFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StatePlancherBound.s b/asm/src/StatePlancherBound.s index 5e02bc56..174f8688 100644 --- a/asm/src/StatePlancherBound.s +++ b/asm/src/StatePlancherBound.s @@ -295,13 +295,13 @@ lbl_80367CB0: __vt__Q53scn4step4hero6common18StatePlancherBound: .4byte 0 .4byte 0 - .4byte 0x80367994 - .4byte 0x80367A10 - .4byte 0x80367B14 - .4byte 0x8035550C - .4byte 0x80367C50 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common18StatePlancherBoundFv + .byte4 procAnim__Q53scn4step4hero6common18StatePlancherBoundFv + .byte4 procMove__Q53scn4step4hero6common18StatePlancherBoundFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common18StatePlancherBoundFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StatePlancherHit.s b/asm/src/StatePlancherHit.s index 2c11b371..506dd6cc 100644 --- a/asm/src/StatePlancherHit.s +++ b/asm/src/StatePlancherHit.s @@ -334,13 +334,13 @@ lbl_80368164: __vt__Q53scn4step4hero6common16StatePlancherHit: .4byte 0 .4byte 0 - .4byte 0x80367DA4 - .4byte 0x80367E20 - .4byte 0x80367FF0 - .4byte 0x8035550C - .4byte 0x8036812C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common16StatePlancherHitFv + .byte4 procAnim__Q53scn4step4hero6common16StatePlancherHitFv + .byte4 procMove__Q53scn4step4hero6common16StatePlancherHitFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common16StatePlancherHitFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StatePlancherLanding.s b/asm/src/StatePlancherLanding.s index 5ffbb7ff..6f30a215 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 - .4byte 0x803685CC - .4byte 0x80368590 + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common18StatePlancherBound$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common18StatePlancherBound$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common20StatePlancherLanding$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common20StatePlancherLanding$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x803685C8 - .4byte 0x803685AC + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common20StatePlancherLanding$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common20StatePlancherLanding$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common20StatePlancherLanding __vt__Q53scn4step4hero6common20StatePlancherLanding: .4byte 0 .4byte 0 - .4byte 0x803682E4 - .4byte 0x80368360 - .4byte 0x80368520 - .4byte 0x8035550C - .4byte 0x8036858C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common20StatePlancherLandingFv + .byte4 procAnim__Q53scn4step4hero6common20StatePlancherLandingFv + .byte4 procMove__Q53scn4step4hero6common20StatePlancherLandingFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common20StatePlancherLandingFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StatePraise.s b/asm/src/StatePraise.s index f3e58370..896428b9 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 - .4byte 0x80248558 ;# ptr - .4byte 0x8024853C ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss12creditdedede11StatePraise __vt__Q53scn4step4boss12creditdedede11StatePraise: .4byte 0 .4byte 0 - .4byte 0x80248378 ;# ptr - .4byte 0x8024837C ;# ptr - .4byte 0x80248448 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024849C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss12creditdedede11StatePraiseFv + .byte4 procAnim__Q53scn4step4boss12creditdedede11StatePraiseFv + .byte4 procMove__Q53scn4step4boss12creditdedede11StatePraiseFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss12creditdedede11StatePraiseFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee11StatePraise$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee11StatePraise$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x80249690 ;# ptr - .4byte 0x80249674 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9creditdee11StatePraise __vt__Q53scn4step4boss9creditdee11StatePraise: .4byte 0 .4byte 0 - .4byte 0x802495A8 ;# ptr - .4byte 0x802495AC ;# ptr - .4byte 0x8024961C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80249670 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9creditdee11StatePraiseFv + .byte4 procAnim__Q53scn4step4boss9creditdee11StatePraiseFv + .byte4 procMove__Q53scn4step4boss9creditdee11StatePraiseFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9creditdee11StatePraiseFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta11StatePraise$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta11StatePraise$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8024AF10 ;# ptr - .4byte 0x8024AEF4 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss10creditmeta11StatePraise __vt__Q53scn4step4boss10creditmeta11StatePraise: .4byte 0 .4byte 0 - .4byte 0x8024AE14 ;# ptr - .4byte 0x8024AE18 ;# ptr - .4byte 0x8024AE9C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024AEF0 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss10creditmeta11StatePraiseFv + .byte4 procAnim__Q53scn4step4boss10creditmeta11StatePraiseFv + .byte4 procMove__Q53scn4step4boss10creditmeta11StatePraiseFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss10creditmeta11StatePraiseFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common11StatePraise __vt__Q53scn4step5enemy6common11StatePraise: .4byte 0 .4byte 0 - .4byte 0x802939F8 ;# ptr - .4byte 0x802939FC ;# ptr - .4byte 0x80293A20 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80293A24 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common11StatePraiseFv + .byte4 procAnim__Q53scn4step5enemy6common11StatePraiseFv + .byte4 procMove__Q53scn4step5enemy6common11StatePraiseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common11StatePraiseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy11StatePraise __vt__Q53scn4step5enemy6bouncy11StatePraise: .4byte 0 .4byte 0 - .4byte 0x8029DD38 ;# ptr - .4byte 0x8029DD3C ;# ptr - .4byte 0x8029DE14 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029DF84 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6bouncy11StatePraiseFv + .byte4 procAnim__Q53scn4step5enemy6bouncy11StatePraiseFv + .byte4 procMove__Q53scn4step5enemy6bouncy11StatePraiseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6bouncy11StatePraiseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sparky11StatePraise __vt__Q53scn4step5enemy6sparky11StatePraise: .4byte 0 .4byte 0 - .4byte 0x802E7594 ;# ptr - .4byte 0x802E7598 ;# ptr - .4byte 0x802E76D0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E77DC ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6sparky11StatePraiseFv + .byte4 procAnim__Q53scn4step5enemy6sparky11StatePraiseFv + .byte4 procMove__Q53scn4step5enemy6sparky11StatePraiseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6sparky11StatePraiseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255711 diff --git a/asm/src/StatePreciousAppear.s b/asm/src/StatePreciousAppear.s index 24643c58..3b5ec67b 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 - .4byte 0x803C8654 - .4byte 0x803C8638 + .byte4 __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateWaft$$4PQ43scn4step4item4Item$$1Fv + .byte4 create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateWaft$$4PQ43scn4step4item4Item$$1Fv .global __vt__Q53scn4step4item5state19StatePreciousAppear __vt__Q53scn4step4item5state19StatePreciousAppear: .4byte 0 .4byte 0 - .4byte 0x803C81DC - .4byte 0x803C8258 - .4byte 0x803C82B0 - .4byte 0x803C5204 + .byte4 __dt__Q53scn4step4item5state19StatePreciousAppearFv + .byte4 procAnim__Q53scn4step4item5state19StatePreciousAppearFv + .byte4 procMove__Q53scn4step4item5state19StatePreciousAppearFv + .byte4 procFixPos__Q43scn4step4item9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255473 diff --git a/asm/src/StatePressFall.s b/asm/src/StatePressFall.s index 8825dde4..1409b9dd 100644 --- a/asm/src/StatePressFall.s +++ b/asm/src/StatePressFall.s @@ -343,12 +343,12 @@ lbl_802564D4: __vt__Q53scn4step4boss9moundeath14StatePressFall: .4byte 0 .4byte 0 - .4byte 0x80256180 ;# ptr - .4byte 0x80256200 ;# ptr - .4byte 0x80256204 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025625C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9moundeath14StatePressFallFv + .byte4 procAnim__Q53scn4step4boss9moundeath14StatePressFallFv + .byte4 procMove__Q53scn4step4boss9moundeath14StatePressFallFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9moundeath14StatePressFallFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256793 diff --git a/asm/src/StatePressFallStart.s b/asm/src/StatePressFallStart.s index 30c9b0c9..ba2689b3 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 - .4byte 0x80256794 ;# ptr - .4byte 0x80256774 ;# ptr + .byte4 __dt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressFall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv + .byte4 create__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressFall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv .global __vt__Q53scn4step4boss9moundeath19StatePressFallStart __vt__Q53scn4step4boss9moundeath19StatePressFallStart: .4byte 0 .4byte 0 - .4byte 0x80256648 ;# ptr - .4byte 0x802566C8 ;# ptr - .4byte 0x8025676C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80256770 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9moundeath19StatePressFallStartFv + .byte4 procAnim__Q53scn4step4boss9moundeath19StatePressFallStartFv + .byte4 procMove__Q53scn4step4boss9moundeath19StatePressFallStartFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9moundeath19StatePressFallStartFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256005 diff --git a/asm/src/StatePressJump.s b/asm/src/StatePressJump.s index f522934e..edf4f11b 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 - .4byte 0x80256D30 ;# ptr - .4byte 0x80256D10 ;# ptr + .byte4 __dt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressFallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv + .byte4 create__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressFallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv .global __vt__Q53scn4step4boss9moundeath14StatePressJump __vt__Q53scn4step4boss9moundeath14StatePressJump: .4byte 0 .4byte 0 - .4byte 0x80256AF4 ;# ptr - .4byte 0x80256AF8 ;# ptr - .4byte 0x80256C28 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80256D0C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9moundeath14StatePressJumpFv + .byte4 procAnim__Q53scn4step4boss9moundeath14StatePressJumpFv + .byte4 procMove__Q53scn4step4boss9moundeath14StatePressJumpFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9moundeath14StatePressJumpFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255442 diff --git a/asm/src/StatePressJumpStart.s b/asm/src/StatePressJumpStart.s index 920fe405..b6f68e76 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 - .4byte 0x80256F60 ;# ptr - .4byte 0x80256F40 ;# ptr + .byte4 __dt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv + .byte4 create__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv .global __vt__Q53scn4step4boss9moundeath19StatePressJumpStart __vt__Q53scn4step4boss9moundeath19StatePressJumpStart: .4byte 0 .4byte 0 - .4byte 0x80256DE0 ;# ptr - .4byte 0x80256DE4 ;# ptr - .4byte 0x80256EE8 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80256F3C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9moundeath19StatePressJumpStartFv + .byte4 procAnim__Q53scn4step4boss9moundeath19StatePressJumpStartFv + .byte4 procMove__Q53scn4step4boss9moundeath19StatePressJumpStartFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9moundeath19StatePressJumpStartFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StatePuff.s b/asm/src/StatePuff.s index 189d5b2a..25c50320 100644 --- a/asm/src/StatePuff.s +++ b/asm/src/StatePuff.s @@ -152,12 +152,12 @@ procMove__Q53scn4step5enemy10stareffect9StatePuffFv: __vt__Q53scn4step5enemy10stareffect9StatePuff: .4byte 0 .4byte 0 - .4byte 0x802E85B4 ;# ptr - .4byte 0x802E8678 ;# ptr - .4byte 0x802E867C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10stareffect9StatePuffFv + .byte4 procAnim__Q53scn4step5enemy10stareffect9StatePuffFv + .byte4 procMove__Q53scn4step5enemy10stareffect9StatePuffFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256196 diff --git a/asm/src/StatePursuit.s b/asm/src/StatePursuit.s index 0d9b205a..5e45dd71 100644 --- a/asm/src/StatePursuit.s +++ b/asm/src/StatePursuit.s @@ -844,24 +844,24 @@ __dt__Q53scn4step5enemy10brontoburt12StatePursuitFv: __vt__Q53scn4step5enemy6common12StatePursuit: .4byte 0 .4byte 0 - .4byte 0x80294004 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x80293AAC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80293E68 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common12StatePursuitFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy6common12StatePursuitFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common12StatePursuitFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10brontoburt12StatePursuit __vt__Q53scn4step5enemy10brontoburt12StatePursuit: .4byte 0 .4byte 0 - .4byte 0x802A00C8 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x8029FB00 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029FEBC ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10brontoburt12StatePursuitFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy10brontoburt12StatePursuitFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10brontoburt12StatePursuitFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256157 diff --git a/asm/src/StateQuivery.s b/asm/src/StateQuivery.s index c666faa6..46c6a2c2 100644 --- a/asm/src/StateQuivery.s +++ b/asm/src/StateQuivery.s @@ -225,12 +225,12 @@ reqQuivery__Q53scn4step4boss13watergalboros12StateQuiveryFv: __vt__Q53scn4step4boss13watergalboros12StateQuivery: .4byte 0 .4byte 0 - .4byte 0x8025A8AC ;# ptr - .4byte 0x8025A8B0 ;# ptr - .4byte 0x8025AA00 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025AA04 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss13watergalboros12StateQuiveryFv + .byte4 procAnim__Q53scn4step4boss13watergalboros12StateQuiveryFv + .byte4 procMove__Q53scn4step4boss13watergalboros12StateQuiveryFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss13watergalboros12StateQuiveryFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256461 diff --git a/asm/src/StateRainBomb.s b/asm/src/StateRainBomb.s index 38cb67f2..f2b0fc20 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 - .4byte 0x80238C3C ;# ptr - .4byte 0x80238C20 ;# ptr + .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateFall$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateFall$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss7bonkers13StateRainBomb __vt__Q53scn4step4boss7bonkers13StateRainBomb: .4byte 0 .4byte 0 - .4byte 0x802388C8 ;# ptr - .4byte 0x80238948 ;# ptr - .4byte 0x80238A54 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80238A58 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss7bonkers13StateRainBombFv + .byte4 procAnim__Q53scn4step4boss7bonkers13StateRainBombFv + .byte4 procMove__Q53scn4step4boss7bonkers13StateRainBombFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss7bonkers13StateRainBombFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256362 diff --git a/asm/src/StateRainBombStart.s b/asm/src/StateRainBombStart.s index aaa93005..7e4a64a5 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 - .4byte 0x80238FF8 ;# ptr - .4byte 0x80238FAC ;# ptr + .byte4 __dt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateRainBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1Fv + .byte4 create__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateRainBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1Fv .global __vt__Q53scn4step4boss7bonkers18StateRainBombStart __vt__Q53scn4step4boss7bonkers18StateRainBombStart: .4byte 0 .4byte 0 - .4byte 0x80238D90 ;# ptr - .4byte 0x80238D94 ;# ptr - .4byte 0x80238E7C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80238FA8 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss7bonkers18StateRainBombStartFv + .byte4 procAnim__Q53scn4step4boss7bonkers18StateRainBombStartFv + .byte4 procMove__Q53scn4step4boss7bonkers18StateRainBombStartFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss7bonkers18StateRainBombStartFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255597 diff --git a/asm/src/StateReady.s b/asm/src/StateReady.s index 0c7a419f..bfcf8d35 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 - .4byte 0x803F1070 - .4byte 0x803F1050 + .byte4 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q53scn4step6weapon19challengemastershot10StateReady __vt__Q53scn4step6weapon19challengemastershot10StateReady: .4byte 0 .4byte 0 - .4byte 0x803F106C - .4byte 0x803F08D8 - .4byte 0x803F0AC4 - .4byte 0x803D895C - .4byte 0x803F0DD8 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon19challengemastershot10StateReadyFv + .byte4 procAnim__Q53scn4step6weapon19challengemastershot10StateReadyFv + .byte4 procMove__Q53scn4step6weapon19challengemastershot10StateReadyFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon19challengemastershot10StateReadyFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257357 diff --git a/asm/src/StateReflect.s b/asm/src/StateReflect.s index 1352a289..1f46685b 100644 --- a/asm/src/StateReflect.s +++ b/asm/src/StateReflect.s @@ -669,24 +669,24 @@ procObjCollReact__Q53scn4step6weapon8deespear12StateReflectFv: __vt__Q53scn4step6weapon10spearspear12StateReflect: .4byte 0 .4byte 0 - .4byte 0x803E471C - .4byte 0x803E47C8 - .4byte 0x803E48C0 - .4byte 0x803D895C - .4byte 0x803E48C4 - .4byte 0x803E4AF4 + .byte4 __dt__Q53scn4step6weapon10spearspear12StateReflectFv + .byte4 procAnim__Q53scn4step6weapon10spearspear12StateReflectFv + .byte4 procMove__Q53scn4step6weapon10spearspear12StateReflectFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon10spearspear12StateReflectFv + .byte4 procObjCollReact__Q53scn4step6weapon10spearspear12StateReflectFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8deespear12StateReflect __vt__Q53scn4step6weapon8deespear12StateReflect: .4byte 0 .4byte 0 - .4byte 0x803ED730 - .4byte 0x803ED7DC - .4byte 0x803ED8D4 - .4byte 0x803D895C - .4byte 0x803ED8D8 - .4byte 0x803EDB08 + .byte4 __dt__Q53scn4step6weapon8deespear12StateReflectFv + .byte4 procAnim__Q53scn4step6weapon8deespear12StateReflectFv + .byte4 procMove__Q53scn4step6weapon8deespear12StateReflectFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon8deespear12StateReflectFv + .byte4 procObjCollReact__Q53scn4step6weapon8deespear12StateReflectFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257330 diff --git a/asm/src/StateReturnWarpLowper.s b/asm/src/StateReturnWarpLowper.s index 4f9b75a4..acabc697 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 - .4byte 0x80381E1C - .4byte 0x80381DF8 + .byte4 __dt__Q24util120StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero6common9StateDemo$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$4b$$1Fv + .byte4 create__Q24util120StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero6common9StateDemo$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$4b$$1Fv .global __vt__Q53scn4step4hero7gimmick21StateReturnWarpLowper __vt__Q53scn4step4hero7gimmick21StateReturnWarpLowper: .4byte 0 .4byte 0 - .4byte 0x80381954 - .4byte 0x80381A88 - .4byte 0x80381C0C - .4byte 0x8035550C - .4byte 0x80381DF4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick21StateReturnWarpLowperFv + .byte4 procAnim__Q53scn4step4hero7gimmick21StateReturnWarpLowperFv + .byte4 procMove__Q53scn4step4hero7gimmick21StateReturnWarpLowperFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick21StateReturnWarpLowperFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateRise.s b/asm/src/StateRise.s index 438768f0..a6ac73ef 100644 --- a/asm/src/StateRise.s +++ b/asm/src/StateRise.s @@ -222,12 +222,12 @@ __dt__Q53scn4step5enemy7parasol9StateRiseFv: __vt__Q53scn4step5enemy7parasol9StateRise: .4byte 0 .4byte 0 - .4byte 0x802CB6DC ;# ptr - .4byte 0x802CB4D0 ;# ptr - .4byte 0x802CB560 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802CB5F8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7parasol9StateRiseFv + .byte4 procAnim__Q53scn4step5enemy7parasol9StateRiseFv + .byte4 procMove__Q53scn4step5enemy7parasol9StateRiseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7parasol9StateRiseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255826 diff --git a/asm/src/StateRising.s b/asm/src/StateRising.s index bd77c31c..4070a845 100644 --- a/asm/src/StateRising.s +++ b/asm/src/StateRising.s @@ -557,25 +557,25 @@ lbl_8039E18C: __vt__Q53scn4step5enemy10knucklejoe11StateRising: .4byte 0 .4byte 0 - .4byte 0x802C0454 ;# ptr - .4byte 0x802C04FC ;# ptr - .4byte 0x802C0638 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C06A8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10knucklejoe11StateRisingFv + .byte4 procAnim__Q53scn4step5enemy10knucklejoe11StateRisingFv + .byte4 procMove__Q53scn4step5enemy10knucklejoe11StateRisingFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10knucklejoe11StateRisingFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter11StateRising __vt__Q53scn4step4hero7fighter11StateRising: .4byte 0 .4byte 0 - .4byte 0x8039DECC - .4byte 0x8039DF84 - .4byte 0x8039E000 - .4byte 0x8035550C - .4byte 0x8039E110 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter11StateRisingFv + .byte4 procAnim__Q53scn4step4hero7fighter11StateRisingFv + .byte4 procMove__Q53scn4step4hero7fighter11StateRisingFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter11StateRisingFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateRoah.s b/asm/src/StateRoah.s index 86805ee0..529acb39 100644 --- a/asm/src/StateRoah.s +++ b/asm/src/StateRoah.s @@ -179,10 +179,10 @@ procFixPos__Q53scn4step4item5state9StateRoahFv: __vt__Q53scn4step4item5state9StateRoah: .4byte 0 .4byte 0 - .4byte 0x803C8748 - .4byte 0x803C874C - .4byte 0x803C8750 - .4byte 0x803C88C8 + .byte4 __dt__Q53scn4step4item5state9StateRoahFv + .byte4 procAnim__Q53scn4step4item5state9StateRoahFv + .byte4 procMove__Q53scn4step4item5state9StateRoahFv + .byte4 procFixPos__Q53scn4step4item5state9StateRoahFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255795 diff --git a/asm/src/StateRollJump.s b/asm/src/StateRollJump.s index 617c45d7..0ac7e6bc 100644 --- a/asm/src/StateRollJump.s +++ b/asm/src/StateRollJump.s @@ -364,12 +364,12 @@ procFixPos__Q53scn4step4boss9moundeath13StateRollJumpFv: __vt__Q53scn4step4boss9moundeath13StateRollJump: .4byte 0 .4byte 0 - .4byte 0x80257C18 ;# ptr - .4byte 0x80257C98 ;# ptr - .4byte 0x80257E50 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80257F8C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9moundeath13StateRollJumpFv + .byte4 procAnim__Q53scn4step4boss9moundeath13StateRollJumpFv + .byte4 procMove__Q53scn4step4boss9moundeath13StateRollJumpFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9moundeath13StateRollJumpFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256524 diff --git a/asm/src/StateRolling.s b/asm/src/StateRolling.s index f022743c..716bccf2 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 - .4byte 0x80257620 ;# ptr - .4byte 0x80257604 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath15StateRollingEnd$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath15StateRollingEnd$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9moundeath12StateRolling __vt__Q53scn4step4boss9moundeath12StateRolling: .4byte 0 .4byte 0 - .4byte 0x802570D0 ;# ptr - .4byte 0x8025714C ;# ptr - .4byte 0x80257288 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025742C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9moundeath12StateRollingFv + .byte4 procAnim__Q53scn4step4boss9moundeath12StateRollingFv + .byte4 procMove__Q53scn4step4boss9moundeath12StateRollingFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9moundeath12StateRollingFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257155 diff --git a/asm/src/StateRollingEnd.s b/asm/src/StateRollingEnd.s index fa0554fc..e000e4d9 100644 --- a/asm/src/StateRollingEnd.s +++ b/asm/src/StateRollingEnd.s @@ -69,9 +69,9 @@ procFixPos__Q53scn4step4boss9moundeath15StateRollingEndFv: __vt__Q53scn4step4boss9moundeath15StateRollingEnd: .4byte 0 .4byte 0 - .4byte 0x80257684 ;# ptr - .4byte 0x80257688 ;# ptr - .4byte 0x8025768C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802576E0 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9moundeath15StateRollingEndFv + .byte4 procAnim__Q53scn4step4boss9moundeath15StateRollingEndFv + .byte4 procMove__Q53scn4step4boss9moundeath15StateRollingEndFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9moundeath15StateRollingEndFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateRollingStart.s b/asm/src/StateRollingStart.s index aba26b4a..a594d360 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 - .4byte 0x80257A5C ;# ptr - .4byte 0x80257A40 ;# ptr + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath12StateRolling$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath12StateRolling$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9moundeath17StateRollingStart __vt__Q53scn4step4boss9moundeath17StateRollingStart: .4byte 0 .4byte 0 - .4byte 0x80257810 ;# ptr - .4byte 0x8025788C ;# ptr - .4byte 0x802579CC ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80257A3C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9moundeath17StateRollingStartFv + .byte4 procAnim__Q53scn4step4boss9moundeath17StateRollingStartFv + .byte4 procMove__Q53scn4step4boss9moundeath17StateRollingStartFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9moundeath17StateRollingStartFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256231 diff --git a/asm/src/StateRoomGuarderAppear.s b/asm/src/StateRoomGuarderAppear.s index 007b2ec0..6089b1e7 100644 --- a/asm/src/StateRoomGuarderAppear.s +++ b/asm/src/StateRoomGuarderAppear.s @@ -226,12 +226,12 @@ procMove__Q53scn4step5enemy6common22StateRoomGuarderAppearFv: __vt__Q53scn4step5enemy6common22StateRoomGuarderAppear: .4byte 0 .4byte 0 - .4byte 0x802940E4 ;# ptr - .4byte 0x80294194 ;# ptr - .4byte 0x80294334 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common22StateRoomGuarderAppearFv + .byte4 procAnim__Q53scn4step5enemy6common22StateRoomGuarderAppearFv + .byte4 procMove__Q53scn4step5enemy6common22StateRoomGuarderAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256208 diff --git a/asm/src/StateRootAttack.s b/asm/src/StateRootAttack.s index bcb8c8c3..aab07d3d 100644 --- a/asm/src/StateRootAttack.s +++ b/asm/src/StateRootAttack.s @@ -149,12 +149,12 @@ procFixPos__Q53scn4step4boss6whispy15StateRootAttackFv: __vt__Q53scn4step4boss6whispy15StateRootAttack: .4byte 0 .4byte 0 - .4byte 0x8025DD48 ;# ptr - .4byte 0x8025DD4C ;# ptr - .4byte 0x8025DEE0 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025DEE4 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy15StateRootAttackFv + .byte4 procAnim__Q53scn4step4boss6whispy15StateRootAttackFv + .byte4 procMove__Q53scn4step4boss6whispy15StateRootAttackFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy15StateRootAttackFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256375 diff --git a/asm/src/StateRun.s b/asm/src/StateRun.s index b075130f..16e7bca7 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 - .4byte 0x8024970C ;# ptr - .4byte 0x80249710 ;# ptr - .4byte 0x80249738 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802497A4 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9creditdee8StateRunFv + .byte4 procAnim__Q53scn4step4boss9creditdee8StateRunFv + .byte4 procMove__Q53scn4step4boss9creditdee8StateRunFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9creditdee8StateRunFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateRun$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateRun$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80368BB8 - .4byte 0x80368B9C + .byte4 __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateRun$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateRun$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common8StateRun __vt__Q53scn4step4hero6common8StateRun: .4byte 0 .4byte 0 - .4byte 0x80368824 - .4byte 0x803688D4 - .4byte 0x80368AD4 - .4byte 0x8035550C - .4byte 0x80368AD8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common8StateRunFv + .byte4 procAnim__Q53scn4step4hero6common8StateRunFv + .byte4 procMove__Q53scn4step4hero6common8StateRunFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common8StateRunFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateRunAppear.s b/asm/src/StateRunAppear.s index b497e144..068581ed 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 - .4byte 0x80249BF4 ;# ptr - .4byte 0x80249BB8 ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StatePick$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StatePick$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateRunAppear$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateRunAppear$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x80249BF0 ;# ptr - .4byte 0x80249BD4 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateRunAppear$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateRunAppear$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9creditdee14StateRunAppear __vt__Q53scn4step4boss9creditdee14StateRunAppear: .4byte 0 .4byte 0 - .4byte 0x80249A48 ;# ptr - .4byte 0x80249A4C ;# ptr - .4byte 0x80249A50 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80249ABC ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9creditdee14StateRunAppearFv + .byte4 procAnim__Q53scn4step4boss9creditdee14StateRunAppearFv + .byte4 procMove__Q53scn4step4boss9creditdee14StateRunAppearFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9creditdee14StateRunAppearFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255551 diff --git a/asm/src/StateSCFlyAway.s b/asm/src/StateSCFlyAway.s index e71c78fb..08db5981 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 - .4byte 0x802422DC ;# ptr - .4byte 0x802422C0 ;# ptr + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCFlyAway$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCFlyAway$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster14StateSCFlyAway __vt__Q53scn4step4boss15challengemaster14StateSCFlyAway: .4byte 0 .4byte 0 - .4byte 0x80241B80 ;# ptr - .4byte 0x80241C2C ;# ptr - .4byte 0x80241D18 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80241F58 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster14StateSCFlyAwayFv + .byte4 procAnim__Q53scn4step4boss15challengemaster14StateSCFlyAwayFv + .byte4 procMove__Q53scn4step4boss15challengemaster14StateSCFlyAwayFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster14StateSCFlyAwayFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255744 diff --git a/asm/src/StateSCHide.s b/asm/src/StateSCHide.s index d94a572f..013e87dd 100644 --- a/asm/src/StateSCHide.s +++ b/asm/src/StateSCHide.s @@ -109,9 +109,9 @@ procFixPos__Q53scn4step4boss15challengemaster11StateSCHideFv: __vt__Q53scn4step4boss15challengemaster11StateSCHide: .4byte 0 .4byte 0 - .4byte 0x8024237C ;# ptr - .4byte 0x8024240C ;# ptr - .4byte 0x80242434 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80242438 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster11StateSCHideFv + .byte4 procAnim__Q53scn4step4boss15challengemaster11StateSCHideFv + .byte4 procMove__Q53scn4step4boss15challengemaster11StateSCHideFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster11StateSCHideFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateSCLookFar.s b/asm/src/StateSCLookFar.s index eb400a41..ad00ce4a 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 - .4byte 0x80242640 ;# ptr - .4byte 0x80242624 ;# ptr + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCLookFar$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCLookFar$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster14StateSCLookFar __vt__Q53scn4step4boss15challengemaster14StateSCLookFar: .4byte 0 .4byte 0 - .4byte 0x80242554 ;# ptr - .4byte 0x80242558 ;# ptr - .4byte 0x802425BC ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802425C0 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster14StateSCLookFarFv + .byte4 procAnim__Q53scn4step4boss15challengemaster14StateSCLookFarFv + .byte4 procMove__Q53scn4step4boss15challengemaster14StateSCLookFarFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster14StateSCLookFarFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateSCLookKirby.s b/asm/src/StateSCLookKirby.s index 2133a8f2..a0a7c288 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 - .4byte 0x80242A78 ;# ptr - .4byte 0x80242A38 ;# ptr + .byte4 __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCPursuit$$4PQ43scn4step4boss4Boss$$4b$$1Fv + .byte4 create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCPursuit$$4PQ43scn4step4boss4Boss$$4b$$1Fv .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster16StateSCLookKirby$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster16StateSCLookKirby$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x80242A74 ;# ptr - .4byte 0x80242A58 ;# ptr + .byte4 __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster16StateSCLookKirby$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster16StateSCLookKirby$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster16StateSCLookKirby __vt__Q53scn4step4boss15challengemaster16StateSCLookKirby: .4byte 0 .4byte 0 - .4byte 0x80242794 ;# ptr - .4byte 0x80242798 ;# ptr - .4byte 0x8024283C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80242A34 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster16StateSCLookKirbyFv + .byte4 procAnim__Q53scn4step4boss15challengemaster16StateSCLookKirbyFv + .byte4 procMove__Q53scn4step4boss15challengemaster16StateSCLookKirbyFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster16StateSCLookKirbyFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255360 diff --git a/asm/src/StateSCPursuit.s b/asm/src/StateSCPursuit.s index f443aad6..73e7ec39 100644 --- a/asm/src/StateSCPursuit.s +++ b/asm/src/StateSCPursuit.s @@ -309,12 +309,12 @@ procFixPos__Q53scn4step4boss15challengemaster14StateSCPursuitFv: __vt__Q53scn4step4boss15challengemaster14StateSCPursuit: .4byte 0 .4byte 0 - .4byte 0x80242C60 ;# ptr - .4byte 0x80242C64 ;# ptr - .4byte 0x80242CAC ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80242ECC ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster14StateSCPursuitFv + .byte4 procAnim__Q53scn4step4boss15challengemaster14StateSCPursuitFv + .byte4 procMove__Q53scn4step4boss15challengemaster14StateSCPursuitFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster14StateSCPursuitFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256097 diff --git a/asm/src/StateSelect.s b/asm/src/StateSelect.s index 3888a377..e7f2cbae 100644 --- a/asm/src/StateSelect.s +++ b/asm/src/StateSelect.s @@ -953,5 +953,5 @@ lbl_8035E29C: __vt__Q53scn4step4hero8inactive11StateSelect: .4byte 0 .4byte 0 - .4byte 0x8035D6AC - .4byte 0x8035D72C + .byte4 __dt__Q53scn4step4hero8inactive11StateSelectFv + .byte4 proc__Q53scn4step4hero8inactive11StateSelectFv diff --git a/asm/src/StateShipRepairDemo.s b/asm/src/StateShipRepairDemo.s index 8e6adf9d..ffa9c3d1 100644 --- a/asm/src/StateShipRepairDemo.s +++ b/asm/src/StateShipRepairDemo.s @@ -395,13 +395,13 @@ procFixPos__Q53scn4step4hero6common19StateShipRepairDemoFv: __vt__Q53scn4step4hero6common19StateShipRepairDemo: .4byte 0 .4byte 0 - .4byte 0x80368D04 - .4byte 0x80368DF4 - .4byte 0x8036907C - .4byte 0x8035550C - .4byte 0x80369120 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common19StateShipRepairDemoFv + .byte4 procAnim__Q53scn4step4hero6common19StateShipRepairDemoFv + .byte4 procMove__Q53scn4step4hero6common19StateShipRepairDemoFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common19StateShipRepairDemoFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateShipRepairDemoAfter.s b/asm/src/StateShipRepairDemoAfter.s index 230328c1..6b5b62a5 100644 --- a/asm/src/StateShipRepairDemoAfter.s +++ b/asm/src/StateShipRepairDemoAfter.s @@ -261,13 +261,13 @@ lbl_803694DC: __vt__Q53scn4step4hero6common24StateShipRepairDemoAfter: .4byte 0 .4byte 0 - .4byte 0x80369294 - .4byte 0x80369344 - .4byte 0x80369410 - .4byte 0x8035550C - .4byte 0x803694A8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common24StateShipRepairDemoAfterFv + .byte4 procAnim__Q53scn4step4hero6common24StateShipRepairDemoAfterFv + .byte4 procMove__Q53scn4step4hero6common24StateShipRepairDemoAfterFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common24StateShipRepairDemoAfterFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateShipRepairDemoAfterFollow.s b/asm/src/StateShipRepairDemoAfterFollow.s index 9aa2eb4e..417984c2 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 - .4byte 0x80369840 - .4byte 0x803698F0 - .4byte 0x803699E4 - .4byte 0x8035550C - .4byte 0x80369AB0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common30StateShipRepairDemoAfterFollowFv + .byte4 procAnim__Q53scn4step4hero6common30StateShipRepairDemoAfterFollowFv + .byte4 procMove__Q53scn4step4hero6common30StateShipRepairDemoAfterFollowFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common30StateShipRepairDemoAfterFollowFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateShipRepairDemoFollow.s b/asm/src/StateShipRepairDemoFollow.s index e04e192b..2558614a 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 - .4byte 0x80369D4C - .4byte 0x80369E4C - .4byte 0x8036A028 - .4byte 0x8035550C - .4byte 0x8036A0CC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common25StateShipRepairDemoFollowFv + .byte4 procAnim__Q53scn4step4hero6common25StateShipRepairDemoFollowFv + .byte4 procMove__Q53scn4step4hero6common25StateShipRepairDemoFollowFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common25StateShipRepairDemoFollowFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateShot.s b/asm/src/StateShot.s index ac00be58..e4cb14d9 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 - .4byte 0x802432C4 ;# ptr - .4byte 0x802432A8 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateShot$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateShot$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster9StateShot __vt__Q53scn4step4boss15challengemaster9StateShot: .4byte 0 .4byte 0 - .4byte 0x80242FFC ;# ptr - .4byte 0x80243098 ;# ptr - .4byte 0x80243240 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80243244 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster9StateShotFv + .byte4 procAnim__Q53scn4step4boss15challengemaster9StateShotFv + .byte4 procMove__Q53scn4step4boss15challengemaster9StateShotFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster9StateShotFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior9StateShot __vt__Q53scn4step4boss6dubior9StateShot: .4byte 0 .4byte 0 - .4byte 0x802503A4 ;# ptr - .4byte 0x802503A8 ;# ptr - .4byte 0x80250464 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80250468 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6dubior9StateShotFv + .byte4 procAnim__Q53scn4step4boss6dubior9StateShotFv + .byte4 procMove__Q53scn4step4boss6dubior9StateShotFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6dubior9StateShotFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss10gigantedge9StateShot __vt__Q53scn4step4boss10gigantedge9StateShot: .4byte 0 .4byte 0 - .4byte 0x802526CC ;# ptr - .4byte 0x802526D0 ;# ptr - .4byte 0x802527F8 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802527FC ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss10gigantedge9StateShotFv + .byte4 procAnim__Q53scn4step4boss10gigantedge9StateShotFv + .byte4 procMove__Q53scn4step4boss10gigantedge9StateShotFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss10gigantedge9StateShotFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x8029C844 ;# ptr - .4byte 0x8029C828 ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy11bonkersbomb9StateShot __vt__Q53scn4step5enemy11bonkersbomb9StateShot: .4byte 0 .4byte 0 - .4byte 0x8029C638 ;# ptr - .4byte 0x8029C63C ;# ptr - .4byte 0x8029C6F8 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029C784 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11bonkersbomb9StateShotFv + .byte4 procAnim__Q53scn4step5enemy11bonkersbomb9StateShotFv + .byte4 procMove__Q53scn4step5enemy11bonkersbomb9StateShotFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11bonkersbomb9StateShotFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11dubiorspark9StateShot __vt__Q53scn4step5enemy11dubiorspark9StateShot: .4byte 0 .4byte 0 - .4byte 0x802AF05C ;# ptr - .4byte 0x802AF060 ;# ptr - .4byte 0x802AF064 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802AF0B8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11dubiorspark9StateShotFv + .byte4 procAnim__Q53scn4step5enemy11dubiorspark9StateShotFv + .byte4 procMove__Q53scn4step5enemy11dubiorspark9StateShotFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11dubiorspark9StateShotFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy14poppybrojrbomb9StateShot __vt__Q53scn4step5enemy14poppybrojrbomb9StateShot: .4byte 0 .4byte 0 - .4byte 0x802D2E40 ;# ptr - .4byte 0x802D2E44 ;# ptr - .4byte 0x802D2FAC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D3010 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy14poppybrojrbomb9StateShotFv + .byte4 procAnim__Q53scn4step5enemy14poppybrojrbomb9StateShotFv + .byte4 procMove__Q53scn4step5enemy14poppybrojrbomb9StateShotFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy14poppybrojrbomb9StateShotFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo9StateShot __vt__Q53scn4step5enemy6shotzo9StateShot: .4byte 0 .4byte 0 - .4byte 0x802E0E84 ;# ptr - .4byte 0x802E0B28 ;# ptr - .4byte 0x802E0B44 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E0C40 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6shotzo9StateShotFv + .byte4 procAnim__Q53scn4step5enemy6shotzo9StateShotFv + .byte4 procMove__Q53scn4step5enemy6shotzo9StateShotFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6shotzo9StateShotFv + .byte4 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 - .4byte 0x8038F548 - .4byte 0x8038F528 + .byte4 __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5spark9StateShot$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .byte4 create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5spark9StateShot$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q53scn4step4hero5spark9StateShot __vt__Q53scn4step4hero5spark9StateShot: .4byte 0 .4byte 0 - .4byte 0x8038F15C - .4byte 0x8038F1FC - .4byte 0x8038F410 - .4byte 0x8035550C - .4byte 0x8038F49C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5spark9StateShotFv + .byte4 procAnim__Q53scn4step4hero5spark9StateShotFv + .byte4 procMove__Q53scn4step4hero5spark9StateShotFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5spark9StateShotFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 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 - .4byte 0x8039987C - .4byte 0x80399860 + .byte4 __dt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateShot$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateShot$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4wing9StateShot __vt__Q53scn4step4hero4wing9StateShot: .4byte 0 .4byte 0 - .4byte 0x80399008 - .4byte 0x803990AC - .4byte 0x803992CC - .4byte 0x8035550C - .4byte 0x803992D0 - .4byte 0x803992D4 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4wing9StateShotFv + .byte4 procAnim__Q53scn4step4hero4wing9StateShotFv + .byte4 procMove__Q53scn4step4hero4wing9StateShotFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4wing9StateShotFv + .byte4 procObjCollReact__Q53scn4step4hero4wing9StateShotFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -3243,13 +3243,13 @@ __vt__Q53scn4step4hero4wing9StateShot: __vt__Q53scn4step4hero7fighter9StateShot: .4byte 0 .4byte 0 - .4byte 0x8039E2B8 - .4byte 0x8039E334 - .4byte 0x8039E3C8 - .4byte 0x8035550C - .4byte 0x8039E460 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter9StateShotFv + .byte4 procAnim__Q53scn4step4hero7fighter9StateShotFv + .byte4 procMove__Q53scn4step4hero7fighter9StateShotFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter9StateShotFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateShotAirBall.s b/asm/src/StateShotAirBall.s index 7f599587..384404d7 100644 --- a/asm/src/StateShotAirBall.s +++ b/asm/src/StateShotAirBall.s @@ -358,13 +358,13 @@ procFixPos__Q53scn4step4hero6common16StateShotAirBallFv: __vt__Q53scn4step4boss6whispy16StateShotAirBall: .4byte 0 .4byte 0 - .4byte 0x8025E12C ;# ptr - .4byte 0x8025E210 ;# ptr - .4byte 0x8025E37C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025E380 ;# ptr - .4byte 0x80234504 ;# ptr - .4byte 0x8025DF8C ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy16StateShotAirBallFv + .byte4 procAnim__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .byte4 procMove__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .byte4 reqAirBall__Q53scn4step4boss6whispy16StateShotAirBallFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -372,13 +372,13 @@ __vt__Q53scn4step4boss6whispy16StateShotAirBall: __vt__Q53scn4step4hero6common16StateShotAirBall: .4byte 0 .4byte 0 - .4byte 0x8036A19C - .4byte 0x8036A218 - .4byte 0x8036A2B4 - .4byte 0x8035550C - .4byte 0x8036A32C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common16StateShotAirBallFv + .byte4 procAnim__Q53scn4step4hero6common16StateShotAirBallFv + .byte4 procMove__Q53scn4step4hero6common16StateShotAirBallFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common16StateShotAirBallFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateShotAirBallBase.s b/asm/src/StateShotAirBallBase.s index de64bbe2..cf33f016 100644 --- a/asm/src/StateShotAirBallBase.s +++ b/asm/src/StateShotAirBallBase.s @@ -154,11 +154,11 @@ procFixPos__Q53scn4step4boss6whispy20StateShotAirBallBaseFv: __vt__Q53scn4step4boss6whispy20StateShotAirBallBase: .4byte 0 .4byte 0 - .4byte 0x8025DF88 ;# ptr - .4byte 0x8025E210 ;# ptr - .4byte 0x8025E37C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025E380 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .byte4 procAnim__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .byte4 procMove__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .4byte 0 .4byte 0 diff --git a/asm/src/StateShotAirBallBig.s b/asm/src/StateShotAirBallBig.s index 096e93ee..af8dbd41 100644 --- a/asm/src/StateShotAirBallBig.s +++ b/asm/src/StateShotAirBallBig.s @@ -218,11 +218,11 @@ __dt__Q53scn4step4boss6whispy19StateShotAirBallBigFv: __vt__Q53scn4step4boss6whispy19StateShotAirBallBig: .4byte 0 .4byte 0 - .4byte 0x8025E6A0 ;# ptr - .4byte 0x8025E210 ;# ptr - .4byte 0x8025E37C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025E380 ;# ptr - .4byte 0x80234504 ;# ptr - .4byte 0x8025E3C0 ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy19StateShotAirBallBigFv + .byte4 procAnim__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .byte4 procMove__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .byte4 reqAirBall__Q53scn4step4boss6whispy19StateShotAirBallBigFv .4byte 0 diff --git a/asm/src/StateShotAirBallTornado.s b/asm/src/StateShotAirBallTornado.s index 6972dfcb..bce934f5 100644 --- a/asm/src/StateShotAirBallTornado.s +++ b/asm/src/StateShotAirBallTornado.s @@ -156,13 +156,13 @@ __dt__Q53scn4step4boss6whispy23StateShotAirBallTornadoFv: __vt__Q53scn4step4boss6whispy23StateShotAirBallTornado: .4byte 0 .4byte 0 - .4byte 0x8025E8D4 ;# ptr - .4byte 0x8025E210 ;# ptr - .4byte 0x8025E37C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025E380 ;# ptr - .4byte 0x80234504 ;# ptr - .4byte 0x8025E6E8 ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy23StateShotAirBallTornadoFv + .byte4 procAnim__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .byte4 procMove__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy20StateShotAirBallBaseFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv + .byte4 reqAirBall__Q53scn4step4boss6whispy23StateShotAirBallTornadoFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateShuttleLoop.s b/asm/src/StateShuttleLoop.s index e4236bb2..c1d088d4 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 - .4byte 0x8024B390 ;# ptr - .4byte 0x8024B354 ;# ptr + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta14StateGlideAway$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta14StateGlideAway$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta16StateShuttleLoop$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta16StateShuttleLoop$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8024B38C ;# ptr - .4byte 0x8024B370 ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta16StateShuttleLoop$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta16StateShuttleLoop$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss10creditmeta16StateShuttleLoop __vt__Q53scn4step4boss10creditmeta16StateShuttleLoop: .4byte 0 .4byte 0 - .4byte 0x8024B0E0 ;# ptr - .4byte 0x8024B0E4 ;# ptr - .4byte 0x8024B174 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024B350 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss10creditmeta16StateShuttleLoopFv + .byte4 procAnim__Q53scn4step4boss10creditmeta16StateShuttleLoopFv + .byte4 procMove__Q53scn4step4boss10creditmeta16StateShuttleLoopFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss10creditmeta16StateShuttleLoopFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateShuttleLoopEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateShuttleLoopEnd$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80399D14 - .4byte 0x80399CD8 + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateShuttleLoopEnd$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateShuttleLoopEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateShuttleLoop$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateShuttleLoop$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80399D10 - .4byte 0x80399CF4 + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateShuttleLoop$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateShuttleLoop$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4wing16StateShuttleLoop __vt__Q53scn4step4hero4wing16StateShuttleLoop: .4byte 0 .4byte 0 - .4byte 0x803999C0 - .4byte 0x80399A78 - .4byte 0x80399B1C - .4byte 0x8035550C - .4byte 0x80399CD4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4wing16StateShuttleLoopFv + .byte4 procAnim__Q53scn4step4hero4wing16StateShuttleLoopFv + .byte4 procMove__Q53scn4step4hero4wing16StateShuttleLoopFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4wing16StateShuttleLoopFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateShuttleLoopEnd.s b/asm/src/StateShuttleLoopEnd.s index 41678702..e521ae21 100644 --- a/asm/src/StateShuttleLoopEnd.s +++ b/asm/src/StateShuttleLoopEnd.s @@ -191,11 +191,11 @@ procFixPos__Q53scn4step4hero4wing19StateShuttleLoopEndFv: __vt__Q53scn4step4hero4wing19StateShuttleLoopEnd: .4byte 0 .4byte 0 - .4byte 0x80399DE0 - .4byte 0x80399E84 - .4byte 0x80399EE0 - .4byte 0x8035550C - .4byte 0x80399FA8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4wing19StateShuttleLoopEndFv + .byte4 procAnim__Q53scn4step4hero4wing19StateShuttleLoopEndFv + .byte4 procMove__Q53scn4step4hero4wing19StateShuttleLoopEndFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4wing19StateShuttleLoopEndFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSkinned.s b/asm/src/StateSkinned.s index 8a8392cb..b59feda5 100644 --- a/asm/src/StateSkinned.s +++ b/asm/src/StateSkinned.s @@ -319,9 +319,9 @@ lbl_802A3900: __vt__Q53scn4step5enemy5cappy12StateSkinned: .4byte 0 .4byte 0 - .4byte 0x802A36A4 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802A371C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A3774 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5cappy12StateSkinnedFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy5cappy12StateSkinnedFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5cappy12StateSkinnedFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateSkyKick.s b/asm/src/StateSkyKick.s index f2083570..86fe4345 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 - .4byte 0x8039EA6C - .4byte 0x8039EA30 + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateSkyKickHit$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateSkyKickHit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter12StateSkyKick$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter12StateSkyKick$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8039EA68 - .4byte 0x8039EA4C + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter12StateSkyKick$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter12StateSkyKick$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7fighter12StateSkyKick __vt__Q53scn4step4hero7fighter12StateSkyKick: .4byte 0 .4byte 0 - .4byte 0x8039E820 - .4byte 0x8039E824 - .4byte 0x8039E8E8 - .4byte 0x8035550C - .4byte 0x8039E944 - .4byte 0x8039E990 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter12StateSkyKickFv + .byte4 procAnim__Q53scn4step4hero7fighter12StateSkyKickFv + .byte4 procMove__Q53scn4step4hero7fighter12StateSkyKickFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter12StateSkyKickFv + .byte4 procObjCollReact__Q53scn4step4hero7fighter12StateSkyKickFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSkyKickHit.s b/asm/src/StateSkyKickHit.s index db7756c1..c54c5c5e 100644 --- a/asm/src/StateSkyKickHit.s +++ b/asm/src/StateSkyKickHit.s @@ -272,13 +272,13 @@ procFixPos__Q53scn4step4hero7fighter15StateSkyKickHitFv: __vt__Q53scn4step4hero7fighter15StateSkyKickHit: .4byte 0 .4byte 0 - .4byte 0x8039EBA4 - .4byte 0x8039EBA8 - .4byte 0x8039ED50 - .4byte 0x8035550C - .4byte 0x8039EE38 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter15StateSkyKickHitFv + .byte4 procAnim__Q53scn4step4hero7fighter15StateSkyKickHitFv + .byte4 procMove__Q53scn4step4hero7fighter15StateSkyKickHitFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter15StateSkyKickHitFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSlant.s b/asm/src/StateSlant.s index 04447718..753c5f32 100644 --- a/asm/src/StateSlant.s +++ b/asm/src/StateSlant.s @@ -273,12 +273,12 @@ lbl_802F3468: __vt__Q53scn4step5enemy15zankibblecutter10StateSlant: .4byte 0 .4byte 0 - .4byte 0x802F31B8 ;# ptr - .4byte 0x802F31BC ;# ptr - .4byte 0x802F31C0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802F31C4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy15zankibblecutter10StateSlantFv + .byte4 procAnim__Q53scn4step5enemy15zankibblecutter10StateSlantFv + .byte4 procMove__Q53scn4step5enemy15zankibblecutter10StateSlantFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy15zankibblecutter10StateSlantFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256064 diff --git a/asm/src/StateSliding.s b/asm/src/StateSliding.s index 41cdb903..f5548701 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 - .4byte 0x8036A9C4 - .4byte 0x8036A988 + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSlidingHit$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSlidingHit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateSliding$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateSliding$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8036A9C0 - .4byte 0x8036A9A4 + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateSliding$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateSliding$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common12StateSliding __vt__Q53scn4step4hero6common12StateSliding: .4byte 0 .4byte 0 - .4byte 0x8036A4C8 - .4byte 0x8036A544 - .4byte 0x8036A698 - .4byte 0x8035550C - .4byte 0x8036A758 - .4byte 0x8036A8D4 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common12StateSlidingFv + .byte4 procAnim__Q53scn4step4hero6common12StateSlidingFv + .byte4 procMove__Q53scn4step4hero6common12StateSlidingFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common12StateSlidingFv + .byte4 procObjCollReact__Q53scn4step4hero6common12StateSlidingFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSlidingHit.s b/asm/src/StateSlidingHit.s index f34c8c5e..61f23ed9 100644 --- a/asm/src/StateSlidingHit.s +++ b/asm/src/StateSlidingHit.s @@ -154,13 +154,13 @@ procFixPos__Q53scn4step4hero6common15StateSlidingHitFv: __vt__Q53scn4step4hero6common15StateSlidingHit: .4byte 0 .4byte 0 - .4byte 0x8036AAB8 - .4byte 0x8036AABC - .4byte 0x8036AB64 - .4byte 0x8035550C - .4byte 0x8036ABD0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common15StateSlidingHitFv + .byte4 procAnim__Q53scn4step4hero6common15StateSlidingHitFv + .byte4 procMove__Q53scn4step4hero6common15StateSlidingHitFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common15StateSlidingHitFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSlip.s b/asm/src/StateSlip.s index 36bec0d7..d0b8c07d 100644 --- a/asm/src/StateSlip.s +++ b/asm/src/StateSlip.s @@ -479,13 +479,13 @@ lbl_80391514: __vt__Q53scn4step4hero5stone9StateSlip: .4byte 0 .4byte 0 - .4byte 0x80390F18 - .4byte 0x80391008 - .4byte 0x80391058 - .4byte 0x8035550C - .4byte 0x8039123C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5stone9StateSlipFv + .byte4 procAnim__Q53scn4step4hero5stone9StateSlipFv + .byte4 procMove__Q53scn4step4hero5stone9StateSlipFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5stone9StateSlipFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSlope.s b/asm/src/StateSlope.s index 567be522..e952b547 100644 --- a/asm/src/StateSlope.s +++ b/asm/src/StateSlope.s @@ -293,12 +293,12 @@ lbl_802D5228: __vt__Q53scn4step5enemy5rocky10StateSlope: .4byte 0 .4byte 0 - .4byte 0x802D4F54 ;# ptr - .4byte 0x802D4F58 ;# ptr - .4byte 0x802D4FA8 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D5040 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5rocky10StateSlopeFv + .byte4 procAnim__Q53scn4step5enemy5rocky10StateSlopeFv + .byte4 procMove__Q53scn4step5enemy5rocky10StateSlopeFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5rocky10StateSlopeFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256183 diff --git a/asm/src/StateSmash.s b/asm/src/StateSmash.s index 5ccf45f4..6ded9ee1 100644 --- a/asm/src/StateSmash.s +++ b/asm/src/StateSmash.s @@ -157,13 +157,13 @@ createWeapon__Q53scn4step4hero7fighter10StateSmashFv: __vt__Q53scn4step4hero7fighter10StateSmash: .4byte 0 .4byte 0 - .4byte 0x8039EE90 - .4byte 0x8039EE94 - .4byte 0x8039EF04 - .4byte 0x8035550C - .4byte 0x8039EF08 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter10StateSmashFv + .byte4 procAnim__Q53scn4step4hero7fighter10StateSmashFv + .byte4 procMove__Q53scn4step4hero7fighter10StateSmashFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter10StateSmashFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSmashKick.s b/asm/src/StateSmashKick.s index b9fc7ff4..def14f40 100644 --- a/asm/src/StateSmashKick.s +++ b/asm/src/StateSmashKick.s @@ -220,11 +220,11 @@ procFixPos__Q53scn4step4hero5smash14StateSmashKickFv: __vt__Q53scn4step4hero5smash14StateSmashKick: .4byte 0 .4byte 0 - .4byte 0x803A2410 - .4byte 0x803A24D0 - .4byte 0x803A2540 - .4byte 0x8035550C - .4byte 0x803A25C0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5smash14StateSmashKickFv + .byte4 procAnim__Q53scn4step4hero5smash14StateSmashKickFv + .byte4 procMove__Q53scn4step4hero5smash14StateSmashKickFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5smash14StateSmashKickFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSmashKickCharge.s b/asm/src/StateSmashKickCharge.s index c4b5b111..e162dd9f 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 - .4byte 0x803A28FC - .4byte 0x803A28BC + .byte4 __dt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5smash14StateSmashKick$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero5smash11ChargeLevel$$1Fv + .byte4 create__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5smash14StateSmashKick$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero5smash11ChargeLevel$$1Fv .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateSmashKickCharge$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateSmashKickCharge$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x803A28F8 - .4byte 0x803A28DC + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateSmashKickCharge$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateSmashKickCharge$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5smash20StateSmashKickCharge __vt__Q53scn4step4hero5smash20StateSmashKickCharge: .4byte 0 .4byte 0 - .4byte 0x803A2720 - .4byte 0x803A27B0 - .4byte 0x803A28B4 - .4byte 0x8035550C - .4byte 0x803A28B8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5smash20StateSmashKickChargeFv + .byte4 procAnim__Q53scn4step4hero5smash20StateSmashKickChargeFv + .byte4 procMove__Q53scn4step4hero5smash20StateSmashKickChargeFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5smash20StateSmashKickChargeFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSmashed.s b/asm/src/StateSmashed.s index 903384ca..ce3f4daa 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 - .4byte 0x802DF7FC ;# ptr - .4byte 0x802DF7E0 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5sheld12StateSmashed __vt__Q53scn4step5enemy5sheld12StateSmashed: .4byte 0 .4byte 0 - .4byte 0x802DF37C ;# ptr - .4byte 0x802DF414 ;# ptr - .4byte 0x802DF5C8 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802DF634 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5sheld12StateSmashedFv + .byte4 procAnim__Q53scn4step5enemy5sheld12StateSmashedFv + .byte4 procMove__Q53scn4step5enemy5sheld12StateSmashedFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5sheld12StateSmashedFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802EE6C4 ;# ptr - .4byte 0x802EE6A8 ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee12StateSmashed __vt__Q53scn4step5enemy9waddledee12StateSmashed: .4byte 0 .4byte 0 - .4byte 0x802EE1A0 ;# ptr - .4byte 0x802EE24C ;# ptr - .4byte 0x802EE400 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EE46C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledee12StateSmashedFv + .byte4 procAnim__Q53scn4step5enemy9waddledee12StateSmashedFv + .byte4 procMove__Q53scn4step5enemy9waddledee12StateSmashedFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9waddledee12StateSmashedFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256802 diff --git a/asm/src/StateSmashedEnd.s b/asm/src/StateSmashedEnd.s index 6181b704..48b1423a 100644 --- a/asm/src/StateSmashedEnd.s +++ b/asm/src/StateSmashedEnd.s @@ -432,24 +432,24 @@ procFixPos__Q53scn4step5enemy9waddledee15StateSmashedEndFv: __vt__Q53scn4step5enemy5sheld15StateSmashedEnd: .4byte 0 .4byte 0 - .4byte 0x802DF964 ;# ptr - .4byte 0x802DF9F4 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5sheld15StateSmashedEndFv + .byte4 procAnim__Q53scn4step5enemy5sheld15StateSmashedEndFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledee15StateSmashedEnd __vt__Q53scn4step5enemy9waddledee15StateSmashedEnd: .4byte 0 .4byte 0 - .4byte 0x802EE82C ;# ptr - .4byte 0x802EE8BC ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EEA04 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledee15StateSmashedEndFv + .byte4 procAnim__Q53scn4step5enemy9waddledee15StateSmashedEndFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9waddledee15StateSmashedEndFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256208 diff --git a/asm/src/StateSpaceJump.s b/asm/src/StateSpaceJump.s index 528a1739..fe887b7d 100644 --- a/asm/src/StateSpaceJump.s +++ b/asm/src/StateSpaceJump.s @@ -1049,13 +1049,13 @@ init__Q53scn4step4hero12interference14StateSpaceJumpFv: __vt__Q53scn4step4hero12interference14StateSpaceJump: .4byte 0 .4byte 0 - .4byte 0x80373A80 - .4byte 0x80373C3C - .4byte 0x80373DB0 - .4byte 0x8035550C - .4byte 0x80374280 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero12interference14StateSpaceJumpFv + .byte4 procAnim__Q53scn4step4hero12interference14StateSpaceJumpFv + .byte4 procMove__Q53scn4step4hero12interference14StateSpaceJumpFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero12interference14StateSpaceJumpFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSparkLv1.s b/asm/src/StateSparkLv1.s index 97ab9d08..307f1310 100644 --- a/asm/src/StateSparkLv1.s +++ b/asm/src/StateSparkLv1.s @@ -144,13 +144,13 @@ procFixPos__Q53scn4step4hero6damage13StateSparkLv1Fv: __vt__Q53scn4step4hero6damage13StateSparkLv1: .4byte 0 .4byte 0 - .4byte 0x803775B4 - .4byte 0x80377670 - .4byte 0x80377674 - .4byte 0x8035550C - .4byte 0x803776DC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6damage13StateSparkLv1Fv + .byte4 procAnim__Q53scn4step4hero6damage13StateSparkLv1Fv + .byte4 procMove__Q53scn4step4hero6damage13StateSparkLv1Fv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6damage13StateSparkLv1Fv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSparkLv2.s b/asm/src/StateSparkLv2.s index 87533183..74ef8d89 100644 --- a/asm/src/StateSparkLv2.s +++ b/asm/src/StateSparkLv2.s @@ -339,13 +339,13 @@ lbl_80377B94: __vt__Q53scn4step4hero6damage13StateSparkLv2: .4byte 0 .4byte 0 - .4byte 0x803777B8 - .4byte 0x80377874 - .4byte 0x80377A00 - .4byte 0x8035550C - .4byte 0x80377A68 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6damage13StateSparkLv2Fv + .byte4 procAnim__Q53scn4step4hero6damage13StateSparkLv2Fv + .byte4 procMove__Q53scn4step4hero6damage13StateSparkLv2Fv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6damage13StateSparkLv2Fv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSparkLv3.s b/asm/src/StateSparkLv3.s index e1a60e98..0fd5b5d2 100644 --- a/asm/src/StateSparkLv3.s +++ b/asm/src/StateSparkLv3.s @@ -259,13 +259,13 @@ procFixPos__Q53scn4step4hero6damage13StateSparkLv3Fv: __vt__Q53scn4step4hero6damage13StateSparkLv3: .4byte 0 .4byte 0 - .4byte 0x80377C90 - .4byte 0x80377D4C - .4byte 0x80377ED8 - .4byte 0x8035550C - .4byte 0x80377F40 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6damage13StateSparkLv3Fv + .byte4 procAnim__Q53scn4step4hero6damage13StateSparkLv3Fv + .byte4 procMove__Q53scn4step4hero6damage13StateSparkLv3Fv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6damage13StateSparkLv3Fv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSpin.s b/asm/src/StateSpin.s index fea2f4f8..6304e650 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 - .4byte 0x802C0838 ;# ptr - .4byte 0x802C08E0 ;# ptr - .4byte 0x802C0A1C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C0AA0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10knucklejoe9StateSpinFv + .byte4 procAnim__Q53scn4step5enemy10knucklejoe9StateSpinFv + .byte4 procMove__Q53scn4step5enemy10knucklejoe9StateSpinFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10knucklejoe9StateSpinFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6hammer10StateThrow$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6hammer10StateThrow$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80396F28 - .4byte 0x80396F08 + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6hammer10StateThrow$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 - .4byte 0x80396F24 - .4byte 0x80396EE8 + .byte4 __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6hammer9StateSpin$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .byte4 create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6hammer9StateSpin$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero6hammer9StateSpin __vt__Q53scn4step4hero6hammer9StateSpin: .4byte 0 .4byte 0 - .4byte 0x80396A7C - .4byte 0x80396B14 - .4byte 0x80396C64 - .4byte 0x8035550C - .4byte 0x80396D20 - .4byte 0x80396D24 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6hammer9StateSpinFv + .byte4 procAnim__Q53scn4step4hero6hammer9StateSpinFv + .byte4 procMove__Q53scn4step4hero6hammer9StateSpinFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6hammer9StateSpinFv + .byte4 procObjCollReact__Q53scn4step4hero6hammer9StateSpinFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSpinKick.s b/asm/src/StateSpinKick.s index 40cee0bc..98a0b554 100644 --- a/asm/src/StateSpinKick.s +++ b/asm/src/StateSpinKick.s @@ -317,11 +317,11 @@ lbl_8039F494: __vt__Q53scn4step4hero7fighter13StateSpinKick: .4byte 0 .4byte 0 - .4byte 0x8039F0F0 - .4byte 0x8039F16C - .4byte 0x8039F2CC - .4byte 0x8035550C - .4byte 0x8039F450 - .4byte 0x8039F454 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter13StateSpinKickFv + .byte4 procAnim__Q53scn4step4hero7fighter13StateSpinKickFv + .byte4 procMove__Q53scn4step4hero7fighter13StateSpinKickFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter13StateSpinKickFv + .byte4 procObjCollReact__Q53scn4step4hero7fighter13StateSpinKickFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSpine.s b/asm/src/StateSpine.s index 68b376ad..0479a6c8 100644 --- a/asm/src/StateSpine.s +++ b/asm/src/StateSpine.s @@ -225,13 +225,13 @@ procFixPos__Q53scn4step4hero6damage10StateSpineFv: __vt__Q53scn4step4hero6damage10StateSpine: .4byte 0 .4byte 0 - .4byte 0x80378144 - .4byte 0x80378200 - .4byte 0x80378204 - .4byte 0x8035550C - .4byte 0x8037826C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6damage10StateSpineFv + .byte4 procAnim__Q53scn4step4hero6damage10StateSpineFv + .byte4 procMove__Q53scn4step4hero6damage10StateSpineFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6damage10StateSpineFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSquashRoof.s b/asm/src/StateSquashRoof.s index d3fda9fa..ff4fb9d0 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 - .4byte 0x8036AFB4 - .4byte 0x8036AF98 + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashRoof$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashRoof$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common15StateSquashRoof __vt__Q53scn4step4hero6common15StateSquashRoof: .4byte 0 .4byte 0 - .4byte 0x8036AD94 - .4byte 0x8036AD98 - .4byte 0x8036AE88 - .4byte 0x8035550C - .4byte 0x8036AF94 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common15StateSquashRoofFv + .byte4 procAnim__Q53scn4step4hero6common15StateSquashRoofFv + .byte4 procMove__Q53scn4step4hero6common15StateSquashRoofFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common15StateSquashRoofFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSquashWall.s b/asm/src/StateSquashWall.s index 476753a4..271c894e 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 - .4byte 0x8036B5DC - .4byte 0x8036B5C0 + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashWall$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashWall$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common15StateSquashWall __vt__Q53scn4step4hero6common15StateSquashWall: .4byte 0 .4byte 0 - .4byte 0x8036B410 - .4byte 0x8036B414 - .4byte 0x8036B560 - .4byte 0x8035550C - .4byte 0x8036B5BC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common15StateSquashWallFv + .byte4 procAnim__Q53scn4step4hero6common15StateSquashWallFv + .byte4 procMove__Q53scn4step4hero6common15StateSquashWallFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common15StateSquashWallFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSquat.s b/asm/src/StateSquat.s index 500547b3..4542e4f1 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 - .4byte 0x8036BAD0 - .4byte 0x8036BAB4 + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateSquat$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateSquat$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common10StateSquat __vt__Q53scn4step4hero6common10StateSquat: .4byte 0 .4byte 0 - .4byte 0x8036B728 - .4byte 0x8036B7A4 - .4byte 0x8036BA2C - .4byte 0x8035550C - .4byte 0x8036BA30 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common10StateSquatFv + .byte4 procAnim__Q53scn4step4hero6common10StateSquatFv + .byte4 procMove__Q53scn4step4hero6common10StateSquatFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common10StateSquatFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateStamp.s b/asm/src/StateStamp.s index c723bf18..6b798c3a 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 - .4byte 0x8039F6C8 - .4byte 0x8039F6AC + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateStampHit$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateStampHit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero7fighter10StateStamp __vt__Q53scn4step4hero7fighter10StateStamp: .4byte 0 .4byte 0 - .4byte 0x8039F538 - .4byte 0x8039F53C - .4byte 0x8039F604 - .4byte 0x8035550C - .4byte 0x8039F608 - .4byte 0x8039F60C - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter10StateStampFv + .byte4 procAnim__Q53scn4step4hero7fighter10StateStampFv + .byte4 procMove__Q53scn4step4hero7fighter10StateStampFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter10StateStampFv + .byte4 procObjCollReact__Q53scn4step4hero7fighter10StateStampFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateStampHit.s b/asm/src/StateStampHit.s index 53f9d532..9742ea1d 100644 --- a/asm/src/StateStampHit.s +++ b/asm/src/StateStampHit.s @@ -202,13 +202,13 @@ procFixPos__Q53scn4step4hero7fighter13StateStampHitFv: __vt__Q53scn4step4hero7fighter13StateStampHit: .4byte 0 .4byte 0 - .4byte 0x8039F7C4 - .4byte 0x8039F7C8 - .4byte 0x8039F8A0 - .4byte 0x8035550C - .4byte 0x8039F988 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter13StateStampHitFv + .byte4 procAnim__Q53scn4step4hero7fighter13StateStampHitFv + .byte4 procMove__Q53scn4step4hero7fighter13StateStampHitFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter13StateStampHitFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateStartJump.s b/asm/src/StateStartJump.s index 44cbd98c..57c833ab 100644 --- a/asm/src/StateStartJump.s +++ b/asm/src/StateStartJump.s @@ -237,11 +237,11 @@ lbl_8039185C: __vt__Q53scn4step4hero5stone14StateStartJump: .4byte 0 .4byte 0 - .4byte 0x80391684 - .4byte 0x803916FC - .4byte 0x80391778 - .4byte 0x8035550C - .4byte 0x80391804 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5stone14StateStartJumpFv + .byte4 procAnim__Q53scn4step4hero5stone14StateStartJumpFv + .byte4 procMove__Q53scn4step4hero5stone14StateStartJumpFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5stone14StateStartJumpFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateStartWait.s b/asm/src/StateStartWait.s index 282bb3f9..66d0ae54 100644 --- a/asm/src/StateStartWait.s +++ b/asm/src/StateStartWait.s @@ -113,9 +113,9 @@ procFixPos__Q53scn4step4boss15challengemaster14StateStartWaitFv: __vt__Q53scn4step4boss15challengemaster14StateStartWait: .4byte 0 .4byte 0 - .4byte 0x8024333C ;# ptr - .4byte 0x80243340 ;# ptr - .4byte 0x80243424 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80243428 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster14StateStartWaitFv + .byte4 procAnim__Q53scn4step4boss15challengemaster14StateStartWaitFv + .byte4 procMove__Q53scn4step4boss15challengemaster14StateStartWaitFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster14StateStartWaitFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateStay.s b/asm/src/StateStay.s index da92c77a..5a0cccaf 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 - .4byte 0x802C8998 ;# ptr - .4byte 0x802C899C ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C8A40 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5nruff9StateStayFv + .byte4 procAnim__Q53scn4step5enemy5nruff9StateStayFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5nruff9StateStayFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802D5668 ;# ptr - .4byte 0x802D564C ;# ptr + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5rocky9StateStay __vt__Q53scn4step5enemy5rocky9StateStay: .4byte 0 .4byte 0 - .4byte 0x802D533C ;# ptr - .4byte 0x802D5340 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D5598 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5rocky9StateStayFv + .byte4 procAnim__Q53scn4step5enemy5rocky9StateStayFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5rocky9StateStayFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256196 diff --git a/asm/src/StateStepBack.s b/asm/src/StateStepBack.s index 08a19a57..c3df8f49 100644 --- a/asm/src/StateStepBack.s +++ b/asm/src/StateStepBack.s @@ -244,9 +244,9 @@ lbl_80298394: __vt__Q53scn4step5enemy11bladeknight13StateStepBack: .4byte 0 .4byte 0 - .4byte 0x8029813C ;# ptr - .4byte 0x80298140 ;# ptr - .4byte 0x8029818C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80298224 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11bladeknight13StateStepBackFv + .byte4 procAnim__Q53scn4step5enemy11bladeknight13StateStepBackFv + .byte4 procMove__Q53scn4step5enemy11bladeknight13StateStepBackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11bladeknight13StateStepBackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateStickObj.s b/asm/src/StateStickObj.s index 5958ef25..4f5b1bcd 100644 --- a/asm/src/StateStickObj.s +++ b/asm/src/StateStickObj.s @@ -247,21 +247,21 @@ procMove__Q53scn4step6weapon8deespear13StateStickObjFv: __vt__Q53scn4step6weapon10spearspear13StateStickObj: .4byte 0 .4byte 0 - .4byte 0x803E4BC0 - .4byte 0x803E4C2C - .4byte 0x803E4CCC - .4byte 0x803D895C - .4byte 0x803D8960 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon10spearspear13StateStickObjFv + .byte4 procAnim__Q53scn4step6weapon10spearspear13StateStickObjFv + .byte4 procMove__Q53scn4step6weapon10spearspear13StateStickObjFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q43scn4step6weapon9StateBaseFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8deespear13StateStickObj __vt__Q53scn4step6weapon8deespear13StateStickObj: .4byte 0 .4byte 0 - .4byte 0x803EDBD4 - .4byte 0x803EDBD8 - .4byte 0x803EDC78 - .4byte 0x803D895C - .4byte 0x803D8960 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon8deespear13StateStickObjFv + .byte4 procAnim__Q53scn4step6weapon8deespear13StateStickObjFv + .byte4 procMove__Q53scn4step6weapon8deespear13StateStickObjFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q43scn4step6weapon9StateBaseFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv diff --git a/asm/src/StateStickWall.s b/asm/src/StateStickWall.s index b5cf10dc..69ed01da 100644 --- a/asm/src/StateStickWall.s +++ b/asm/src/StateStickWall.s @@ -399,24 +399,24 @@ procObjCollReact__Q53scn4step6weapon8deespear14StateStickWallFv: __vt__Q53scn4step6weapon10spearspear14StateStickWall: .4byte 0 .4byte 0 - .4byte 0x803E4D8C - .4byte 0x803E4DF8 - .4byte 0x803E4DFC - .4byte 0x803D895C - .4byte 0x803E4E04 - .4byte 0x803E4FA0 + .byte4 __dt__Q53scn4step6weapon10spearspear14StateStickWallFv + .byte4 procAnim__Q53scn4step6weapon10spearspear14StateStickWallFv + .byte4 procMove__Q53scn4step6weapon10spearspear14StateStickWallFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon10spearspear14StateStickWallFv + .byte4 procObjCollReact__Q53scn4step6weapon10spearspear14StateStickWallFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8deespear14StateStickWall __vt__Q53scn4step6weapon8deespear14StateStickWall: .4byte 0 .4byte 0 - .4byte 0x803EDD44 - .4byte 0x803EDD48 - .4byte 0x803EDD4C - .4byte 0x803D895C - .4byte 0x803EDD50 - .4byte 0x803EDEEC + .byte4 __dt__Q53scn4step6weapon8deespear14StateStickWallFv + .byte4 procAnim__Q53scn4step6weapon8deespear14StateStickWallFv + .byte4 procMove__Q53scn4step6weapon8deespear14StateStickWallFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon8deespear14StateStickWallFv + .byte4 procObjCollReact__Q53scn4step6weapon8deespear14StateStickWallFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256411 diff --git a/asm/src/StateStop.s b/asm/src/StateStop.s index 9288fb14..94a575d2 100644 --- a/asm/src/StateStop.s +++ b/asm/src/StateStop.s @@ -231,12 +231,12 @@ lbl_802C8E1C: __vt__Q53scn4step5enemy5nruff9StateStop: .4byte 0 .4byte 0 - .4byte 0x802C8C9C ;# ptr - .4byte 0x802C8CA0 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C8D84 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5nruff9StateStopFv + .byte4 procAnim__Q53scn4step5enemy5nruff9StateStopFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5nruff9StateStopFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256172 diff --git a/asm/src/StateStopAir.s b/asm/src/StateStopAir.s index 5544cc4e..f9d92209 100644 --- a/asm/src/StateStopAir.s +++ b/asm/src/StateStopAir.s @@ -224,12 +224,12 @@ lbl_802C9134: __vt__Q53scn4step5enemy5nruff12StateStopAir: .4byte 0 .4byte 0 - .4byte 0x802C9018 ;# ptr - .4byte 0x802C901C ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5nruff12StateStopAirFv + .byte4 procAnim__Q53scn4step5enemy5nruff12StateStopAirFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255952 diff --git a/asm/src/StateStraight.s b/asm/src/StateStraight.s index d1949537..25354a4e 100644 --- a/asm/src/StateStraight.s +++ b/asm/src/StateStraight.s @@ -346,12 +346,12 @@ lbl_802F3944: __vt__Q53scn4step5enemy15zankibblecutter13StateStraight: .4byte 0 .4byte 0 - .4byte 0x802F359C ;# ptr - .4byte 0x802F3608 ;# ptr - .4byte 0x802F360C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802F373C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy15zankibblecutter13StateStraightFv + .byte4 procAnim__Q53scn4step5enemy15zankibblecutter13StateStraightFv + .byte4 procMove__Q53scn4step5enemy15zankibblecutter13StateStraightFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy15zankibblecutter13StateStraightFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256486 diff --git a/asm/src/StateSummon.s b/asm/src/StateSummon.s index d89ba2f7..b0edd5bc 100644 --- a/asm/src/StateSummon.s +++ b/asm/src/StateSummon.s @@ -150,9 +150,9 @@ procFixPos__Q53scn4step4boss15challengemaster11StateSummonFv: __vt__Q53scn4step4boss15challengemaster11StateSummon: .4byte 0 .4byte 0 - .4byte 0x802434A0 ;# ptr - .4byte 0x802434A4 ;# ptr - .4byte 0x8024360C ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80243610 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster11StateSummonFv + .byte4 procAnim__Q53scn4step4boss15challengemaster11StateSummonFv + .byte4 procMove__Q53scn4step4boss15challengemaster11StateSummonFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster11StateSummonFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateSuperAppear.s b/asm/src/StateSuperAppear.s index 984e3e18..94436df8 100644 --- a/asm/src/StateSuperAppear.s +++ b/asm/src/StateSuperAppear.s @@ -362,12 +362,12 @@ procFixPos__Q53scn4step5enemy6common16StateSuperAppearFv: __vt__Q53scn4step5enemy6common16StateSuperAppear: .4byte 0 .4byte 0 - .4byte 0x8029458C ;# ptr - .4byte 0x80294710 ;# ptr - .4byte 0x80294870 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80294874 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common16StateSuperAppearFv + .byte4 procAnim__Q53scn4step5enemy6common16StateSuperAppearFv + .byte4 procMove__Q53scn4step5enemy6common16StateSuperAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common16StateSuperAppearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257491 diff --git a/asm/src/StateSuperAppearPre.s b/asm/src/StateSuperAppearPre.s index f977061c..14f81930 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 - .4byte 0x80294B24 ;# ptr - .4byte 0x80294B00 ;# ptr + .byte4 __dt__Q24util121StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6common16StateSuperAppear$$4PQ43scn4step5enemy5Enemy$$4Q25ostop9ReqHandle$$4i$$1Fv + .byte4 create__Q24util121StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6common16StateSuperAppear$$4PQ43scn4step5enemy5Enemy$$4Q25ostop9ReqHandle$$4i$$1Fv .global __vt__Q53scn4step5enemy6common19StateSuperAppearPre __vt__Q53scn4step5enemy6common19StateSuperAppearPre: .4byte 0 .4byte 0 - .4byte 0x8029494C ;# ptr - .4byte 0x80294A24 ;# ptr - .4byte 0x80294AF8 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80294AFC ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common19StateSuperAppearPreFv + .byte4 procAnim__Q53scn4step5enemy6common19StateSuperAppearPreFv + .byte4 procMove__Q53scn4step5enemy6common19StateSuperAppearPreFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common19StateSuperAppearPreFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateSuperFirst.s b/asm/src/StateSuperFirst.s index 24eaba86..392eb681 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 - .4byte 0x80295364 ;# ptr - .4byte 0x80295320 ;# ptr + .byte4 __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common19StateSuperAppearPre$$4PQ43scn4step5enemy5Enemy$$4i$$1Fv + .byte4 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 - .4byte 0x80295360 ;# ptr - .4byte 0x80295340 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common15StateSuperFirst$$4PQ43scn4step5enemy5Enemy$$4i$$1Fv + .byte4 create__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common15StateSuperFirst$$4PQ43scn4step5enemy5Enemy$$4i$$1Fv .global __vt__Q53scn4step5enemy6common15StateSuperFirst __vt__Q53scn4step5enemy6common15StateSuperFirst: .4byte 0 .4byte 0 - .4byte 0x80294F7C ;# ptr - .4byte 0x80295054 ;# ptr - .4byte 0x802951C4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80295274 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common15StateSuperFirstFv + .byte4 procAnim__Q53scn4step5enemy6common15StateSuperFirstFv + .byte4 procMove__Q53scn4step5enemy6common15StateSuperFirstFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common15StateSuperFirstFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258008 diff --git a/asm/src/StateSuperJump.s b/asm/src/StateSuperJump.s index caa4babf..5878c27b 100644 --- a/asm/src/StateSuperJump.s +++ b/asm/src/StateSuperJump.s @@ -250,13 +250,13 @@ procFixPos__Q53scn4step4hero6common14StateSuperJumpFv: __vt__Q53scn4step4hero6common14StateSuperJump: .4byte 0 .4byte 0 - .4byte 0x8036BC14 - .4byte 0x8036BCA4 - .4byte 0x8036BD10 - .4byte 0x8035550C - .4byte 0x8036BE40 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common14StateSuperJumpFv + .byte4 procAnim__Q53scn4step4hero6common14StateSuperJumpFv + .byte4 procMove__Q53scn4step4hero6common14StateSuperJumpFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common14StateSuperJumpFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSuperTeamAttack.s b/asm/src/StateSuperTeamAttack.s index 520dcfa5..eed9590c 100644 --- a/asm/src/StateSuperTeamAttack.s +++ b/asm/src/StateSuperTeamAttack.s @@ -187,13 +187,13 @@ procFixPos__Q53scn4step4hero6damage20StateSuperTeamAttackFv: __vt__Q53scn4step4hero6damage20StateSuperTeamAttack: .4byte 0 .4byte 0 - .4byte 0x80378368 - .4byte 0x80378404 - .4byte 0x8037848C - .4byte 0x8035550C - .4byte 0x803784F4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6damage20StateSuperTeamAttackFv + .byte4 procAnim__Q53scn4step4hero6damage20StateSuperTeamAttackFv + .byte4 procMove__Q53scn4step4hero6damage20StateSuperTeamAttackFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6damage20StateSuperTeamAttackFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSwim.s b/asm/src/StateSwim.s index 457bfdb7..70e07787 100644 --- a/asm/src/StateSwim.s +++ b/asm/src/StateSwim.s @@ -745,13 +745,13 @@ lbl_8036C8B8: __vt__Q53scn4step4hero6common9StateSwim: .4byte 0 .4byte 0 - .4byte 0x8036C0A4 - .4byte 0x8036C11C - .4byte 0x8036C4D0 - .4byte 0x8035550C - .4byte 0x8036C6A8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common9StateSwimFv + .byte4 procAnim__Q53scn4step4hero6common9StateSwimFv + .byte4 procMove__Q53scn4step4hero6common9StateSwimFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common9StateSwimFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSwing.s b/asm/src/StateSwing.s index 6f2b2590..a5781f3d 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 - .4byte 0x80239420 ;# ptr - .4byte 0x80239404 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateSwingEnd$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateSwingEnd$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss7bonkers10StateSwing __vt__Q53scn4step4boss7bonkers10StateSwing: .4byte 0 .4byte 0 - .4byte 0x80239068 ;# ptr - .4byte 0x80239170 ;# ptr - .4byte 0x802392CC ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8023935C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss7bonkers10StateSwingFv + .byte4 procAnim__Q53scn4step4boss7bonkers10StateSwingFv + .byte4 procMove__Q53scn4step4boss7bonkers10StateSwingFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss7bonkers10StateSwingFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateSwingEnd.s b/asm/src/StateSwingEnd.s index 20cacecd..b159681f 100644 --- a/asm/src/StateSwingEnd.s +++ b/asm/src/StateSwingEnd.s @@ -108,9 +108,9 @@ procFixPos__Q53scn4step4boss7bonkers13StateSwingEndFv: __vt__Q53scn4step4boss7bonkers13StateSwingEnd: .4byte 0 .4byte 0 - .4byte 0x80239484 ;# ptr - .4byte 0x80239488 ;# ptr - .4byte 0x80239520 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80239574 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss7bonkers13StateSwingEndFv + .byte4 procAnim__Q53scn4step4boss7bonkers13StateSwingEndFv + .byte4 procMove__Q53scn4step4boss7bonkers13StateSwingEndFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss7bonkers13StateSwingEndFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateSwingPursuit.s b/asm/src/StateSwingPursuit.s index 28361f82..08d80d31 100644 --- a/asm/src/StateSwingPursuit.s +++ b/asm/src/StateSwingPursuit.s @@ -398,12 +398,12 @@ lbl_80239B08: __vt__Q53scn4step4boss7bonkers17StateSwingPursuit: .4byte 0 .4byte 0 - .4byte 0x80239608 ;# ptr - .4byte 0x80239684 ;# ptr - .4byte 0x802397B4 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80239954 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss7bonkers17StateSwingPursuitFv + .byte4 procAnim__Q53scn4step4boss7bonkers17StateSwingPursuitFv + .byte4 procMove__Q53scn4step4boss7bonkers17StateSwingPursuitFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss7bonkers17StateSwingPursuitFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256457 diff --git a/asm/src/StateSwordAirSpin.s b/asm/src/StateSwordAirSpin.s index ea9f048c..7e383676 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 - .4byte 0x80386698 - .4byte 0x8038667C + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordAirSpin$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordAirSpin$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword17StateSwordAirSpin __vt__Q53scn4step4hero5sword17StateSwordAirSpin: .4byte 0 .4byte 0 - .4byte 0x80386444 - .4byte 0x803864F4 - .4byte 0x8038658C - .4byte 0x8035550C - .4byte 0x80386590 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword17StateSwordAirSpinFv + .byte4 procAnim__Q53scn4step4hero5sword17StateSwordAirSpinFv + .byte4 procMove__Q53scn4step4hero5sword17StateSwordAirSpinFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword17StateSwordAirSpinFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordAttack.s b/asm/src/StateSwordAttack.s index aca8915f..d16b8082 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 - .4byte 0x80386C04 - .4byte 0x80386BC8 + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChargeStart$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChargeStart$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordAttack$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80386C00 - .4byte 0x80386BE4 + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordAttack$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordAttack$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword16StateSwordAttack __vt__Q53scn4step4hero5sword16StateSwordAttack: .4byte 0 .4byte 0 - .4byte 0x80386814 - .4byte 0x80386890 - .4byte 0x80386B54 - .4byte 0x8035550C - .4byte 0x80386B78 - .4byte 0x80386B7C - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword16StateSwordAttackFv + .byte4 procAnim__Q53scn4step4hero5sword16StateSwordAttackFv + .byte4 procMove__Q53scn4step4hero5sword16StateSwordAttackFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword16StateSwordAttackFv + .byte4 procObjCollReact__Q53scn4step4hero5sword16StateSwordAttackFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSwordAttackFinish.s b/asm/src/StateSwordAttackFinish.s index 1f7ab49d..7a9b75b9 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 - .4byte 0x80386FA4 - .4byte 0x80386F88 + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword22StateSwordAttackFinish$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword22StateSwordAttackFinish$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword22StateSwordAttackFinish __vt__Q53scn4step4hero5sword22StateSwordAttackFinish: .4byte 0 .4byte 0 - .4byte 0x80386D28 - .4byte 0x80386D2C - .4byte 0x80386E28 - .4byte 0x8035550C - .4byte 0x80386E4C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword22StateSwordAttackFinishFv + .byte4 procAnim__Q53scn4step4hero5sword22StateSwordAttackFinishFv + .byte4 procMove__Q53scn4step4hero5sword22StateSwordAttackFinishFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword22StateSwordAttackFinishFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordCharge.s b/asm/src/StateSwordCharge.s index fb548a11..6f2a4160 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 - .4byte 0x80387100 - .4byte 0x803870E4 + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword14StateSwordSpin$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword14StateSwordSpin$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword16StateSwordCharge __vt__Q53scn4step4hero5sword16StateSwordCharge: .4byte 0 .4byte 0 - .4byte 0x80387038 - .4byte 0x8038703C - .4byte 0x803870DC - .4byte 0x8035550C - .4byte 0x803870E0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword16StateSwordChargeFv + .byte4 procAnim__Q53scn4step4hero5sword16StateSwordChargeFv + .byte4 procMove__Q53scn4step4hero5sword16StateSwordChargeFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword16StateSwordChargeFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordChargeStart.s b/asm/src/StateSwordChargeStart.s index 2dfe2a82..20ee3118 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 - .4byte 0x80387340 - .4byte 0x80387324 + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordCharge$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordCharge$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword21StateSwordChargeStart __vt__Q53scn4step4hero5sword21StateSwordChargeStart: .4byte 0 .4byte 0 - .4byte 0x80387210 - .4byte 0x80387214 - .4byte 0x8038731C - .4byte 0x8035550C - .4byte 0x80387320 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword21StateSwordChargeStartFv + .byte4 procAnim__Q53scn4step4hero5sword21StateSwordChargeStartFv + .byte4 procMove__Q53scn4step4hero5sword21StateSwordChargeStartFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword21StateSwordChargeStartFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordChopping.s b/asm/src/StateSwordChopping.s index 39403ab0..1770afa2 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 - .4byte 0x80387798 - .4byte 0x80387778 + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChoppingHit$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 - .4byte 0x80387794 - .4byte 0x80387758 + .byte4 __dt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5sword18StateSwordChopping$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .byte4 create__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5sword18StateSwordChopping$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero5sword18StateSwordChopping __vt__Q53scn4step4hero5sword18StateSwordChopping: .4byte 0 .4byte 0 - .4byte 0x803875A4 - .4byte 0x803875A8 - .4byte 0x80387688 - .4byte 0x8035550C - .4byte 0x8038768C - .4byte 0x803876B8 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword18StateSwordChoppingFv + .byte4 procAnim__Q53scn4step4hero5sword18StateSwordChoppingFv + .byte4 procMove__Q53scn4step4hero5sword18StateSwordChoppingFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword18StateSwordChoppingFv + .byte4 procObjCollReact__Q53scn4step4hero5sword18StateSwordChoppingFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordChoppingHit.s b/asm/src/StateSwordChoppingHit.s index d3a9c87d..b77ded1b 100644 --- a/asm/src/StateSwordChoppingHit.s +++ b/asm/src/StateSwordChoppingHit.s @@ -200,13 +200,13 @@ procFixPos__Q53scn4step4hero5sword21StateSwordChoppingHitFv: __vt__Q53scn4step4hero5sword21StateSwordChoppingHit: .4byte 0 .4byte 0 - .4byte 0x80387870 - .4byte 0x80387874 - .4byte 0x80387960 - .4byte 0x8035550C - .4byte 0x80387A48 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword21StateSwordChoppingHitFv + .byte4 procAnim__Q53scn4step4hero5sword21StateSwordChoppingHitFv + .byte4 procMove__Q53scn4step4hero5sword21StateSwordChoppingHitFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword21StateSwordChoppingHitFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSwordFloatSpin.s b/asm/src/StateSwordFloatSpin.s index 338adaca..127c5007 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 - .4byte 0x80387F90 - .4byte 0x80387F74 + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordFloatSpin$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordFloatSpin$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword19StateSwordFloatSpin __vt__Q53scn4step4hero5sword19StateSwordFloatSpin: .4byte 0 .4byte 0 - .4byte 0x80387B9C - .4byte 0x80387C18 - .4byte 0x80387D68 - .4byte 0x8035550C - .4byte 0x80387DC8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword19StateSwordFloatSpinFv + .byte4 procAnim__Q53scn4step4hero5sword19StateSwordFloatSpinFv + .byte4 procMove__Q53scn4step4hero5sword19StateSwordFloatSpinFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword19StateSwordFloatSpinFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSwordMeteor.s b/asm/src/StateSwordMeteor.s index a9e8c2ed..9c3fcc95 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 - .4byte 0x80388398 - .4byte 0x8038835C + .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword23StateSwordMeteorLanding$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword23StateSwordMeteorLanding$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordMeteor$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordMeteor$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80388394 - .4byte 0x80388378 + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordMeteor$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordMeteor$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword16StateSwordMeteor __vt__Q53scn4step4hero5sword16StateSwordMeteor: .4byte 0 .4byte 0 - .4byte 0x80388190 - .4byte 0x80388194 - .4byte 0x80388198 - .4byte 0x8035550C - .4byte 0x80388234 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword16StateSwordMeteorFv + .byte4 procAnim__Q53scn4step4hero5sword16StateSwordMeteorFv + .byte4 procMove__Q53scn4step4hero5sword16StateSwordMeteorFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword16StateSwordMeteorFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordMeteorLanding.s b/asm/src/StateSwordMeteorLanding.s index 8e124bd5..f070c6bd 100644 --- a/asm/src/StateSwordMeteorLanding.s +++ b/asm/src/StateSwordMeteorLanding.s @@ -117,11 +117,11 @@ procFixPos__Q53scn4step4hero5sword23StateSwordMeteorLandingFv: __vt__Q53scn4step4hero5sword23StateSwordMeteorLanding: .4byte 0 .4byte 0 - .4byte 0x80388460 - .4byte 0x80388464 - .4byte 0x8038850C - .4byte 0x8035550C - .4byte 0x80388510 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword23StateSwordMeteorLandingFv + .byte4 procAnim__Q53scn4step4hero5sword23StateSwordMeteorLandingFv + .byte4 procMove__Q53scn4step4hero5sword23StateSwordMeteorLandingFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword23StateSwordMeteorLandingFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordMince.s b/asm/src/StateSwordMince.s index a6072acd..9d85fa43 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 - .4byte 0x80388800 - .4byte 0x803887E4 + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword15StateSwordMince$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword15StateSwordMince$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword15StateSwordMince __vt__Q53scn4step4hero5sword15StateSwordMince: .4byte 0 .4byte 0 - .4byte 0x80388674 - .4byte 0x80388678 - .4byte 0x803887DC - .4byte 0x8035550C - .4byte 0x803887E0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword15StateSwordMinceFv + .byte4 procAnim__Q53scn4step4hero5sword15StateSwordMinceFv + .byte4 procMove__Q53scn4step4hero5sword15StateSwordMinceFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword15StateSwordMinceFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordRaising.s b/asm/src/StateSwordRaising.s index 983de8fb..8f0b49db 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 - .4byte 0x80388BF8 - .4byte 0x80388BBC + .byte4 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword20StateSwordRaisingEnd$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword20StateSwordRaisingEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordRaising$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordRaising$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80388BF4 - .4byte 0x80388BD8 + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordRaising$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordRaising$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword17StateSwordRaising __vt__Q53scn4step4hero5sword17StateSwordRaising: .4byte 0 .4byte 0 - .4byte 0x803889E0 - .4byte 0x803889E4 - .4byte 0x80388AAC - .4byte 0x8035550C - .4byte 0x80388BB8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword17StateSwordRaisingFv + .byte4 procAnim__Q53scn4step4hero5sword17StateSwordRaisingFv + .byte4 procMove__Q53scn4step4hero5sword17StateSwordRaisingFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword17StateSwordRaisingFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSwordRaisingEnd.s b/asm/src/StateSwordRaisingEnd.s index 630ecf09..c751d972 100644 --- a/asm/src/StateSwordRaisingEnd.s +++ b/asm/src/StateSwordRaisingEnd.s @@ -87,11 +87,11 @@ procFixPos__Q53scn4step4hero5sword20StateSwordRaisingEndFv: __vt__Q53scn4step4hero5sword20StateSwordRaisingEnd: .4byte 0 .4byte 0 - .4byte 0x80388C58 - .4byte 0x80388C5C - .4byte 0x80388CF4 - .4byte 0x8035550C - .4byte 0x80388CF8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword20StateSwordRaisingEndFv + .byte4 procAnim__Q53scn4step4hero5sword20StateSwordRaisingEndFv + .byte4 procMove__Q53scn4step4hero5sword20StateSwordRaisingEndFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword20StateSwordRaisingEndFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordSpin.s b/asm/src/StateSwordSpin.s index b7e7bebb..3c7e367a 100644 --- a/asm/src/StateSwordSpin.s +++ b/asm/src/StateSwordSpin.s @@ -150,11 +150,11 @@ procFixPos__Q53scn4step4hero5sword14StateSwordSpinFv: __vt__Q53scn4step4hero5sword14StateSwordSpin: .4byte 0 .4byte 0 - .4byte 0x80388DC4 - .4byte 0x80388E4C - .4byte 0x80388EA8 - .4byte 0x8035550C - .4byte 0x80388EE4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword14StateSwordSpinFv + .byte4 procAnim__Q53scn4step4hero5sword14StateSwordSpinFv + .byte4 procMove__Q53scn4step4hero5sword14StateSwordSpinFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword14StateSwordSpinFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordThrust.s b/asm/src/StateSwordThrust.s index 3bc0287e..5ee4d4b6 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 - .4byte 0x803893CC - .4byte 0x80389390 + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordThrustEnd$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordThrustEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordThrust$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordThrust$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x803893C8 - .4byte 0x803893AC + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordThrust$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordThrust$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword16StateSwordThrust __vt__Q53scn4step4hero5sword16StateSwordThrust: .4byte 0 .4byte 0 - .4byte 0x80389078 - .4byte 0x803890F4 - .4byte 0x80389298 - .4byte 0x8035550C - .4byte 0x8038938C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword16StateSwordThrustFv + .byte4 procAnim__Q53scn4step4hero5sword16StateSwordThrustFv + .byte4 procMove__Q53scn4step4hero5sword16StateSwordThrustFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword16StateSwordThrustFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSwordThrustEnd.s b/asm/src/StateSwordThrustEnd.s index b7416cd0..9d2f28a7 100644 --- a/asm/src/StateSwordThrustEnd.s +++ b/asm/src/StateSwordThrustEnd.s @@ -46,11 +46,11 @@ procFixPos__Q53scn4step4hero5sword19StateSwordThrustEndFv: __vt__Q53scn4step4hero5sword19StateSwordThrustEnd: .4byte 0 .4byte 0 - .4byte 0x80389424 - .4byte 0x80389428 - .4byte 0x8038942C - .4byte 0x8035550C - .4byte 0x80389430 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword19StateSwordThrustEndFv + .byte4 procAnim__Q53scn4step4hero5sword19StateSwordThrustEndFv + .byte4 procMove__Q53scn4step4hero5sword19StateSwordThrustEndFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword19StateSwordThrustEndFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordUnderThrust.s b/asm/src/StateSwordUnderThrust.s index e7a774c7..4bc4e62e 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 - .4byte 0x803896CC - .4byte 0x803896B0 + .byte4 __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword28StateSwordUnderThrustLanding$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword28StateSwordUnderThrustLanding$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword21StateSwordUnderThrust __vt__Q53scn4step4hero5sword21StateSwordUnderThrust: .4byte 0 .4byte 0 - .4byte 0x803894EC - .4byte 0x803894F0 - .4byte 0x803894F4 - .4byte 0x8035550C - .4byte 0x80389570 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword21StateSwordUnderThrustFv + .byte4 procAnim__Q53scn4step4hero5sword21StateSwordUnderThrustFv + .byte4 procMove__Q53scn4step4hero5sword21StateSwordUnderThrustFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword21StateSwordUnderThrustFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateSwordUnderThrustLanding.s b/asm/src/StateSwordUnderThrustLanding.s index d48c0035..9a24d9ff 100644 --- a/asm/src/StateSwordUnderThrustLanding.s +++ b/asm/src/StateSwordUnderThrustLanding.s @@ -105,11 +105,11 @@ procFixPos__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv: __vt__Q53scn4step4hero5sword28StateSwordUnderThrustLanding: .4byte 0 .4byte 0 - .4byte 0x8038977C - .4byte 0x80389780 - .4byte 0x80389810 - .4byte 0x8035550C - .4byte 0x80389814 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv + .byte4 procAnim__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv + .byte4 procMove__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordUnderThrustStart.s b/asm/src/StateSwordUnderThrustStart.s index ecb18e39..679c6f78 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 - .4byte 0x80389AB0 - .4byte 0x80389A74 + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordUnderThrust$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordUnderThrust$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword26StateSwordUnderThrustStart$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword26StateSwordUnderThrustStart$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x80389AAC - .4byte 0x80389A90 + .byte4 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword26StateSwordUnderThrustStart$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword26StateSwordUnderThrustStart$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword26StateSwordUnderThrustStart __vt__Q53scn4step4hero5sword26StateSwordUnderThrustStart: .4byte 0 .4byte 0 - .4byte 0x8038994C - .4byte 0x80389950 - .4byte 0x803899F0 - .4byte 0x8035550C - .4byte 0x80389A70 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword26StateSwordUnderThrustStartFv + .byte4 procAnim__Q53scn4step4hero5sword26StateSwordUnderThrustStartFv + .byte4 procMove__Q53scn4step4hero5sword26StateSwordUnderThrustStartFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword26StateSwordUnderThrustStartFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateSwordWaterSpin.s b/asm/src/StateSwordWaterSpin.s index 17efadac..cec7631b 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 - .4byte 0x80389CB8 - .4byte 0x80389C9C + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordWaterSpin$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordWaterSpin$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5sword19StateSwordWaterSpin __vt__Q53scn4step4hero5sword19StateSwordWaterSpin: .4byte 0 .4byte 0 - .4byte 0x80389BF8 - .4byte 0x80389BFC - .4byte 0x80389C94 - .4byte 0x8035550C - .4byte 0x80389C98 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5sword19StateSwordWaterSpinFv + .byte4 procAnim__Q53scn4step4hero5sword19StateSwordWaterSpinFv + .byte4 procMove__Q53scn4step4hero5sword19StateSwordWaterSpinFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5sword19StateSwordWaterSpinFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateTakeOff.s b/asm/src/StateTakeOff.s index 482ae1d6..732b9839 100644 --- a/asm/src/StateTakeOff.s +++ b/asm/src/StateTakeOff.s @@ -166,12 +166,12 @@ __dt__Q53scn4step5enemy10brontoburt12StateTakeOffFv: __vt__Q53scn4step5enemy10brontoburt12StateTakeOff: .4byte 0 .4byte 0 - .4byte 0x802A030C ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802A0140 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10brontoburt12StateTakeOffFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy10brontoburt12StateTakeOffFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255068 diff --git a/asm/src/StateTeleport.s b/asm/src/StateTeleport.s index bfb498ea..f76a579e 100644 --- a/asm/src/StateTeleport.s +++ b/asm/src/StateTeleport.s @@ -563,12 +563,12 @@ lbl_802BEC48: __vt__Q53scn4step5enemy4kabu13StateTeleport: .4byte 0 .4byte 0 - .4byte 0x802BE5C8 ;# ptr - .4byte 0x802BE5CC ;# ptr - .4byte 0x802BE974 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802BEB40 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy4kabu13StateTeleportFv + .byte4 procAnim__Q53scn4step5enemy4kabu13StateTeleportFv + .byte4 procMove__Q53scn4step5enemy4kabu13StateTeleportFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy4kabu13StateTeleportFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257445 diff --git a/asm/src/StateThrow.s b/asm/src/StateThrow.s index e994abdc..58e69b67 100644 --- a/asm/src/StateThrow.s +++ b/asm/src/StateThrow.s @@ -1153,37 +1153,37 @@ lbl_803A00F0: __vt__Q53scn4step5enemy8cappyhat10StateThrow: .4byte 0 .4byte 0 - .4byte 0x802A3E9C ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802A3F58 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A3FB8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8cappyhat10StateThrowFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy8cappyhat10StateThrowFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy8cappyhat10StateThrowFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10poppybrojr10StateThrow __vt__Q53scn4step5enemy10poppybrojr10StateThrow: .4byte 0 .4byte 0 - .4byte 0x802D2644 ;# ptr - .4byte 0x802D2648 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D2748 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10poppybrojr10StateThrowFv + .byte4 procAnim__Q53scn4step5enemy10poppybrojr10StateThrowFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10poppybrojr10StateThrowFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6hammer10StateThrow __vt__Q53scn4step4hero6hammer10StateThrow: .4byte 0 .4byte 0 - .4byte 0x80397128 - .4byte 0x803971F8 - .4byte 0x80397248 - .4byte 0x8035550C - .4byte 0x8039724C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6hammer10StateThrowFv + .byte4 procAnim__Q53scn4step4hero6hammer10StateThrowFv + .byte4 procMove__Q53scn4step4hero6hammer10StateThrowFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6hammer10StateThrowFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1191,13 +1191,13 @@ __vt__Q53scn4step4hero6hammer10StateThrow: __vt__Q53scn4step4hero7fighter10StateThrow: .4byte 0 .4byte 0 - .4byte 0x8039FADC - .4byte 0x8039FB54 - .4byte 0x8039FDD0 - .4byte 0x8039FE68 - .4byte 0x8039FFC0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter10StateThrowFv + .byte4 procAnim__Q53scn4step4hero7fighter10StateThrowFv + .byte4 procMove__Q53scn4step4hero7fighter10StateThrowFv + .byte4 procConstraint__Q53scn4step4hero7fighter10StateThrowFv + .byte4 procFixPos__Q53scn4step4hero7fighter10StateThrowFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateThrownFighter.s b/asm/src/StateThrownFighter.s index a30a9fa5..febdf584 100644 --- a/asm/src/StateThrownFighter.s +++ b/asm/src/StateThrownFighter.s @@ -502,12 +502,12 @@ lbl_802AC23C: __vt__Q53scn4step5enemy6damage18StateThrownFighter: .4byte 0 .4byte 0 - .4byte 0x802ABE18 ;# ptr - .4byte 0x802ABEE4 ;# ptr - .4byte 0x802AC0EC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802AC0F0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6damage18StateThrownFighterFv + .byte4 procAnim__Q53scn4step5enemy6damage18StateThrownFighterFv + .byte4 procMove__Q53scn4step5enemy6damage18StateThrownFighterFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6damage18StateThrownFighterFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257792 diff --git a/asm/src/StateThunder.s b/asm/src/StateThunder.s index f7700af7..8a510493 100644 --- a/asm/src/StateThunder.s +++ b/asm/src/StateThunder.s @@ -168,9 +168,9 @@ procFixPos__Q53scn4step4boss6dubior12StateThunderFv: __vt__Q53scn4step4boss6dubior12StateThunder: .4byte 0 .4byte 0 - .4byte 0x802506D0 ;# ptr - .4byte 0x80250750 ;# ptr - .4byte 0x80250874 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80250878 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6dubior12StateThunderFv + .byte4 procAnim__Q53scn4step4boss6dubior12StateThunderFv + .byte4 procMove__Q53scn4step4boss6dubior12StateThunderFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6dubior12StateThunderFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateThunderStart.s b/asm/src/StateThunderStart.s index 1e3cafc3..4c3ea689 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 - .4byte 0x80250E0C ;# ptr - .4byte 0x80250DF0 ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior12StateThunder$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior12StateThunder$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6dubior17StateThunderStart __vt__Q53scn4step4boss6dubior17StateThunderStart: .4byte 0 .4byte 0 - .4byte 0x80250BA8 ;# ptr - .4byte 0x80250C30 ;# ptr - .4byte 0x80250D38 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80250DEC ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6dubior17StateThunderStartFv + .byte4 procAnim__Q53scn4step4boss6dubior17StateThunderStartFv + .byte4 procMove__Q53scn4step4boss6dubior17StateThunderStartFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6dubior17StateThunderStartFv + .byte4 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 c60dd771..4eb8c7f4 100644 --- a/asm/src/StateTornadoChase.s +++ b/asm/src/StateTornadoChase.s @@ -409,12 +409,12 @@ lbl_8025854C: __vt__Q53scn4step4boss9moundeath17StateTornadoChase: .4byte 0 .4byte 0 - .4byte 0x80258074 ;# ptr - .4byte 0x802580F4 ;# ptr - .4byte 0x802581F0 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802583E8 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9moundeath17StateTornadoChaseFv + .byte4 procAnim__Q53scn4step4boss9moundeath17StateTornadoChaseFv + .byte4 procMove__Q53scn4step4boss9moundeath17StateTornadoChaseFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9moundeath17StateTornadoChaseFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257129 diff --git a/asm/src/StateTornadoRise.s b/asm/src/StateTornadoRise.s index ccb43c19..98aded67 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 - .4byte 0x80258960 ;# ptr - .4byte 0x80258944 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateTornadoChase$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateTornadoChase$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss9moundeath16StateTornadoRise __vt__Q53scn4step4boss9moundeath16StateTornadoRise: .4byte 0 .4byte 0 - .4byte 0x802586B4 ;# ptr - .4byte 0x80258734 ;# ptr - .4byte 0x802587E0 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80258940 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss9moundeath16StateTornadoRiseFv + .byte4 procAnim__Q53scn4step4boss9moundeath16StateTornadoRiseFv + .byte4 procMove__Q53scn4step4boss9moundeath16StateTornadoRiseFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss9moundeath16StateTornadoRiseFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256270 diff --git a/asm/src/StateToss.s b/asm/src/StateToss.s index ef780e8d..3ac6ba35 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 - .4byte 0x8039A534 - .4byte 0x8039A518 + .byte4 __dt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateToss$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateToss$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4wing9StateToss __vt__Q53scn4step4hero4wing9StateToss: .4byte 0 .4byte 0 - .4byte 0x8039A12C - .4byte 0x8039A1D0 - .4byte 0x8039A31C - .4byte 0x8035550C - .4byte 0x8039A3FC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4wing9StateTossFv + .byte4 procAnim__Q53scn4step4hero4wing9StateTossFv + .byte4 procMove__Q53scn4step4hero4wing9StateTossFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4wing9StateTossFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateUnderAttack.s b/asm/src/StateUnderAttack.s index f046146a..3dd9e0d0 100644 --- a/asm/src/StateUnderAttack.s +++ b/asm/src/StateUnderAttack.s @@ -412,13 +412,13 @@ lbl_8039AB00: __vt__Q53scn4step4hero4wing16StateUnderAttack: .4byte 0 .4byte 0 - .4byte 0x8039A6AC - .4byte 0x8039A7AC - .4byte 0x8039A84C - .4byte 0x8035550C - .4byte 0x8039A9B8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4wing16StateUnderAttackFv + .byte4 procAnim__Q53scn4step4hero4wing16StateUnderAttackFv + .byte4 procMove__Q53scn4step4hero4wing16StateUnderAttackFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4wing16StateUnderAttackFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateUnderAttackLanding.s b/asm/src/StateUnderAttackLanding.s index 8cd8e066..aaae8280 100644 --- a/asm/src/StateUnderAttackLanding.s +++ b/asm/src/StateUnderAttackLanding.s @@ -336,13 +336,13 @@ lbl_8039AF24: __vt__Q53scn4step4hero4wing23StateUnderAttackLanding: .4byte 0 .4byte 0 - .4byte 0x8039AC64 - .4byte 0x8039AD08 - .4byte 0x8039ADC4 - .4byte 0x8035550C - .4byte 0x8039AE1C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4wing23StateUnderAttackLandingFv + .byte4 procAnim__Q53scn4step4hero4wing23StateUnderAttackLandingFv + .byte4 procMove__Q53scn4step4hero4wing23StateUnderAttackLandingFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4wing23StateUnderAttackLandingFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/StateUnlockLvMapDoor.s b/asm/src/StateUnlockLvMapDoor.s index 1b722bb0..c373df2e 100644 --- a/asm/src/StateUnlockLvMapDoor.s +++ b/asm/src/StateUnlockLvMapDoor.s @@ -235,11 +235,11 @@ procFixPos__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv: __vt__Q53scn4step4hero7gimmick20StateUnlockLvMapDoor: .4byte 0 .4byte 0 - .4byte 0x80381EE4 - .4byte 0x80381F74 - .4byte 0x80382154 - .4byte 0x8035550C - .4byte 0x80382158 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv + .byte4 procAnim__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv + .byte4 procMove__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateVacuum.s b/asm/src/StateVacuum.s index 46bc3673..1eba60af 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 - .4byte 0x8025ECF0 ;# ptr - .4byte 0x8025ECB4 ;# ptr + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateCapture$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateCapture$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateVacuumEnd$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateVacuumEnd$$4PQ43scn4step4boss4Boss$$1: .4byte 0 .4byte 0 - .4byte 0x8025ECEC ;# ptr - .4byte 0x8025ECD0 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateVacuumEnd$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy14StateVacuumEnd$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6whispy11StateVacuum __vt__Q53scn4step4boss6whispy11StateVacuum: .4byte 0 .4byte 0 - .4byte 0x8025EA18 ;# ptr - .4byte 0x8025EAB8 ;# ptr - .4byte 0x8025EC18 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80234500 ;# ptr - .4byte 0x8025EC1C ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy11StateVacuumFv + .byte4 procAnim__Q53scn4step4boss6whispy11StateVacuumFv + .byte4 procMove__Q53scn4step4boss6whispy11StateVacuumFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q43scn4step4boss9StateBaseFv + .byte4 procObjCollReact__Q53scn4step4boss6whispy11StateVacuumFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateVacuumEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateVacuumEnd$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8036D4A8 - .4byte 0x8036D44C + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateVacuumEnd$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateVacuumEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateEat$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateEat$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8036D4A4 - .4byte 0x8036D468 + .byte4 __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateEat$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateEat$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateVacuum$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateVacuum$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8036D4A0 - .4byte 0x8036D484 + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateVacuum$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateVacuum$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common11StateVacuum __vt__Q53scn4step4hero6common11StateVacuum: .4byte 0 .4byte 0 - .4byte 0x8036CB24 - .4byte 0x8036CC94 - .4byte 0x8036CF74 - .4byte 0x8035550C - .4byte 0x8036CF78 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common11StateVacuumFv + .byte4 procAnim__Q53scn4step4hero6common11StateVacuumFv + .byte4 procMove__Q53scn4step4hero6common11StateVacuumFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common11StateVacuumFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateVacuumEnd.s b/asm/src/StateVacuumEnd.s index 97c9558c..d515daf6 100644 --- a/asm/src/StateVacuumEnd.s +++ b/asm/src/StateVacuumEnd.s @@ -195,23 +195,23 @@ procFixPos__Q53scn4step4hero6common14StateVacuumEndFv: __vt__Q53scn4step4boss6whispy14StateVacuumEnd: .4byte 0 .4byte 0 - .4byte 0x8025ED7C ;# ptr - .4byte 0x8025ED80 ;# ptr - .4byte 0x8025EE18 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025EE1C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy14StateVacuumEndFv + .byte4 procAnim__Q53scn4step4boss6whispy14StateVacuumEndFv + .byte4 procMove__Q53scn4step4boss6whispy14StateVacuumEndFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy14StateVacuumEndFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common14StateVacuumEnd __vt__Q53scn4step4hero6common14StateVacuumEnd: .4byte 0 .4byte 0 - .4byte 0x8036D500 - .4byte 0x8036D504 - .4byte 0x8036D5D8 - .4byte 0x8035550C - .4byte 0x8036D5DC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common14StateVacuumEndFv + .byte4 procAnim__Q53scn4step4hero6common14StateVacuumEndFv + .byte4 procMove__Q53scn4step4hero6common14StateVacuumEndFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common14StateVacuumEndFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateVacuumReceive.s b/asm/src/StateVacuumReceive.s index 8dd639f4..a976f4c2 100644 --- a/asm/src/StateVacuumReceive.s +++ b/asm/src/StateVacuumReceive.s @@ -1320,37 +1320,37 @@ procFixPos__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFv: __vt__Q53scn4step4boss6common18StateVacuumReceive: .4byte 0 .4byte 0 - .4byte 0x80247880 ;# ptr - .4byte 0x80247884 ;# ptr - .4byte 0x802478F8 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x802478FC ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6common18StateVacuumReceiveFv + .byte4 procAnim__Q53scn4step4boss6common18StateVacuumReceiveFv + .byte4 procMove__Q53scn4step4boss6common18StateVacuumReceiveFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common18StateVacuumReceiveFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common18StateVacuumReceive __vt__Q53scn4step5enemy6common18StateVacuumReceive: .4byte 0 .4byte 0 - .4byte 0x80295564 ;# ptr - .4byte 0x80295600 ;# ptr - .4byte 0x80295670 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80295674 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common18StateVacuumReceiveFv + .byte4 procAnim__Q53scn4step5enemy6common18StateVacuumReceiveFv + .byte4 procMove__Q53scn4step5enemy6common18StateVacuumReceiveFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common18StateVacuumReceiveFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero12interference18StateVacuumReceive __vt__Q53scn4step4hero12interference18StateVacuumReceive: .4byte 0 .4byte 0 - .4byte 0x803746A8 - .4byte 0x80374814 - .4byte 0x803748CC - .4byte 0x8035550C - .4byte 0x80374A0C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero12interference18StateVacuumReceiveFv + .byte4 procAnim__Q53scn4step4hero12interference18StateVacuumReceiveFv + .byte4 procMove__Q53scn4step4hero12interference18StateVacuumReceiveFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero12interference18StateVacuumReceiveFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -1358,22 +1358,22 @@ __vt__Q53scn4step4hero12interference18StateVacuumReceive: __vt__Q53scn4step4item5state18StateVacuumReceive: .4byte 0 .4byte 0 - .4byte 0x803C8A3C - .4byte 0x803C8AB8 - .4byte 0x803C5200 - .4byte 0x803C8B24 + .byte4 __dt__Q53scn4step4item5state18StateVacuumReceiveFv + .byte4 procAnim__Q53scn4step4item5state18StateVacuumReceiveFv + .byte4 procMove__Q43scn4step4item9StateBaseFv + .byte4 procFixPos__Q53scn4step4item5state18StateVacuumReceiveFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13vacuumedblock18StateVacuumReceive __vt__Q53scn4step6weapon13vacuumedblock18StateVacuumReceive: .4byte 0 .4byte 0 - .4byte 0x803EF04C - .4byte 0x803EF050 - .4byte 0x803EF0C4 - .4byte 0x803D895C - .4byte 0x803EF0C8 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFv + .byte4 procAnim__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFv + .byte4 procMove__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256631 diff --git a/asm/src/StateVacuumStart.s b/asm/src/StateVacuumStart.s index 62376da9..84dd04c2 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 - .4byte 0x8025EF68 ;# ptr - .4byte 0x8025EF4C ;# ptr + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateVacuum$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateVacuum$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss6whispy16StateVacuumStart __vt__Q53scn4step4boss6whispy16StateVacuumStart: .4byte 0 .4byte 0 - .4byte 0x8025EEA8 ;# ptr - .4byte 0x8025EEAC ;# ptr - .4byte 0x8025EF44 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025EF48 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy16StateVacuumStartFv + .byte4 procAnim__Q53scn4step4boss6whispy16StateVacuumStartFv + .byte4 procMove__Q53scn4step4boss6whispy16StateVacuumStartFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy16StateVacuumStartFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateVanish.s b/asm/src/StateVanish.s index 8a09bf74..40b0576d 100644 --- a/asm/src/StateVanish.s +++ b/asm/src/StateVanish.s @@ -391,24 +391,24 @@ procObjCollReact__Q53scn4step6weapon8deespear11StateVanishFv: __vt__Q53scn4step6weapon10spearspear11StateVanish: .4byte 0 .4byte 0 - .4byte 0x803E50A0 - .4byte 0x803E514C - .4byte 0x803E5238 - .4byte 0x803D895C - .4byte 0x803E523C - .4byte 0x803E5240 + .byte4 __dt__Q53scn4step6weapon10spearspear11StateVanishFv + .byte4 procAnim__Q53scn4step6weapon10spearspear11StateVanishFv + .byte4 procMove__Q53scn4step6weapon10spearspear11StateVanishFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon10spearspear11StateVanishFv + .byte4 procObjCollReact__Q53scn4step6weapon10spearspear11StateVanishFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8deespear11StateVanish __vt__Q53scn4step6weapon8deespear11StateVanish: .4byte 0 .4byte 0 - .4byte 0x803EDFEC - .4byte 0x803EE098 - .4byte 0x803EE184 - .4byte 0x803D895C - .4byte 0x803EE188 - .4byte 0x803EE18C + .byte4 __dt__Q53scn4step6weapon8deespear11StateVanishFv + .byte4 procAnim__Q53scn4step6weapon8deespear11StateVanishFv + .byte4 procMove__Q53scn4step6weapon8deespear11StateVanishFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon8deespear11StateVanishFv + .byte4 procObjCollReact__Q53scn4step6weapon8deespear11StateVanishFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256857 diff --git a/asm/src/StateVomit.s b/asm/src/StateVomit.s index 354befa8..4b5ae051 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 - .4byte 0x8025AB88 ;# ptr - .4byte 0x8025AB8C ;# ptr - .4byte 0x8025ACD0 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025ACD4 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss13watergalboros10StateVomitFv + .byte4 procAnim__Q53scn4step4boss13watergalboros10StateVomitFv + .byte4 procMove__Q53scn4step4boss13watergalboros10StateVomitFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss13watergalboros10StateVomitFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy10StateVomit __vt__Q53scn4step4boss6whispy10StateVomit: .4byte 0 .4byte 0 - .4byte 0x8025EFF0 ;# ptr - .4byte 0x8025EFF4 ;# ptr - .4byte 0x8025F0D8 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025F0DC ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy10StateVomitFv + .byte4 procAnim__Q53scn4step4boss6whispy10StateVomitFv + .byte4 procMove__Q53scn4step4boss6whispy10StateVomitFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy10StateVomitFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateVomit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateVomit$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8036D944 - .4byte 0x8036D928 + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateVomit$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateVomit$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common10StateVomit __vt__Q53scn4step4hero6common10StateVomit: .4byte 0 .4byte 0 - .4byte 0x8036D7C8 - .4byte 0x8036D858 - .4byte 0x8036D920 - .4byte 0x8035550C - .4byte 0x8036D924 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common10StateVomitFv + .byte4 procAnim__Q53scn4step4hero6common10StateVomitFv + .byte4 procMove__Q53scn4step4hero6common10StateVomitFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common10StateVomitFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateVomited.s b/asm/src/StateVomited.s index 11c06a6f..bae7be86 100644 --- a/asm/src/StateVomited.s +++ b/asm/src/StateVomited.s @@ -810,13 +810,13 @@ lbl_8037555C: __vt__Q53scn4step4hero12interference12StateVomited: .4byte 0 .4byte 0 - .4byte 0x80374D70 - .4byte 0x80374F58 - .4byte 0x80375014 - .4byte 0x80375018 - .4byte 0x80375224 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero12interference12StateVomitedFv + .byte4 procAnim__Q53scn4step4hero12interference12StateVomitedFv + .byte4 procMove__Q53scn4step4hero12interference12StateVomitedFv + .byte4 procConstraint__Q53scn4step4hero12interference12StateVomitedFv + .byte4 procFixPos__Q53scn4step4hero12interference12StateVomitedFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateVulcan.s b/asm/src/StateVulcan.s index ca69e4f5..3cb09977 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 - .4byte 0x802C0B74 ;# ptr - .4byte 0x802C0C1C ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C0CA8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10knucklejoe11StateVulcanFv + .byte4 procAnim__Q53scn4step5enemy10knucklejoe11StateVulcanFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10knucklejoe11StateVulcanFv + .byte4 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 - .4byte 0x803A03E0 - .4byte 0x803A03C0 + .byte4 __dt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$4b$$1Fv + .byte4 create__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$4b$$1Fv .global __vt__Q53scn4step4hero7fighter11StateVulcan __vt__Q53scn4step4hero7fighter11StateVulcan: .4byte 0 .4byte 0 - .4byte 0x803A0160 - .4byte 0x803A0164 - .4byte 0x803A032C - .4byte 0x8035550C - .4byte 0x803A0330 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter11StateVulcanFv + .byte4 procAnim__Q53scn4step4hero7fighter11StateVulcanFv + .byte4 procMove__Q53scn4step4hero7fighter11StateVulcanFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter11StateVulcanFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 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 - .4byte 0x803A2B94 - .4byte 0x803A2B58 + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash11StateVulcan$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash11StateVulcan$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x803A2B90 - .4byte 0x803A2B74 + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash11StateVulcan$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash11StateVulcan$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero5smash11StateVulcan __vt__Q53scn4step4hero5smash11StateVulcan: .4byte 0 .4byte 0 - .4byte 0x803A2A00 - .4byte 0x803A2A04 - .4byte 0x803A2B50 - .4byte 0x8035550C - .4byte 0x803A2B54 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5smash11StateVulcanFv + .byte4 procAnim__Q53scn4step4hero5smash11StateVulcanFv + .byte4 procMove__Q53scn4step4hero5smash11StateVulcanFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5smash11StateVulcanFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateVulcanEnd.s b/asm/src/StateVulcanEnd.s index b7cd6576..afec42b9 100644 --- a/asm/src/StateVulcanEnd.s +++ b/asm/src/StateVulcanEnd.s @@ -138,13 +138,13 @@ procFixPos__Q53scn4step4hero5smash14StateVulcanEndFv: __vt__Q53scn4step4hero7fighter14StateVulcanEnd: .4byte 0 .4byte 0 - .4byte 0x803A0448 - .4byte 0x803A044C - .4byte 0x803A0500 - .4byte 0x8035550C - .4byte 0x803A0504 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7fighter14StateVulcanEndFv + .byte4 procAnim__Q53scn4step4hero7fighter14StateVulcanEndFv + .byte4 procMove__Q53scn4step4hero7fighter14StateVulcanEndFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7fighter14StateVulcanEndFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -152,11 +152,11 @@ __vt__Q53scn4step4hero7fighter14StateVulcanEnd: __vt__Q53scn4step4hero5smash14StateVulcanEnd: .4byte 0 .4byte 0 - .4byte 0x803A2BEC - .4byte 0x803A2BF0 - .4byte 0x803A2BF4 - .4byte 0x8035550C - .4byte 0x803A2BF8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5smash14StateVulcanEndFv + .byte4 procAnim__Q53scn4step4hero5smash14StateVulcanEndFv + .byte4 procMove__Q53scn4step4hero5smash14StateVulcanEndFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5smash14StateVulcanEndFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWaft.s b/asm/src/StateWaft.s index 8c4729d0..3353dead 100644 --- a/asm/src/StateWaft.s +++ b/asm/src/StateWaft.s @@ -177,10 +177,10 @@ $$255349: __vt__Q53scn4step4item5state9StateWaft: .4byte 0 .4byte 0 - .4byte 0x803C8E44 - .4byte 0x803C8D24 - .4byte 0x803C8D84 - .4byte 0x803C5204 + .byte4 __dt__Q53scn4step4item5state9StateWaftFv + .byte4 procAnim__Q53scn4step4item5state9StateWaftFv + .byte4 procMove__Q53scn4step4item5state9StateWaftFv + .byte4 procFixPos__Q43scn4step4item9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255346 diff --git a/asm/src/StateWait.s b/asm/src/StateWait.s index ce90ac12..c669da14 100644 --- a/asm/src/StateWait.s +++ b/asm/src/StateWait.s @@ -2620,205 +2620,205 @@ __dt__Q53scn4step6weapon19challengemastershot9StateWaitFv: __vt__Q53scn4step4boss6common9StateWait: .4byte 0 .4byte 0 - .4byte 0x80247A98 ;# ptr - .4byte 0x80247A9C ;# ptr - .4byte 0x80247AC0 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80247B08 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6common9StateWaitFv + .byte4 procAnim__Q53scn4step4boss6common9StateWaitFv + .byte4 procMove__Q53scn4step4boss6common9StateWaitFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6common9StateWaitFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior9StateWait __vt__Q53scn4step4boss6dubior9StateWait: .4byte 0 .4byte 0 - .4byte 0x80250E90 ;# ptr - .4byte 0x80250E94 ;# ptr - .4byte 0x80250E98 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80250E9C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6dubior9StateWaitFv + .byte4 procAnim__Q53scn4step4boss6dubior9StateWaitFv + .byte4 procMove__Q53scn4step4boss6dubior9StateWaitFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6dubior9StateWaitFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy9StateWait __vt__Q53scn4step4boss6whispy9StateWait: .4byte 0 .4byte 0 - .4byte 0x8025F12C ;# ptr - .4byte 0x8025F130 ;# ptr - .4byte 0x8025F180 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8025F184 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss6whispy9StateWaitFv + .byte4 procAnim__Q53scn4step4boss6whispy9StateWaitFv + .byte4 procMove__Q53scn4step4boss6whispy9StateWaitFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss6whispy9StateWaitFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common9StateWait __vt__Q53scn4step5enemy6common9StateWait: .4byte 0 .4byte 0 - .4byte 0x80295820 ;# ptr - .4byte 0x80295824 ;# ptr - .4byte 0x80295828 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8029582C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common9StateWaitFv + .byte4 procAnim__Q53scn4step5enemy6common9StateWaitFv + .byte4 procMove__Q53scn4step5enemy6common9StateWaitFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common9StateWaitFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StateTakeOff$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StateTakeOff$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802A0484 ;# ptr - .4byte 0x802A0464 ;# ptr + .byte4 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StateTakeOff$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StateTakeOff$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy10brontoburt9StateWait __vt__Q53scn4step5enemy10brontoburt9StateWait: .4byte 0 .4byte 0 - .4byte 0x802A0480 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A037C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10brontoburt9StateWaitFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10brontoburt9StateWaitFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5foley9StateWait __vt__Q53scn4step5enemy5foley9StateWait: .4byte 0 .4byte 0 - .4byte 0x802B5344 ;# ptr - .4byte 0x802B5348 ;# ptr - .4byte 0x802B54AC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5foley9StateWaitFv + .byte4 procAnim__Q53scn4step5enemy5foley9StateWaitFv + .byte4 procMove__Q53scn4step5enemy5foley9StateWaitFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7gigatzo9StateWait __vt__Q53scn4step5enemy7gigatzo9StateWait: .4byte 0 .4byte 0 - .4byte 0x802B891C ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802B8998 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B899C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy7gigatzo9StateWaitFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy7gigatzo9StateWaitFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy7gigatzo9StateWaitFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer9StateWait __vt__Q53scn4step5enemy6lanzer9StateWait: .4byte 0 .4byte 0 - .4byte 0x802C2740 ;# ptr - .4byte 0x802C2744 ;# ptr - .4byte 0x802C2748 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C274C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6lanzer9StateWaitFv + .byte4 procAnim__Q53scn4step5enemy6lanzer9StateWaitFv + .byte4 procMove__Q53scn4step5enemy6lanzer9StateWaitFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6lanzer9StateWaitFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6leafan9StateWait __vt__Q53scn4step5enemy6leafan9StateWait: .4byte 0 .4byte 0 - .4byte 0x802C4090 ;# ptr - .4byte 0x802C4094 ;# ptr - .4byte 0x802C4098 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C409C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6leafan9StateWaitFv + .byte4 procAnim__Q53scn4step5enemy6leafan9StateWaitFv + .byte4 procMove__Q53scn4step5enemy6leafan9StateWaitFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6leafan9StateWaitFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy14poppybrojrbomb9StateWait __vt__Q53scn4step5enemy14poppybrojrbomb9StateWait: .4byte 0 .4byte 0 - .4byte 0x802D3194 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy14poppybrojrbomb9StateWaitFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo9StateWait __vt__Q53scn4step5enemy6shotzo9StateWait: .4byte 0 .4byte 0 - .4byte 0x802E0EEC ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802E0EE4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E0EE8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6shotzo9StateWaitFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy6shotzo9StateWaitFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6shotzo9StateWaitFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble10StateCatch$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble10StateCatch$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802E22C0 ;# ptr - .4byte 0x802E22A4 ;# ptr + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble10StateCatch$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble10StateCatch$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9sirkibble9StateWait __vt__Q53scn4step5enemy9sirkibble9StateWait: .4byte 0 .4byte 0 - .4byte 0x802E20CC ;# ptr - .4byte 0x802E20D0 ;# ptr - .4byte 0x802E229C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E22A0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9sirkibble9StateWaitFv + .byte4 procAnim__Q53scn4step5enemy9sirkibble9StateWaitFv + .byte4 procMove__Q53scn4step5enemy9sirkibble9StateWaitFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9sirkibble9StateWaitFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory9StateWait __vt__Q53scn4step5enemy6sodory9StateWait: .4byte 0 .4byte 0 - .4byte 0x802E6490 ;# ptr - .4byte 0x802E6494 ;# ptr - .4byte 0x802E6498 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E649C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6sodory9StateWaitFv + .byte4 procAnim__Q53scn4step5enemy6sodory9StateWaitFv + .byte4 procMove__Q53scn4step5enemy6sodory9StateWaitFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6sodory9StateWaitFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage9StateWait __vt__Q53scn4step5enemy9tsukikage9StateWait: .4byte 0 .4byte 0 - .4byte 0x802EC258 ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802EC25C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EC260 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9tsukikage9StateWaitFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy9tsukikage9StateWaitFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9tsukikage9StateWaitFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledee9StateWait __vt__Q53scn4step5enemy9waddledee9StateWait: .4byte 0 .4byte 0 - .4byte 0x802EECDC ;# ptr - .4byte 0x802EEB80 ;# ptr - .4byte 0x802EEC68 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EEC6C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledee9StateWaitFv + .byte4 procAnim__Q53scn4step5enemy9waddledee9StateWaitFv + .byte4 procMove__Q53scn4step5enemy9waddledee9StateWaitFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9waddledee9StateWaitFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common9StateWait __vt__Q53scn4step4hero6common9StateWait: .4byte 0 .4byte 0 - .4byte 0x8036DB68 - .4byte 0x8036DBEC - .4byte 0x8036DED8 - .4byte 0x8035550C - .4byte 0x8036DEDC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common9StateWaitFv + .byte4 procAnim__Q53scn4step4hero6common9StateWaitFv + .byte4 procMove__Q53scn4step4hero6common9StateWaitFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common9StateWaitFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -2826,13 +2826,13 @@ __vt__Q53scn4step4hero6common9StateWait: __vt__Q53scn4step4hero5stone9StateWait: .4byte 0 .4byte 0 - .4byte 0x8039194C - .4byte 0x803919D4 - .4byte 0x803919FC - .4byte 0x8035550C - .4byte 0x80391A00 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero5stone9StateWaitFv + .byte4 procAnim__Q53scn4step4hero5stone9StateWaitFv + .byte4 procMove__Q53scn4step4hero5stone9StateWaitFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero5stone9StateWaitFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 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 - .4byte 0x803A5114 - .4byte 0x803A50F4 + .byte4 __dt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWalk$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv + .byte4 create__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWalk$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv .global __vt__Q53scn4step4hero11staffcredit9StateWait __vt__Q53scn4step4hero11staffcredit9StateWait: .4byte 0 .4byte 0 - .4byte 0x803A4F04 - .4byte 0x803A4FDC - .4byte 0x803A50EC - .4byte 0x8035550C - .4byte 0x803A50F0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero11staffcredit9StateWaitFv + .byte4 procAnim__Q53scn4step4hero11staffcredit9StateWaitFv + .byte4 procMove__Q53scn4step4hero11staffcredit9StateWaitFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero11staffcredit9StateWaitFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -2860,12 +2860,12 @@ __vt__Q53scn4step4hero11staffcredit9StateWait: __vt__Q53scn4step6weapon19challengemastershot9StateWait: .4byte 0 .4byte 0 - .4byte 0x803F11DC - .4byte 0x803F11D0 - .4byte 0x803F11D4 - .4byte 0x803D895C - .4byte 0x803F11D8 - .4byte 0x803D8964 + .byte4 __dt__Q53scn4step6weapon19challengemastershot9StateWaitFv + .byte4 procAnim__Q53scn4step6weapon19challengemastershot9StateWaitFv + .byte4 procMove__Q53scn4step6weapon19challengemastershot9StateWaitFv + .byte4 procConstraint__Q43scn4step6weapon9StateBaseFv + .byte4 procFixPos__Q53scn4step6weapon19challengemastershot9StateWaitFv + .byte4 procObjCollReact__Q43scn4step6weapon9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254787 diff --git a/asm/src/StateWaitFar.s b/asm/src/StateWaitFar.s index 766877ec..84d8a2dd 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 - .4byte 0x8024C38C ;# ptr - .4byte 0x8024C370 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateWaitFar$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateWaitFar$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss10creditroah12StateWaitFar __vt__Q53scn4step4boss10creditroah12StateWaitFar: .4byte 0 .4byte 0 - .4byte 0x8024C274 ;# ptr - .4byte 0x8024C2F0 ;# ptr - .4byte 0x8024C318 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024C36C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss10creditroah12StateWaitFarFv + .byte4 procAnim__Q53scn4step4boss10creditroah12StateWaitFarFv + .byte4 procMove__Q53scn4step4boss10creditroah12StateWaitFarFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss10creditroah12StateWaitFarFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateWakeUp.s b/asm/src/StateWakeUp.s index a4cf0d33..4c6d75cd 100644 --- a/asm/src/StateWakeUp.s +++ b/asm/src/StateWakeUp.s @@ -126,11 +126,11 @@ procFixPos__Q53scn4step4hero6common11StateWakeUpFv: __vt__Q53scn4step4hero6common11StateWakeUp: .4byte 0 .4byte 0 - .4byte 0x8036E0F0 - .4byte 0x8036E18C - .4byte 0x8036E1D4 - .4byte 0x8035550C - .4byte 0x8036E1D8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common11StateWakeUpFv + .byte4 procAnim__Q53scn4step4hero6common11StateWakeUpFv + .byte4 procMove__Q53scn4step4hero6common11StateWakeUpFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common11StateWakeUpFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWalk.s b/asm/src/StateWalk.s index a2fb723c..ed909aa4 100644 --- a/asm/src/StateWalk.s +++ b/asm/src/StateWalk.s @@ -2751,121 +2751,121 @@ procFixPos__Q53scn4step4hero11staffcredit9StateWalkFv: __vt__Q53scn4step5enemy11bladeknight9StateWalk: .4byte 0 .4byte 0 - .4byte 0x8029841C ;# ptr - .4byte 0x80298420 ;# ptr - .4byte 0x80298424 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80298494 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11bladeknight9StateWalkFv + .byte4 procAnim__Q53scn4step5enemy11bladeknight9StateWalkFv + .byte4 procMove__Q53scn4step5enemy11bladeknight9StateWalkFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11bladeknight9StateWalkFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter9StateWalk __vt__Q53scn4step5enemy11broomhatter9StateWalk: .4byte 0 .4byte 0 - .4byte 0x802A1BD0 ;# ptr - .4byte 0x802A1944 ;# ptr - .4byte 0x802A1B28 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A1B2C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11broomhatter9StateWalkFv + .byte4 procAnim__Q53scn4step5enemy11broomhatter9StateWalkFv + .byte4 procMove__Q53scn4step5enemy11broomhatter9StateWalkFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11broomhatter9StateWalkFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe9StateWalk __vt__Q53scn4step5enemy10knucklejoe9StateWalk: .4byte 0 .4byte 0 - .4byte 0x802C0D74 ;# ptr - .4byte 0x802C0DF0 ;# ptr - .4byte 0x802C0EC0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C0F3C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10knucklejoe9StateWalkFv + .byte4 procAnim__Q53scn4step5enemy10knucklejoe9StateWalkFv + .byte4 procMove__Q53scn4step5enemy10knucklejoe9StateWalkFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10knucklejoe9StateWalkFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer9StateWalk __vt__Q53scn4step5enemy6lanzer9StateWalk: .4byte 0 .4byte 0 - .4byte 0x802C282C ;# ptr - .4byte 0x802C28A8 ;# ptr - .4byte 0x802C2A5C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C2AF4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6lanzer9StateWalkFv + .byte4 procAnim__Q53scn4step5enemy6lanzer9StateWalkFv + .byte4 procMove__Q53scn4step5enemy6lanzer9StateWalkFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6lanzer9StateWalkFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5noddy9StateWalk __vt__Q53scn4step5enemy5noddy9StateWalk: .4byte 0 .4byte 0 - .4byte 0x802C747C ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x802C7480 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C74EC ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5noddy9StateWalkFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q53scn4step5enemy5noddy9StateWalkFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5noddy9StateWalkFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStop$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStop$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802C97EC ;# ptr - .4byte 0x802C97D0 ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStop$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStop$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5nruff9StateWalk __vt__Q53scn4step5enemy5nruff9StateWalk: .4byte 0 .4byte 0 - .4byte 0x802C92AC ;# ptr - .4byte 0x802C932C ;# ptr - .4byte 0x802C94E0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C9564 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5nruff9StateWalkFv + .byte4 procAnim__Q53scn4step5enemy5nruff9StateWalkFv + .byte4 procMove__Q53scn4step5enemy5nruff9StateWalkFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5nruff9StateWalkFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky16StateCliffAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky16StateCliffAttack$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802D5E44 ;# ptr - .4byte 0x802D5E08 ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky16StateCliffAttack$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky16StateCliffAttack$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateWalkEnd$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateWalkEnd$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802D5E40 ;# ptr - .4byte 0x802D5E24 ;# ptr + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateWalkEnd$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateWalkEnd$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5rocky9StateWalk __vt__Q53scn4step5enemy5rocky9StateWalk: .4byte 0 .4byte 0 - .4byte 0x802D5758 ;# ptr - .4byte 0x802D575C ;# ptr - .4byte 0x802D5AB0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D5B64 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5rocky9StateWalkFv + .byte4 procAnim__Q53scn4step5enemy5rocky9StateWalkFv + .byte4 procMove__Q53scn4step5enemy5rocky9StateWalkFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5rocky9StateWalkFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWalk$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWalk$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8036E6C0 - .4byte 0x8036E6A4 + .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWalk$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWalk$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common9StateWalk __vt__Q53scn4step4hero6common9StateWalk: .4byte 0 .4byte 0 - .4byte 0x8036E3F0 - .4byte 0x8036E3F4 - .4byte 0x8036E5C8 - .4byte 0x8035550C - .4byte 0x8036E5CC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common9StateWalkFv + .byte4 procAnim__Q53scn4step4hero6common9StateWalkFv + .byte4 procMove__Q53scn4step4hero6common9StateWalkFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common9StateWalkFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -2873,13 +2873,13 @@ __vt__Q53scn4step4hero6common9StateWalk: __vt__Q53scn4step4hero11staffcredit9StateWalk: .4byte 0 .4byte 0 - .4byte 0x803A52C8 - .4byte 0x803A5344 - .4byte 0x803A5494 - .4byte 0x8035550C - .4byte 0x803A5580 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero11staffcredit9StateWalkFv + .byte4 procAnim__Q53scn4step4hero11staffcredit9StateWalkFv + .byte4 procMove__Q53scn4step4hero11staffcredit9StateWalkFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero11staffcredit9StateWalkFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateWalkAround.s b/asm/src/StateWalkAround.s index d2cbed39..3dfd18c4 100644 --- a/asm/src/StateWalkAround.s +++ b/asm/src/StateWalkAround.s @@ -1389,48 +1389,48 @@ lbl_802E6A34: __vt__Q53scn4step5enemy6common15StateWalkAround: .4byte 0 .4byte 0 - .4byte 0x80295A48 ;# ptr - .4byte 0x80295A4C ;# ptr - .4byte 0x80295A50 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80295AA8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common15StateWalkAroundFv + .byte4 procAnim__Q53scn4step5enemy6common15StateWalkAroundFv + .byte4 procMove__Q53scn4step5enemy6common15StateWalkAroundFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common15StateWalkAroundFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter15StateWalkAround __vt__Q53scn4step5enemy11broomhatter15StateWalkAround: .4byte 0 .4byte 0 - .4byte 0x802A2100 ;# ptr - .4byte 0x802A1CB8 ;# ptr - .4byte 0x802A1F38 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A1F80 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy11broomhatter15StateWalkAroundFv + .byte4 procAnim__Q53scn4step5enemy11broomhatter15StateWalkAroundFv + .byte4 procMove__Q53scn4step5enemy11broomhatter15StateWalkAroundFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy11broomhatter15StateWalkAroundFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer15StateWalkAround __vt__Q53scn4step5enemy6lanzer15StateWalkAround: .4byte 0 .4byte 0 - .4byte 0x802C2D78 ;# ptr - .4byte 0x802C2DF4 ;# ptr - .4byte 0x802C2F7C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C2F80 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6lanzer15StateWalkAroundFv + .byte4 procAnim__Q53scn4step5enemy6lanzer15StateWalkAroundFv + .byte4 procMove__Q53scn4step5enemy6lanzer15StateWalkAroundFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6lanzer15StateWalkAroundFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory15StateWalkAround __vt__Q53scn4step5enemy6sodory15StateWalkAround: .4byte 0 .4byte 0 - .4byte 0x802E6658 ;# ptr - .4byte 0x802E665C ;# ptr - .4byte 0x802E6660 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802E66EC ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6sodory15StateWalkAroundFv + .byte4 procAnim__Q53scn4step5enemy6sodory15StateWalkAroundFv + .byte4 procMove__Q53scn4step5enemy6sodory15StateWalkAroundFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6sodory15StateWalkAroundFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255928 diff --git a/asm/src/StateWalkEnd.s b/asm/src/StateWalkEnd.s index 0807b92c..e11d234e 100644 --- a/asm/src/StateWalkEnd.s +++ b/asm/src/StateWalkEnd.s @@ -93,12 +93,12 @@ lbl_802D5F54: __vt__Q53scn4step5enemy5rocky12StateWalkEnd: .4byte 0 .4byte 0 - .4byte 0x802D5EC0 ;# ptr - .4byte 0x802D5EC4 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D5EC8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5rocky12StateWalkEndFv + .byte4 procAnim__Q53scn4step5enemy5rocky12StateWalkEndFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5rocky12StateWalkEndFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255720 diff --git a/asm/src/StateWalkStart.s b/asm/src/StateWalkStart.s index 14f6f0bb..32e45add 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 - .4byte 0x802D6088 ;# ptr - .4byte 0x802D606C ;# ptr + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5rocky14StateWalkStart __vt__Q53scn4step5enemy5rocky14StateWalkStart: .4byte 0 .4byte 0 - .4byte 0x802D5FD4 ;# ptr - .4byte 0x802D5FD8 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802D6068 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5rocky14StateWalkStartFv + .byte4 procAnim__Q53scn4step5enemy5rocky14StateWalkStartFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5rocky14StateWalkStartFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255797 diff --git a/asm/src/StateWalkStepBack.s b/asm/src/StateWalkStepBack.s index 3c4970e4..7b6821fa 100644 --- a/asm/src/StateWalkStepBack.s +++ b/asm/src/StateWalkStepBack.s @@ -426,12 +426,12 @@ lbl_802C1718: __vt__Q53scn4step5enemy10knucklejoe17StateWalkStepBack: .4byte 0 .4byte 0 - .4byte 0x802C1280 ;# ptr - .4byte 0x802C12FC ;# ptr - .4byte 0x802C1484 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C1570 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10knucklejoe17StateWalkStepBackFv + .byte4 procAnim__Q53scn4step5enemy10knucklejoe17StateWalkStepBackFv + .byte4 procMove__Q53scn4step5enemy10knucklejoe17StateWalkStepBackFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10knucklejoe17StateWalkStepBackFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256282 diff --git a/asm/src/StateWalkStraight.s b/asm/src/StateWalkStraight.s index 95094620..32646bbb 100644 --- a/asm/src/StateWalkStraight.s +++ b/asm/src/StateWalkStraight.s @@ -1057,48 +1057,48 @@ lbl_802CF618: __vt__Q53scn4step5enemy6common17StateWalkStraight: .4byte 0 .4byte 0 - .4byte 0x80295E24 ;# ptr - .4byte 0x80295E28 ;# ptr - .4byte 0x80295E2C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x80295E30 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6common17StateWalkStraightFv + .byte4 procAnim__Q53scn4step5enemy6common17StateWalkStraightFv + .byte4 procMove__Q53scn4step5enemy6common17StateWalkStraightFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6common17StateWalkStraightFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8needlous17StateWalkStraight __vt__Q53scn4step5enemy8needlous17StateWalkStraight: .4byte 0 .4byte 0 - .4byte 0x802C6E14 ;# ptr - .4byte 0x802C6E18 ;# ptr - .4byte 0x802C6F78 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802C6F7C ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy8needlous17StateWalkStraightFv + .byte4 procAnim__Q53scn4step5enemy8needlous17StateWalkStraightFv + .byte4 procMove__Q53scn4step5enemy8needlous17StateWalkStraightFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy8needlous17StateWalkStraightFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldee17StateWalkStraight __vt__Q53scn4step5enemy10parasoldee17StateWalkStraight: .4byte 0 .4byte 0 - .4byte 0x802CD5CC ;# ptr - .4byte 0x802CD5D0 ;# ptr - .4byte 0x802CD5FC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802CD600 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10parasoldee17StateWalkStraightFv + .byte4 procAnim__Q53scn4step5enemy10parasoldee17StateWalkStraightFv + .byte4 procMove__Q53scn4step5enemy10parasoldee17StateWalkStraightFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10parasoldee17StateWalkStraightFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo17StateWalkStraight __vt__Q53scn4step5enemy10parasoldoo17StateWalkStraight: .4byte 0 .4byte 0 - .4byte 0x802CF3FC ;# ptr - .4byte 0x802CF400 ;# ptr - .4byte 0x802CF42C ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802CF430 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10parasoldoo17StateWalkStraightFv + .byte4 procAnim__Q53scn4step5enemy10parasoldoo17StateWalkStraightFv + .byte4 procMove__Q53scn4step5enemy10parasoldoo17StateWalkStraightFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10parasoldoo17StateWalkStraightFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255905 diff --git a/asm/src/StateWall.s b/asm/src/StateWall.s index e04aaa03..386a9865 100644 --- a/asm/src/StateWall.s +++ b/asm/src/StateWall.s @@ -143,12 +143,12 @@ lbl_802EC4E0: __vt__Q53scn4step5enemy9tsukikage9StateWall: .4byte 0 .4byte 0 - .4byte 0x802EC47C ;# ptr - .4byte 0x8028DDD8 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9tsukikage9StateWallFv + .byte4 procAnim__Q43scn4step5enemy9StateBaseFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255060 diff --git a/asm/src/StateWallAttack.s b/asm/src/StateWallAttack.s index 3b817e09..5221a6a0 100644 --- a/asm/src/StateWallAttack.s +++ b/asm/src/StateWallAttack.s @@ -176,12 +176,12 @@ lbl_802EC750: __vt__Q53scn4step5enemy9tsukikage15StateWallAttack: .4byte 0 .4byte 0 - .4byte 0x802EC610 ;# ptr - .4byte 0x802EC690 ;# ptr - .4byte 0x8028DDDC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x8028DDE4 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9tsukikage15StateWallAttackFv + .byte4 procAnim__Q53scn4step5enemy9tsukikage15StateWallAttackFv + .byte4 procMove__Q43scn4step5enemy9StateBaseFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q43scn4step5enemy9StateBaseFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255084 diff --git a/asm/src/StateWarp.s b/asm/src/StateWarp.s index 840974e8..e3d3dc24 100644 --- a/asm/src/StateWarp.s +++ b/asm/src/StateWarp.s @@ -655,12 +655,12 @@ lbl_802ED08C: __vt__Q53scn4step5enemy9tsukikage9StateWarp: .4byte 0 .4byte 0 - .4byte 0x802EC94C ;# ptr - .4byte 0x802EC9D4 ;# ptr - .4byte 0x802ECD74 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802ECEA8 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9tsukikage9StateWarpFv + .byte4 procAnim__Q53scn4step5enemy9tsukikage9StateWarpFv + .byte4 procMove__Q53scn4step5enemy9tsukikage9StateWarpFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9tsukikage9StateWarpFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257655 diff --git a/asm/src/StateWarpStar.s b/asm/src/StateWarpStar.s index dcf57657..9174afdf 100644 --- a/asm/src/StateWarpStar.s +++ b/asm/src/StateWarpStar.s @@ -769,11 +769,11 @@ lbl_80382BAC: __vt__Q53scn4step4hero7gimmick13StateWarpStar: .4byte 0 .4byte 0 - .4byte 0x803827B8 - .4byte 0x803827BC - .4byte 0x80382B3C - .4byte 0x80382B40 - .4byte 0x80355510 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick13StateWarpStarFv + .byte4 procAnim__Q53scn4step4hero7gimmick13StateWarpStarFv + .byte4 procMove__Q53scn4step4hero7gimmick13StateWarpStarFv + .byte4 procConstraint__Q53scn4step4hero7gimmick13StateWarpStarFv + .byte4 procFixPos__Q43scn4step4hero9StateBaseFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWarpStarFall.s b/asm/src/StateWarpStarFall.s index 81762b0c..bb12192a 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 - .4byte 0x803832F8 + .byte4 __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 - .4byte 0x803832F4 - .4byte 0x803832D4 + .byte4 __dt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay$$4PQ43scn4step4hero4Hero$$4i$$1Fv + .byte4 create__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay$$4PQ43scn4step4hero4Hero$$4i$$1Fv .global __vt__Q53scn4step4hero7gimmick17StateWarpStarFall __vt__Q53scn4step4hero7gimmick17StateWarpStarFall: .4byte 0 .4byte 0 - .4byte 0x80382D80 - .4byte 0x80382E9C - .4byte 0x803831BC - .4byte 0x8035550C - .4byte 0x803831C0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick17StateWarpStarFallFv + .byte4 procAnim__Q53scn4step4hero7gimmick17StateWarpStarFallFv + .byte4 procMove__Q53scn4step4hero7gimmick17StateWarpStarFallFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero7gimmick17StateWarpStarFallFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateWarpStarIn.s b/asm/src/StateWarpStarIn.s index 58836b3a..7e8eabdc 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 - .4byte 0x80383CC0 + .byte4 __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 - .4byte 0x80383CBC - .4byte 0x80383C9C + .byte4 __dt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateWarpStarFall$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .byte4 create__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateWarpStarFall$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q53scn4step4hero7gimmick15StateWarpStarIn __vt__Q53scn4step4hero7gimmick15StateWarpStarIn: .4byte 0 .4byte 0 - .4byte 0x803837C0 - .4byte 0x80383958 - .4byte 0x80383B6C - .4byte 0x80383C34 - .4byte 0x80355510 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero7gimmick15StateWarpStarInFv + .byte4 procAnim__Q53scn4step4hero7gimmick15StateWarpStarInFv + .byte4 procMove__Q53scn4step4hero7gimmick15StateWarpStarInFv + .byte4 procConstraint__Q53scn4step4hero7gimmick15StateWarpStarInFv + .byte4 procFixPos__Q43scn4step4hero9StateBaseFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/StateWaterFloat.s b/asm/src/StateWaterFloat.s index 10fcab2a..599f0d9f 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 - .4byte 0x8036ED08 - .4byte 0x8036ECE0 + .byte4 __dt__Q24util96StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$4b$$4b$$1Fv + .byte4 create__Q24util96StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$4b$$4b$$1Fv .global __vt__Q53scn4step4hero6common15StateWaterFloat __vt__Q53scn4step4hero6common15StateWaterFloat: .4byte 0 .4byte 0 - .4byte 0x8036E7E8 - .4byte 0x8036E894 - .4byte 0x8036EBA0 - .4byte 0x8035550C - .4byte 0x8036EC18 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common15StateWaterFloatFv + .byte4 procAnim__Q53scn4step4hero6common15StateWaterFloatFv + .byte4 procMove__Q53scn4step4hero6common15StateWaterFloatFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common15StateWaterFloatFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWaterPistol.s b/asm/src/StateWaterPistol.s index ea0c1ae7..5de7eaa8 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 - .4byte 0x8036F1CC - .4byte 0x8036F1AC + .byte4 __dt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common16StateWaterPistol$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1Fv + .byte4 create__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common16StateWaterPistol$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1Fv .global __vt__Q53scn4step4hero6common16StateWaterPistol __vt__Q53scn4step4hero6common16StateWaterPistol: .4byte 0 .4byte 0 - .4byte 0x8036F098 - .4byte 0x8036F110 - .4byte 0x8036F1A4 - .4byte 0x8035550C - .4byte 0x8036F1A8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common16StateWaterPistolFv + .byte4 procAnim__Q53scn4step4hero6common16StateWaterPistolFv + .byte4 procMove__Q53scn4step4hero6common16StateWaterPistolFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common16StateWaterPistolFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateWaterPistolFloat.s b/asm/src/StateWaterPistolFloat.s index b497dbca..d0d44032 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 - .4byte 0x8036F500 - .4byte 0x8036F4E4 + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common21StateWaterPistolFloat$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common21StateWaterPistolFloat$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common21StateWaterPistolFloat __vt__Q53scn4step4hero6common21StateWaterPistolFloat: .4byte 0 .4byte 0 - .4byte 0x8036F310 - .4byte 0x8036F39C - .4byte 0x8036F4DC - .4byte 0x8035550C - .4byte 0x8036F4E0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common21StateWaterPistolFloatFv + .byte4 procAnim__Q53scn4step4hero6common21StateWaterPistolFloatFv + .byte4 procMove__Q53scn4step4hero6common21StateWaterPistolFloatFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common21StateWaterPistolFloatFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateWaterWait.s b/asm/src/StateWaterWait.s index 28e2944b..65eba0ae 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 - .4byte 0x8036FAE4 - .4byte 0x8036FAC4 + .byte4 __dt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .byte4 create__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q53scn4step4hero6common14StateWaterWait __vt__Q53scn4step4hero6common14StateWaterWait: .4byte 0 .4byte 0 - .4byte 0x8036F700 - .4byte 0x8036F778 - .4byte 0x8036F964 - .4byte 0x8035550C - .4byte 0x8036F9B8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common14StateWaterWaitFv + .byte4 procAnim__Q53scn4step4hero6common14StateWaterWaitFv + .byte4 procMove__Q53scn4step4hero6common14StateWaterWaitFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common14StateWaterWaitFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWaterWalk.s b/asm/src/StateWaterWalk.s index 26ceae49..dd3c6cb6 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 - .4byte 0x8036FF98 - .4byte 0x8036FF7C + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWalk$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWalk$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero6common14StateWaterWalk __vt__Q53scn4step4hero6common14StateWaterWalk: .4byte 0 .4byte 0 - .4byte 0x8036FC08 - .4byte 0x8036FC80 - .4byte 0x8036FDEC - .4byte 0x8035550C - .4byte 0x8036FE6C - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero6common14StateWaterWalkFv + .byte4 procAnim__Q53scn4step4hero6common14StateWaterWalkFv + .byte4 procMove__Q53scn4step4hero6common14StateWaterWalkFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero6common14StateWaterWalkFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipAttack.s b/asm/src/StateWhipAttack.s index 8f458279..069f1c2b 100644 --- a/asm/src/StateWhipAttack.s +++ b/asm/src/StateWhipAttack.s @@ -59,11 +59,11 @@ procFixPos__Q53scn4step4hero4whip15StateWhipAttackFv: __vt__Q53scn4step4hero4whip15StateWhipAttack: .4byte 0 .4byte 0 - .4byte 0x8038A0A4 - .4byte 0x8038A0A8 - .4byte 0x8038A0AC - .4byte 0x8035550C - .4byte 0x8038A0D0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4whip15StateWhipAttackFv + .byte4 procAnim__Q53scn4step4hero4whip15StateWhipAttackFv + .byte4 procMove__Q53scn4step4hero4whip15StateWhipAttackFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4whip15StateWhipAttackFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipAttackAir.s b/asm/src/StateWhipAttackAir.s index 6c7d54f6..8ef1798b 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 - .4byte 0x8038A2C8 - .4byte 0x8038A2AC + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipAttackAir$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipAttackAir$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip18StateWhipAttackAir __vt__Q53scn4step4hero4whip18StateWhipAttackAir: .4byte 0 .4byte 0 - .4byte 0x8038A210 - .4byte 0x8038A214 - .4byte 0x8038A2A4 - .4byte 0x8035550C - .4byte 0x8038A2A8 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4whip18StateWhipAttackAirFv + .byte4 procAnim__Q53scn4step4hero4whip18StateWhipAttackAirFv + .byte4 procMove__Q53scn4step4hero4whip18StateWhipAttackAirFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4whip18StateWhipAttackAirFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipAttackUp.s b/asm/src/StateWhipAttackUp.s index 69f0a85a..201d0787 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 - .4byte 0x8038A40C - .4byte 0x8038A3F0 + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipAttackUp$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipAttackUp$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip17StateWhipAttackUp __vt__Q53scn4step4hero4whip17StateWhipAttackUp: .4byte 0 .4byte 0 - .4byte 0x8038A3E0 - .4byte 0x8038A3E4 - .4byte 0x8038A3E8 - .4byte 0x8035550C - .4byte 0x8038A3EC - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4whip17StateWhipAttackUpFv + .byte4 procAnim__Q53scn4step4hero4whip17StateWhipAttackUpFv + .byte4 procMove__Q53scn4step4hero4whip17StateWhipAttackUpFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4whip17StateWhipAttackUpFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipCapture.s b/asm/src/StateWhipCapture.s index fb5757fb..375c8b4c 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 - .4byte 0x8038A76C - .4byte 0x8038A730 + .byte4 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured17StateCapturedWhip$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured17StateCapturedWhip$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipCatch$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipCatch$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8038A768 - .4byte 0x8038A74C + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipCatch$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipCatch$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip16StateWhipCapture __vt__Q53scn4step4hero4whip16StateWhipCapture: .4byte 0 .4byte 0 - .4byte 0x8038A484 - .4byte 0x8038A534 - .4byte 0x8038A5E8 - .4byte 0x8038A5EC - .4byte 0x8038A660 - .4byte 0x8038A664 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4whip16StateWhipCaptureFv + .byte4 procAnim__Q53scn4step4hero4whip16StateWhipCaptureFv + .byte4 procMove__Q53scn4step4hero4whip16StateWhipCaptureFv + .byte4 procConstraint__Q53scn4step4hero4whip16StateWhipCaptureFv + .byte4 procFixPos__Q53scn4step4hero4whip16StateWhipCaptureFv + .byte4 procObjCollReact__Q53scn4step4hero4whip16StateWhipCaptureFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipCaptureUp.s b/asm/src/StateWhipCaptureUp.s index 7268d0de..a2b19dfe 100644 --- a/asm/src/StateWhipCaptureUp.s +++ b/asm/src/StateWhipCaptureUp.s @@ -107,11 +107,11 @@ procObjCollReact__Q53scn4step4hero4whip18StateWhipCaptureUpFv: __vt__Q53scn4step4hero4whip18StateWhipCaptureUp: .4byte 0 .4byte 0 - .4byte 0x8038A7E4 - .4byte 0x8038A894 - .4byte 0x8038A898 - .4byte 0x8038A89C - .4byte 0x8038A8A0 - .4byte 0x8038A8A4 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4whip18StateWhipCaptureUpFv + .byte4 procAnim__Q53scn4step4hero4whip18StateWhipCaptureUpFv + .byte4 procMove__Q53scn4step4hero4whip18StateWhipCaptureUpFv + .byte4 procConstraint__Q53scn4step4hero4whip18StateWhipCaptureUpFv + .byte4 procFixPos__Q53scn4step4hero4whip18StateWhipCaptureUpFv + .byte4 procObjCollReact__Q53scn4step4hero4whip18StateWhipCaptureUpFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipCatch.s b/asm/src/StateWhipCatch.s index d9f15b85..9c2bf982 100644 --- a/asm/src/StateWhipCatch.s +++ b/asm/src/StateWhipCatch.s @@ -240,13 +240,13 @@ procObjCollReact__Q53scn4step4hero4whip14StateWhipCatchFv: __vt__Q53scn4step4hero4whip14StateWhipCatch: .4byte 0 .4byte 0 - .4byte 0x8038A958 - .4byte 0x8038A9F4 - .4byte 0x8038AA98 - .4byte 0x8038AA9C - .4byte 0x8038AAA0 - .4byte 0x8038ABC0 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4whip14StateWhipCatchFv + .byte4 procAnim__Q53scn4step4hero4whip14StateWhipCatchFv + .byte4 procMove__Q53scn4step4hero4whip14StateWhipCatchFv + .byte4 procConstraint__Q53scn4step4hero4whip14StateWhipCatchFv + .byte4 procFixPos__Q53scn4step4hero4whip14StateWhipCatchFv + .byte4 procObjCollReact__Q53scn4step4hero4whip14StateWhipCatchFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateWhipCharge.s b/asm/src/StateWhipCharge.s index 9805d292..0a7ebeab 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 - .4byte 0x8038B130 - .4byte 0x8038B0B4 + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipCaptureUp$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipCaptureUp$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip16StateWhipCapture$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip16StateWhipCapture$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8038B12C - .4byte 0x8038B0D0 + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip16StateWhipCapture$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip16StateWhipCapture$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipAttack$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8038B128 - .4byte 0x8038B0EC + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipAttack$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipAttack$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipCharge$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipCharge$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8038B124 - .4byte 0x8038B108 + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipCharge$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipCharge$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip15StateWhipCharge __vt__Q53scn4step4hero4whip15StateWhipCharge: .4byte 0 .4byte 0 - .4byte 0x8038AD28 - .4byte 0x8038ADA4 - .4byte 0x8038B04C - .4byte 0x8035550C - .4byte 0x8038B0B0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4whip15StateWhipChargeFv + .byte4 procAnim__Q53scn4step4hero4whip15StateWhipChargeFv + .byte4 procMove__Q53scn4step4hero4whip15StateWhipChargeFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4whip15StateWhipChargeFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipDrill.s b/asm/src/StateWhipDrill.s index 328144a6..6d252496 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 - .4byte 0x8038B514 - .4byte 0x8038B4F8 + .byte4 __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipDrill$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipDrill$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip14StateWhipDrill __vt__Q53scn4step4hero4whip14StateWhipDrill: .4byte 0 .4byte 0 - .4byte 0x8038B2A4 - .4byte 0x8038B320 - .4byte 0x8038B454 - .4byte 0x8035550C - .4byte 0x8038B4F4 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4whip14StateWhipDrillFv + .byte4 procAnim__Q53scn4step4hero4whip14StateWhipDrillFv + .byte4 procMove__Q53scn4step4hero4whip14StateWhipDrillFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4whip14StateWhipDrillFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipGazerSpiral.s b/asm/src/StateWhipGazerSpiral.s index b041d72c..ff232f94 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 - .4byte 0x8038B978 - .4byte 0x8038B95C + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip20StateWhipGazerSpiral$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip20StateWhipGazerSpiral$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip20StateWhipGazerSpiral __vt__Q53scn4step4hero4whip20StateWhipGazerSpiral: .4byte 0 .4byte 0 - .4byte 0x8038B6C4 - .4byte 0x8038B740 - .4byte 0x8038B7DC - .4byte 0x8035550C - .4byte 0x8038B958 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4whip20StateWhipGazerSpiralFv + .byte4 procAnim__Q53scn4step4hero4whip20StateWhipGazerSpiralFv + .byte4 procMove__Q53scn4step4hero4whip20StateWhipGazerSpiralFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4whip20StateWhipGazerSpiralFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/StateWhipRush.s b/asm/src/StateWhipRush.s index 0c9cbd14..e16b358c 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 - .4byte 0x8038BC90 - .4byte 0x8038BC74 + .byte4 __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip13StateWhipRush$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip13StateWhipRush$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip13StateWhipRush __vt__Q53scn4step4hero4whip13StateWhipRush: .4byte 0 .4byte 0 - .4byte 0x8038BAAC - .4byte 0x8038BAB0 - .4byte 0x8038BC6C - .4byte 0x8035550C - .4byte 0x8038BC70 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4whip13StateWhipRushFv + .byte4 procAnim__Q53scn4step4hero4whip13StateWhipRushFv + .byte4 procMove__Q53scn4step4hero4whip13StateWhipRushFv + .byte4 procConstraint__Q43scn4step4hero9StateBaseFv + .byte4 procFixPos__Q53scn4step4hero4whip13StateWhipRushFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipSlamBack.s b/asm/src/StateWhipSlamBack.s index becf647d..19e10b1c 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 - .4byte 0x8038BF40 - .4byte 0x8038BF24 + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamBack$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamBack$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip17StateWhipSlamBack __vt__Q53scn4step4hero4whip17StateWhipSlamBack: .4byte 0 .4byte 0 - .4byte 0x8038BE04 - .4byte 0x8038BE7C - .4byte 0x8038BF18 - .4byte 0x8038BF1C - .4byte 0x8038BF20 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4whip17StateWhipSlamBackFv + .byte4 procAnim__Q53scn4step4hero4whip17StateWhipSlamBackFv + .byte4 procMove__Q53scn4step4hero4whip17StateWhipSlamBackFv + .byte4 procConstraint__Q53scn4step4hero4whip17StateWhipSlamBackFv + .byte4 procFixPos__Q53scn4step4hero4whip17StateWhipSlamBackFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipSlamDown.s b/asm/src/StateWhipSlamDown.s index 678b285e..5a429c72 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 - .4byte 0x8038C210 - .4byte 0x8038C1F4 + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamDown$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamDown$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip17StateWhipSlamDown __vt__Q53scn4step4hero4whip17StateWhipSlamDown: .4byte 0 .4byte 0 - .4byte 0x8038C074 - .4byte 0x8038C0EC - .4byte 0x8038C1E8 - .4byte 0x8038C1EC - .4byte 0x8038C1F0 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4whip17StateWhipSlamDownFv + .byte4 procAnim__Q53scn4step4hero4whip17StateWhipSlamDownFv + .byte4 procMove__Q53scn4step4hero4whip17StateWhipSlamDownFv + .byte4 procConstraint__Q53scn4step4hero4whip17StateWhipSlamDownFv + .byte4 procFixPos__Q53scn4step4hero4whip17StateWhipSlamDownFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipSlamFront.s b/asm/src/StateWhipSlamFront.s index cb35a716..189c3975 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 - .4byte 0x8038C528 - .4byte 0x8038C50C + .byte4 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipSlamFront$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipSlamFront$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip18StateWhipSlamFront __vt__Q53scn4step4hero4whip18StateWhipSlamFront: .4byte 0 .4byte 0 - .4byte 0x8038C3EC - .4byte 0x8038C464 - .4byte 0x8038C500 - .4byte 0x8038C504 - .4byte 0x8038C508 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4whip18StateWhipSlamFrontFv + .byte4 procAnim__Q53scn4step4hero4whip18StateWhipSlamFrontFv + .byte4 procMove__Q53scn4step4hero4whip18StateWhipSlamFrontFv + .byte4 procConstraint__Q53scn4step4hero4whip18StateWhipSlamFrontFv + .byte4 procFixPos__Q53scn4step4hero4whip18StateWhipSlamFrontFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhipSlamUp.s b/asm/src/StateWhipSlamUp.s index 600fce24..6ab0d66d 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 - .4byte 0x8038C798 - .4byte 0x8038C77C + .byte4 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipSlamUp$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipSlamUp$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q53scn4step4hero4whip15StateWhipSlamUp __vt__Q53scn4step4hero4whip15StateWhipSlamUp: .4byte 0 .4byte 0 - .4byte 0x8038C65C - .4byte 0x8038C6D4 - .4byte 0x8038C770 - .4byte 0x8038C774 - .4byte 0x8038C778 - .4byte 0x80355514 - .4byte 0x80355518 + .byte4 __dt__Q53scn4step4hero4whip15StateWhipSlamUpFv + .byte4 procAnim__Q53scn4step4hero4whip15StateWhipSlamUpFv + .byte4 procMove__Q53scn4step4hero4whip15StateWhipSlamUpFv + .byte4 procConstraint__Q53scn4step4hero4whip15StateWhipSlamUpFv + .byte4 procFixPos__Q53scn4step4hero4whip15StateWhipSlamUpFv + .byte4 procObjCollReact__Q43scn4step4hero9StateBaseFv + .byte4 procEnd__Q43scn4step4hero9StateBaseFv .4byte 0 diff --git a/asm/src/StateWhispyAppear.s b/asm/src/StateWhispyAppear.s index 88402469..3de65a97 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 - .4byte 0x802A052C ;# ptr - .4byte 0x802A05A8 ;# ptr - .4byte 0x802A06C8 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802A0844 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy10brontoburt17StateWhispyAppearFv + .byte4 procAnim__Q53scn4step5enemy10brontoburt17StateWhispyAppearFv + .byte4 procMove__Q53scn4step5enemy10brontoburt17StateWhispyAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy10brontoburt17StateWhispyAppearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802B9DB0 ;# ptr - .4byte 0x802B9D8C ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy5gordo17StateWhispyAppear __vt__Q53scn4step5enemy5gordo17StateWhispyAppear: .4byte 0 .4byte 0 - .4byte 0x802B9BFC ;# ptr - .4byte 0x802B9C78 ;# ptr - .4byte 0x802B9D84 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802B9D88 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy5gordo17StateWhispyAppearFv + .byte4 procAnim__Q53scn4step5enemy5gordo17StateWhispyAppearFv + .byte4 procMove__Q53scn4step5enemy5gordo17StateWhispyAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy5gordo17StateWhispyAppearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy17StateWhispyAppear __vt__Q53scn4step5enemy6scarfy17StateWhispyAppear: .4byte 0 .4byte 0 - .4byte 0x802DB6C0 ;# ptr - .4byte 0x802DB73C ;# ptr - .4byte 0x802DB8B4 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802DBA14 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy6scarfy17StateWhispyAppearFv + .byte4 procAnim__Q53scn4step5enemy6scarfy17StateWhispyAppearFv + .byte4 procMove__Q53scn4step5enemy6scarfy17StateWhispyAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy6scarfy17StateWhispyAppearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateWhispyFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateWhispyFall$$4PQ43scn4step5enemy5Enemy$$1: .4byte 0 .4byte 0 - .4byte 0x802EEFB0 ;# ptr - .4byte 0x802EEF94 ;# ptr + .byte4 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateWhispyFall$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateWhispyFall$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee17StateWhispyAppear __vt__Q53scn4step5enemy9waddledee17StateWhispyAppear: .4byte 0 .4byte 0 - .4byte 0x802EED78 ;# ptr - .4byte 0x802EEDF4 ;# ptr - .4byte 0x802EEEA0 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EEF90 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledee17StateWhispyAppearFv + .byte4 procAnim__Q53scn4step5enemy9waddledee17StateWhispyAppearFv + .byte4 procMove__Q53scn4step5enemy9waddledee17StateWhispyAppearFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9waddledee17StateWhispyAppearFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255825 diff --git a/asm/src/StateWhispyFall.s b/asm/src/StateWhispyFall.s index 7a609a04..e0c7eeba 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 - .4byte 0x802EF240 ;# ptr - .4byte 0x802EF224 ;# ptr + .byte4 __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee18StateWhispyLanding$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee18StateWhispyLanding$$4PQ43scn4step5enemy5Enemy$$1Fv .global __vt__Q53scn4step5enemy9waddledee15StateWhispyFall __vt__Q53scn4step5enemy9waddledee15StateWhispyFall: .4byte 0 .4byte 0 - .4byte 0x802EF01C ;# ptr - .4byte 0x802EF094 ;# ptr - .4byte 0x802EF114 ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EF180 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledee15StateWhispyFallFv + .byte4 procAnim__Q53scn4step5enemy9waddledee15StateWhispyFallFv + .byte4 procMove__Q53scn4step5enemy9waddledee15StateWhispyFallFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9waddledee15StateWhispyFallFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256580 diff --git a/asm/src/StateWhispyLanding.s b/asm/src/StateWhispyLanding.s index 76ef27e6..ae39ecc9 100644 --- a/asm/src/StateWhispyLanding.s +++ b/asm/src/StateWhispyLanding.s @@ -53,9 +53,9 @@ procFixPos__Q53scn4step5enemy9waddledee18StateWhispyLandingFv: __vt__Q53scn4step5enemy9waddledee18StateWhispyLanding: .4byte 0 .4byte 0 - .4byte 0x802EF2B4 ;# ptr - .4byte 0x802EF2B8 ;# ptr - .4byte 0x802EF2BC ;# ptr - .4byte 0x8028DDE0 ;# ptr - .4byte 0x802EF2C0 ;# ptr - .4byte 0x8028DDE8 ;# ptr + .byte4 __dt__Q53scn4step5enemy9waddledee18StateWhispyLandingFv + .byte4 procAnim__Q53scn4step5enemy9waddledee18StateWhispyLandingFv + .byte4 procMove__Q53scn4step5enemy9waddledee18StateWhispyLandingFv + .byte4 procConstraint__Q43scn4step5enemy9StateBaseFv + .byte4 procFixPos__Q53scn4step5enemy9waddledee18StateWhispyLandingFv + .byte4 procObjCollReact__Q43scn4step5enemy9StateBaseFv diff --git a/asm/src/StateWin.s b/asm/src/StateWin.s index 9ef74037..d1bc3d80 100644 --- a/asm/src/StateWin.s +++ b/asm/src/StateWin.s @@ -115,9 +115,9 @@ procFixPos__Q53scn4step4boss15challengemaster8StateWinFv: __vt__Q53scn4step4boss15challengemaster8StateWin: .4byte 0 .4byte 0 - .4byte 0x802436F4 ;# ptr - .4byte 0x802436F8 ;# ptr - .4byte 0x80243768 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x8024376C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster8StateWinFv + .byte4 procAnim__Q53scn4step4boss15challengemaster8StateWinFv + .byte4 procMove__Q53scn4step4boss15challengemaster8StateWinFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster8StateWinFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv diff --git a/asm/src/StateWinFly.s b/asm/src/StateWinFly.s index 53f4e4be..f7950829 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 - .4byte 0x80243B6C ;# ptr - .4byte 0x80243B50 ;# ptr + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateWin$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateWin$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q53scn4step4boss15challengemaster11StateWinFly __vt__Q53scn4step4boss15challengemaster11StateWinFly: .4byte 0 .4byte 0 - .4byte 0x802438D8 ;# ptr - .4byte 0x802438DC ;# ptr - .4byte 0x802439D8 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80243B4C ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster11StateWinFlyFv + .byte4 procAnim__Q53scn4step4boss15challengemaster11StateWinFlyFv + .byte4 procMove__Q53scn4step4boss15challengemaster11StateWinFlyFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster11StateWinFlyFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256210 diff --git a/asm/src/StateWorrisome.s b/asm/src/StateWorrisome.s index bef84cc8..2c794e47 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 - .4byte 0x802442F4 ;# ptr - .4byte 0x802442B0 ;# ptr + .byte4 __dt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss15challengemaster8StateFly12TurnWaitType$$1Fv + .byte4 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 - .4byte 0x802442F0 ;# ptr - .4byte 0x802442D0 ;# ptr + .byte4 __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateWorrisome$$4PQ43scn4step4boss4Boss$$4f$$1Fv + .byte4 create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateWorrisome$$4PQ43scn4step4boss4Boss$$4f$$1Fv .global __vt__Q53scn4step4boss15challengemaster14StateWorrisome __vt__Q53scn4step4boss15challengemaster14StateWorrisome: .4byte 0 .4byte 0 - .4byte 0x80243D68 ;# ptr - .4byte 0x80243E38 ;# ptr - .4byte 0x80243FB4 ;# ptr - .4byte 0x802344FC ;# ptr - .4byte 0x80243FB8 ;# ptr - .4byte 0x80234504 ;# ptr + .byte4 __dt__Q53scn4step4boss15challengemaster14StateWorrisomeFv + .byte4 procAnim__Q53scn4step4boss15challengemaster14StateWorrisomeFv + .byte4 procMove__Q53scn4step4boss15challengemaster14StateWorrisomeFv + .byte4 procConstraint__Q43scn4step4boss9StateBaseFv + .byte4 procFixPos__Q53scn4step4boss15challengemaster14StateWorrisomeFv + .byte4 procObjCollReact__Q43scn4step4boss9StateBaseFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256482 diff --git a/asm/src/StdResponder.s b/asm/src/StdResponder.s index 3f4a1a02..1554b9e7 100644 --- a/asm/src/StdResponder.s +++ b/asm/src/StdResponder.s @@ -223,7 +223,7 @@ lbl_801BD1F0: __vt__Q35mcoll6detail12StdResponder: .4byte 0 .4byte 0 - .4byte 0x801B1574 ;# ptr - .4byte 0x801BCFB4 ;# ptr - .4byte 0x801BD080 ;# ptr - .4byte 0x801BD0AC ;# ptr + .byte4 __dt__Q35mcoll6detail12StdResponderFv + .byte4 onDetectStarted__Q35mcoll6detail12StdResponderFRCQ35mcoll6detail6IActorRCQ33hel4math7Vector2 + .byte4 onDetectFinished__Q35mcoll6detail12StdResponderFRCQ35mcoll6detail6IActorRCQ35mcoll6detail9ActorInfo + .byte4 onCollide__Q35mcoll6detail12StdResponderFRCQ35mcoll6detail6IActorRCQ35mcoll6detail12CollidedInfo diff --git a/asm/src/Stepping.s b/asm/src/Stepping.s index cda09669..46962dcd 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 - .4byte 0x80355C7C - .4byte 0x80355C60 + .byte4 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateSuperJump$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 475b1b6c..01df93c9 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 - .4byte 0x80391B58 - .4byte 0x80391B38 + .byte4 __dt__Q24util156StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone14StateStartJump$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv + .byte4 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 55fea336..f388abdc 100644 --- a/asm/src/Stop.s +++ b/asm/src/Stop.s @@ -857,11 +857,11 @@ lbl_803CFCE4: __vt__Q43scn4step7gimmick4Stop: .4byte 0 .4byte 0 - .4byte 0x802F7388 - .4byte 0x802F7708 - .4byte 0x802F77C0 - .4byte 0x802F7838 - .4byte 0x802F7930 + .byte4 __dt__Q43scn4step7gimmick4StopFv + .byte4 onStopNormalStarted__Q43scn4step7gimmick4StopFRCQ25ostop5Actor + .byte4 onStopNormalFinished__Q43scn4step7gimmick4StopFRCQ25ostop5Actor + .byte4 onStopPowerfulStarted__Q43scn4step7gimmick4StopFRCQ25ostop5Actor + .byte4 onStopPowerfulFinished__Q43scn4step7gimmick4StopFRCQ25ostop5Actor .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -869,9 +869,9 @@ __vt__Q43scn4step7gimmick4Stop: __vt__Q43scn4step3sfx4Stop: .4byte 0 .4byte 0 - .4byte 0x803CF958 - .4byte 0x803CFB20 - .4byte 0x803CFB8C - .4byte 0x803CFC04 - .4byte 0x803CFCAC + .byte4 __dt__Q43scn4step3sfx4StopFv + .byte4 onStopNormalStarted__Q43scn4step3sfx4StopFRCQ25ostop5Actor + .byte4 onStopNormalFinished__Q43scn4step3sfx4StopFRCQ25ostop5Actor + .byte4 onStopPowerfulStarted__Q43scn4step3sfx4StopFRCQ25ostop5Actor + .byte4 onStopPowerfulFinished__Q43scn4step3sfx4StopFRCQ25ostop5Actor .4byte 0 diff --git a/asm/src/SuperBackPicture.s b/asm/src/SuperBackPicture.s index a9d8401a..573f7c0f 100644 --- a/asm/src/SuperBackPicture.s +++ b/asm/src/SuperBackPicture.s @@ -805,11 +805,11 @@ $$253741: __vt__Q43scn4step3sfx16SuperBackPicture: .4byte 0 .4byte 0 - .4byte 0x803CFF94 - .4byte 0x803D0798 - .4byte 0x803D079C - .4byte 0x803D07A0 - .4byte 0x803D07D8 + .byte4 __dt__Q43scn4step3sfx16SuperBackPictureFv + .byte4 onStopNormalStarted__Q43scn4step3sfx16SuperBackPictureFRCQ25ostop5Actor + .byte4 onStopNormalFinished__Q43scn4step3sfx16SuperBackPictureFRCQ25ostop5Actor + .byte4 onStopPowerfulStarted__Q43scn4step3sfx16SuperBackPictureFRCQ25ostop5Actor + .byte4 onStopPowerfulFinished__Q43scn4step3sfx16SuperBackPictureFRCQ25ostop5Actor .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/SuperStop.s b/asm/src/SuperStop.s index 7f602082..bafb7aa7 100644 --- a/asm/src/SuperStop.s +++ b/asm/src/SuperStop.s @@ -673,9 +673,9 @@ lbl_803D8FF0: __vt__Q43scn4step4boss9SuperStop: .4byte 0 .4byte 0 - .4byte 0x802346A8 ;# ptr - .4byte 0x80234728 ;# ptr - .4byte 0x80234770 ;# ptr + .byte4 __dt__Q43scn4step4boss9SuperStopFv + .byte4 onSuperStopStarted__Q43scn4step4boss9SuperStopFRCQ43scn4step6spstop7Manager + .byte4 onSuperStopFinished__Q43scn4step4boss9SuperStopFRCQ43scn4step6spstop7Manager .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -683,9 +683,9 @@ __vt__Q43scn4step4boss9SuperStop: __vt__Q43scn4step5enemy9SuperStop: .4byte 0 .4byte 0 - .4byte 0x8028DFAC ;# ptr - .4byte 0x8028E080 ;# ptr - .4byte 0x8028E08C ;# ptr + .byte4 __dt__Q43scn4step5enemy9SuperStopFv + .byte4 onSuperStopStarted__Q43scn4step5enemy9SuperStopFRCQ43scn4step6spstop7Manager + .byte4 onSuperStopFinished__Q43scn4step5enemy9SuperStopFRCQ43scn4step6spstop7Manager .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -693,9 +693,9 @@ __vt__Q43scn4step5enemy9SuperStop: __vt__Q43scn4step7gimmick9SuperStop: .4byte 0 .4byte 0 - .4byte 0x802F7A24 - .4byte 0x802F7B68 - .4byte 0x802F7B74 + .byte4 __dt__Q43scn4step7gimmick9SuperStopFv + .byte4 onSuperStopStarted__Q43scn4step7gimmick9SuperStopFRCQ43scn4step6spstop7Manager + .byte4 onSuperStopFinished__Q43scn4step7gimmick9SuperStopFRCQ43scn4step6spstop7Manager .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -703,9 +703,9 @@ __vt__Q43scn4step7gimmick9SuperStop: __vt__Q43scn4step4item9SuperStop: .4byte 0 .4byte 0 - .4byte 0x803C530C - .4byte 0x803C538C - .4byte 0x803C53E8 + .byte4 __dt__Q43scn4step4item9SuperStopFv + .byte4 onSuperStopStarted__Q43scn4step4item9SuperStopFRCQ43scn4step6spstop7Manager + .byte4 onSuperStopFinished__Q43scn4step4item9SuperStopFRCQ43scn4step6spstop7Manager .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -713,7 +713,7 @@ __vt__Q43scn4step4item9SuperStop: __vt__Q43scn4step6weapon9SuperStop: .4byte 0 .4byte 0 - .4byte 0x803D8E80 - .4byte 0x803D8F60 - .4byte 0x803D8FBC + .byte4 __dt__Q43scn4step6weapon9SuperStopFv + .byte4 onSuperStopStarted__Q43scn4step6weapon9SuperStopFRCQ43scn4step6spstop7Manager + .byte4 onSuperStopFinished__Q43scn4step6weapon9SuperStopFRCQ43scn4step6spstop7Manager .4byte 0 diff --git a/asm/src/Switch.s b/asm/src/Switch.s index 00756ee7..9cd35272 100644 --- a/asm/src/Switch.s +++ b/asm/src/Switch.s @@ -952,13 +952,13 @@ $$255943: __vt__Q53scn4step7gimmick8switch_n6Switch: .4byte 0 .4byte 0 - .4byte 0x80327854 - .4byte 0x80327B50 - .4byte 0x80327B5C - .4byte 0x80327B54 - .4byte 0x80327B58 - .4byte 0x80327B60 - .4byte 0x80327B64 + .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 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255903 diff --git a/asm/src/SwitchOnce.s b/asm/src/SwitchOnce.s index 633157ab..ccc27aa3 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 - .4byte 0x803282A0 - .4byte 0x803282FC - .4byte 0x80328300 - .4byte 0x80328304 - .4byte 0x80328308 - .4byte 0x80327B60 - .4byte 0x80327B64 + .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 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/SwitchReceiver.s b/asm/src/SwitchReceiver.s index 38032c24..30296c6f 100644 --- a/asm/src/SwitchReceiver.s +++ b/asm/src/SwitchReceiver.s @@ -115,9 +115,9 @@ onSwitchOn__Q43scn4step7gimmick14SwitchReceiverFv: __vt__Q43scn4step7gimmick14SwitchReceiver: .4byte 0 .4byte 0 - .4byte 0x802F7C78 - .4byte 0x802F7D00 - .4byte 0x802F7CFC - .4byte 0x802F7CF8 - .4byte 0x802F7CF4 - .4byte 0x802F7CF0 + .byte4 __dt__Q43scn4step7gimmick14SwitchReceiverFv + .byte4 onSwitchOn__Q43scn4step7gimmick14SwitchReceiverFv + .byte4 onSwitchOff__Q43scn4step7gimmick14SwitchReceiverFv + .byte4 onSwitchToggle__Q43scn4step7gimmick14SwitchReceiverFv + .byte4 onSwitchOnFromSuperBeamSwitch__Q43scn4step7gimmick14SwitchReceiverFv + .byte4 checkDemoPos__Q43scn4step7gimmick14SwitchReceiverCFRQ33hel4math7Vector2 diff --git a/asm/src/SwitchReturn.s b/asm/src/SwitchReturn.s index 37d148dd..0bd0d2c7 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 - .4byte 0x80328368 - .4byte 0x8032836C - .4byte 0x80328370 - .4byte 0x80328468 - .4byte 0x8032849C - .4byte 0x803284D0 - .4byte 0x803284D4 + .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 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/SwitchToggle.s b/asm/src/SwitchToggle.s index ec31ff94..886df322 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 - .4byte 0x80328548 - .4byte 0x8032854C - .4byte 0x80328550 - .4byte 0x80328640 - .4byte 0x80328644 - .4byte 0x80327B60 - .4byte 0x80328648 + .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 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/Sword.s b/asm/src/Sword.s index dc9414f2..ca07804d 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: - .4byte 0x8055B2B0 + .byte4 $$249586 .4byte 0 - .4byte 0x8048B4B0 + .byte4 $$249587 .4byte 0 - .4byte 0x8048B4C4 + .byte4 $$249588 .4byte 0 - .4byte 0x8048B4D0 + .byte4 $$249589 .4byte 0 - .4byte 0x8048B4E0 + .byte4 $$249590 .4byte 0 - .4byte 0x8055B2B8 + .byte4 $$249591 .4byte 0 - .4byte 0x8048B4EC + .byte4 $$249592 .4byte 0 - .4byte 0x8048B4F8 + .byte4 $$249593 .4byte 0 - .4byte 0x8048B50C + .byte4 $$249594 .4byte 0 - .4byte 0x8048B518 + .byte4 $$249595 .4byte 0 - .4byte 0x8048B52C + .byte4 $$249596 .4byte 0 - .4byte 0x8055B2C0 + .byte4 $$249597 .4byte 0 - .4byte 0x8048B53C + .byte4 $$249598 .4byte 0 - .4byte 0x8048B548 + .byte4 $$249599 .4byte 0 - .4byte 0x8048B55C + .byte4 $$249600 .4byte 0 - .4byte 0x8048B574 + .byte4 $$249601 .4byte 0 - .4byte 0x8048B584 + .byte4 $$249602 .4byte 0 - .4byte 0x8048B59C + .byte4 $$249603 .4byte 0 - .4byte 0x8048B5A8 + .byte4 $$249604 .4byte 0 - .4byte 0x8048B5B8 + .byte4 $$249605 .4byte 0 - .4byte 0x8048B5C4 + .byte4 $$249606 .4byte 0 - .4byte 0x8055B2C8 + .byte4 $$249607 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -669,27 +669,27 @@ $$256366: __vt__Q53scn4step4hero5sword5Sword: .4byte 0 .4byte 0 - .4byte 0x80389D00 - .4byte 0x80389D8C - .4byte 0x8032B7A0 - .4byte 0x8032B7A4 - .4byte 0x8032B7A8 - .4byte 0x80389EB8 - .4byte 0x80389FD4 - .4byte 0x8032B7B4 - .4byte 0x8032B7B8 - .4byte 0x8032B7BC - .4byte 0x8032B7C0 - .4byte 0x8032B7C4 - .4byte 0x8032B7C8 - .4byte 0x8032B7CC - .4byte 0x8032B7D0 - .4byte 0x8032B7D4 - .4byte 0x8032B7D8 - .4byte 0x8032B7DC - .4byte 0x8032B7E0 - .4byte 0x8032B7E4 - .4byte 0x8032B7E8 + .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 .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: - .4byte 0x8055B298 - .4byte 0x8055B2A0 + .byte4 $$249578 + .byte4 $$249579 .global $$249586 $$249586: .asciz "Carry" diff --git a/asm/src/SystemTagProcessor.s b/asm/src/SystemTagProcessor.s index c6040519..6df9465d 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 - .4byte 0x801AC810 ;# ptr - .4byte 0x801AE550 ;# ptr - .4byte 0x801AFA44 ;# ptr + .byte4 __dt__Q23lyt18SystemTagProcessorFv + .byte4 Process__Q23lyt18SystemTagProcessorFUsPQ34nw4r2ut15PrintContext$$0w$$1 + .byte4 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 13e85dd5..1ca30421 100644 --- a/asm/src/TPLTexture.s +++ b/asm/src/TPLTexture.s @@ -79,9 +79,9 @@ lbl_80196FFC: __vt__Q23gfx10TPLTexture: .4byte 0 .4byte 0 - .4byte 0x80195854 ;# ptr + .byte4 __dt__Q23gfx10TPLTextureFv .global __vt__Q23gfx10TextureObj __vt__Q23gfx10TextureObj: .4byte 0 .4byte 0 - .4byte 0x801958C0 ;# ptr + .byte4 __dt__Q23gfx10TextureObjFv diff --git a/asm/src/Table.s b/asm/src/Table.s index 7e441cf3..0feb7440 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: - .4byte 0x8045EF38 - .4byte 0x8045EF48 - .4byte 0x80557DD8 - .4byte 0x8045EF68 - .4byte 0x80557DE0 - .4byte 0x8045EF7C + .byte4 $$248738 + .byte4 $$248739 + .byte4 $$248740 + .byte4 $$248741 + .byte4 $$248742 + .byte4 $$248743 .global T_PTCL_INFOS__Q43scn15challengeresult6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn15challengeresult6effect19$$2unnamed$$2Table_cpp$$2: - .4byte 0x80557DF0 - .4byte 0x8045F028 - .4byte 0x80557DF0 - .4byte 0x8045F038 + .byte4 $$248738 + .byte4 $$248739 + .byte4 $$248738 + .byte4 $$248740 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PTCL_INFOS__Q43scn7history6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn7history6effect19$$2unnamed$$2Table_cpp$$2: - .4byte 0x80558D28 - .4byte 0x804635A0 - .4byte 0x80558D30 - .4byte 0x804635B8 - .4byte 0x804635CC - .4byte 0x804635D8 + .byte4 $$248738 + .byte4 $$248739 + .byte4 $$248740 + .byte4 $$248741 + .byte4 $$248742 + .byte4 $$248743 .section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PTCL_INFOS__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2: - .4byte 0x8046F564 - .4byte 0x8046F570 - .4byte 0x8046F584 - .4byte 0x8046F590 - .4byte 0x805594C8 - .4byte 0x8046F5A8 - .4byte 0x805594D0 - .4byte 0x8046F5B8 - .4byte 0x805594D8 - .4byte 0x8046F5C8 - .4byte 0x805594E0 - .4byte 0x8046F5DC - .4byte 0x8046F5F0 - .4byte 0x8046F600 - .4byte 0x805594E8 - .4byte 0x8046F61C - .4byte 0x8046F630 - .4byte 0x8046F63C - .4byte 0x805594F0 - .4byte 0x8046F654 - .4byte 0x805594F8 - .4byte 0x8046F668 - .4byte 0x80559500 - .4byte 0x8046F67C - .4byte 0x80559508 - .4byte 0x8046F690 - .4byte 0x80559510 - .4byte 0x8046F6A4 - .4byte 0x8046F6B4 - .4byte 0x8046F6C0 - .4byte 0x80559518 - .4byte 0x8046F6D8 - .4byte 0x80559520 - .4byte 0x8046F6F0 - .4byte 0x80559528 - .4byte 0x8046F700 - .4byte 0x80559530 - .4byte 0x8046F714 - .4byte 0x8046F728 - .4byte 0x8046F734 - .4byte 0x80559538 - .4byte 0x8046F74C - .4byte 0x8046F760 - .4byte 0x8046F774 - .4byte 0x8046F790 - .4byte 0x8046F79C - .4byte 0x8046F7B4 - .4byte 0x8046F7C0 - .4byte 0x8046F7D4 - .4byte 0x8046F7E0 - .4byte 0x8046F7F8 - .4byte 0x8046F804 - .4byte 0x80559540 - .4byte 0x8046F81C - .4byte 0x80559548 - .4byte 0x8046F830 - .4byte 0x8055954C - .4byte 0x8046F840 - .4byte 0x80559554 - .4byte 0x8046F850 - .4byte 0x8055955C - .4byte 0x8046F860 - .4byte 0x80559564 - .4byte 0x8046F870 - .4byte 0x8046F884 - .4byte 0x8046F890 - .4byte 0x8055956C - .4byte 0x8046F8A8 - .4byte 0x80559578 - .4byte 0x8046F8B8 - .4byte 0x8046F8CC - .4byte 0x8046F8D8 - .4byte 0x80559580 - .4byte 0x8046F8F0 - .4byte 0x80559588 - .4byte 0x8046F904 - .4byte 0x80559590 - .4byte 0x8046F918 - .4byte 0x80559598 - .4byte 0x8046F92C - .4byte 0x8046F940 - .4byte 0x8046F94C - .4byte 0x805595A0 - .4byte 0x8046F968 - .4byte 0x805595A8 - .4byte 0x8046F978 - .4byte 0x805595B0 - .4byte 0x8046F98C - .4byte 0x805595B8 - .4byte 0x8046F9A0 - .4byte 0x805595C0 - .4byte 0x8046F9B4 - .4byte 0x805595C8 - .4byte 0x8046F9C8 - .4byte 0x805595D0 - .4byte 0x8046F9DC - .4byte 0x805595D4 - .4byte 0x8046F9EC - .4byte 0x805595E0 - .4byte 0x8046FA00 - .4byte 0x805595E8 - .4byte 0x8046FA14 - .4byte 0x805595F0 - .4byte 0x8046FA28 - .4byte 0x805595F8 - .4byte 0x8046FA40 - .4byte 0x80559600 - .4byte 0x8046FA50 - .4byte 0x80559608 - .4byte 0x8046FA68 - .4byte 0x80559610 - .4byte 0x8046FA78 - .4byte 0x8046FA8C - .4byte 0x8046FA98 - .4byte 0x8046FAB0 - .4byte 0x8046FABC - .4byte 0x80559618 - .4byte 0x8046FAD0 + .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 .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: - .4byte 0x8046FAE4 - .4byte 0x8046FB00 - .4byte 0x8046FB24 - .4byte 0x8046FB48 - .4byte 0x8046FB68 - .4byte 0x8046FB88 - .4byte 0x8046FBB0 - .4byte 0x8046FBD0 - .4byte 0x8046FBF0 - .4byte 0x8046FC0C - .4byte 0x8046FC30 - .4byte 0x8046FC50 - .4byte 0x8046FC74 - .4byte 0x8046FC94 - .4byte 0x8046FCB0 - .4byte 0x8046FCCC - .4byte 0x8046FCE8 - .4byte 0x8046FD04 - .4byte 0x8046FD24 - .4byte 0x8046FD40 - .4byte 0x8046FD5C - .4byte 0x8046FD7C - .4byte 0x8046FD9C - .4byte 0x8046FDC4 - .4byte 0x8046FDF0 - .4byte 0x8046FE14 - .4byte 0x8046FE34 - .4byte 0x8046FE54 - .4byte 0x8046FE74 - .4byte 0x8046FE94 - .4byte 0x8046FEB4 - .4byte 0x8046FED0 - .4byte 0x8046FEF0 - .4byte 0x8046FF10 - .4byte 0x8046FF34 - .4byte 0x8046FF54 - .4byte 0x8046FF74 - .4byte 0x8046FF90 - .4byte 0x8046FFAC - .4byte 0x8046FFCC - .4byte 0x8046FFF0 - .4byte 0x80470014 - .4byte 0x80470034 - .4byte 0x80470050 - .4byte 0x8047006C - .4byte 0x80470084 - .4byte 0x804700A4 - .4byte 0x804700BC - .4byte 0x804700E0 - .4byte 0x804700F8 - .4byte 0x80470118 + .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 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: - .4byte 0x80460B60 - .4byte 0x80460B78 + .byte4 $$248741 + .byte4 $$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: - .4byte 0x804635F0 - .4byte 0x8046360C + .byte4 $$248745 + .byte4 $$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: - .4byte 0x8045E968 - .4byte 0x8045E974 + .byte4 $$248738 + .byte4 $$248739 .global $$248833 $$248833: .4byte 0x00000001 .global lbl_8055FD9C lbl_8055FD9C: - .4byte 0x80545EE0 + .byte4 $$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: - .4byte 0x805461D0 + .byte4 $$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: - .4byte 0x805462B8 + .byte4 $$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: - .4byte 0x80460B38 - .4byte 0x80460B48 + .byte4 $$248738 + .byte4 $$248739 .global $$248870 $$248870: .4byte 0x00000010 .global lbl_80560004 lbl_80560004: - .4byte 0x805463E0 + .byte4 $$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: - .4byte 0x80546978 + .byte4 $$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: - .4byte 0x80547610 + .byte4 $$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: - .4byte 0x804956F0 - .4byte 0x804956FC + .byte4 $$248738 + .byte4 $$248739 .global $$248839 $$248839: .4byte 0x00000002 .global lbl_8056423C lbl_8056423C: - .4byte 0x80556398 + .byte4 $$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 e73fa410..7773bc45 100644 --- a/asm/src/TagProcessor.s +++ b/asm/src/TagProcessor.s @@ -125,7 +125,7 @@ setUseButtonPushedChar__Q23lyt12TagProcessorFb: __vt__Q23lyt12TagProcessor: .4byte 0 .4byte 0 - .4byte 0x801AC73C ;# ptr - .4byte 0x801AFC70 ;# ptr - .4byte 0x801AFD08 ;# ptr + .byte4 __dt__Q23lyt12TagProcessorFv + .byte4 Process__Q23lyt12TagProcessorFUsPQ34nw4r2ut15PrintContext$$0w$$1 + .byte4 CalcRect__Q23lyt12TagProcessorFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext$$0w$$1 .4byte 0 diff --git a/asm/src/TagUtil.s b/asm/src/TagUtil.s index cbd2e11f..c994715c 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 - .4byte 0x801B0104 ;# ptr - .4byte 0x801B00F4 ;# ptr - .4byte 0x801B00C0 ;# ptr + .byte4 onStartTag__Q33lyt7TagUtil25Iterator$48859TagUtil_cppFPCwUlUsUsUsPUc + .byte4 onEndTag__Q33lyt7TagUtil25Iterator$48859TagUtil_cppFPCwUlUsUs + .byte4 onNormalChar__Q33lyt7TagUtil25Iterator$48859TagUtil_cppFw .global __vt__Q33lyt7TagUtil25Iterator$48809TagUtil_cpp __vt__Q33lyt7TagUtil25Iterator$48809TagUtil_cpp: .4byte 0 .4byte 0 - .4byte 0x801B0128 ;# ptr - .4byte 0x801B0118 ;# ptr - .4byte 0x801B0108 ;# ptr + .byte4 onStartTag__Q33lyt7TagUtil25Iterator$48809TagUtil_cppFPCwUlUsUsUsPUc + .byte4 onEndTag__Q33lyt7TagUtil25Iterator$48809TagUtil_cppFPCwUlUsUs + .byte4 onNormalChar__Q33lyt7TagUtil25Iterator$48809TagUtil_cppFw diff --git a/asm/src/TalkManager.s b/asm/src/TalkManager.s index d0b38a1e..bf3d3343 100644 --- a/asm/src/TalkManager.s +++ b/asm/src/TalkManager.s @@ -201,7 +201,7 @@ $$252114: .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252115 $$252115: - .4byte 0x8047EFB0 + .byte4 $$252113 .global lbl_805625DC lbl_805625DC: - .4byte 0x8047EFCC + .byte4 $$252114 diff --git a/asm/src/TargetScorePanel.s b/asm/src/TargetScorePanel.s index 5caa5ab1..d2f46662 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: - .4byte 0x80491B70 - .4byte 0x80491B80 - .4byte 0x80491B90 - .4byte 0x80491BA0 - .4byte 0x80491BB0 + .byte4 $$251701 + .byte4 $$251702 + .byte4 $$251703 + .byte4 $$251704 + .byte4 $$251705 .4byte 0 .global $$252072 $$252072: - .4byte 0x80491BE0 - .4byte 0x80491BF4 - .4byte 0x80491C08 - .4byte 0x80491C18 + .byte4 $$252068 + .byte4 $$252069 + .byte4 $$252070 + .byte4 $$252071 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$251701 diff --git a/asm/src/Text.s b/asm/src/Text.s index 4c5b7803..76154fa5 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 - .4byte 0x80558D10 + .byte4 $$251849 .4byte 0x00000001 - .4byte 0x804631B0 + .byte4 $$251850 .4byte 0x00000001 - .4byte 0x804631C0 + .byte4 $$251851 .4byte 0x00000001 - .4byte 0x804631D8 + .byte4 $$251852 .4byte 0 - .4byte 0x80558D10 + .byte4 $$251849 .4byte 0x00000001 - .4byte 0x804631F0 + .byte4 $$251853 .4byte 0x00000001 - .4byte 0x80463204 + .byte4 $$251854 .4byte 0x00000001 - .4byte 0x80463218 + .byte4 $$251855 .4byte 0x00000001 - .4byte 0x80463228 + .byte4 $$251856 .4byte 0x00000001 - .4byte 0x80463240 + .byte4 $$251857 .4byte 0x00000001 - .4byte 0x80463254 + .byte4 $$251858 .4byte 0x00000001 - .4byte 0x80463270 + .byte4 $$251859 .4byte 0 - .4byte 0x80558D10 + .byte4 $$251849 .4byte 0 - .4byte 0x80558D10 + .byte4 $$251849 .4byte 0x00000001 - .4byte 0x80463280 + .byte4 $$251860 .4byte 0x00000001 - .4byte 0x80463294 + .byte4 $$251861 .4byte 0x00000001 - .4byte 0x804632AC + .byte4 $$251862 .4byte 0x00000001 - .4byte 0x804632C8 + .byte4 $$251863 .4byte 0x00000001 - .4byte 0x804632E0 + .byte4 $$251864 .4byte 0x00000001 - .4byte 0x804632F8 + .byte4 $$251865 .4byte 0x00000001 - .4byte 0x80463310 + .byte4 $$251866 .4byte 0x00000001 - .4byte 0x80463324 + .byte4 $$251867 .4byte 0 - .4byte 0x80558D10 + .byte4 $$251849 .4byte 0x00000001 - .4byte 0x8046333C + .byte4 $$251868 .4byte 0 - .4byte 0x80558D10 + .byte4 $$251849 .4byte 0x00000001 - .4byte 0x80463350 + .byte4 $$251869 .4byte 0x00000001 - .4byte 0x80463368 + .byte4 $$251870 .4byte 0x00000001 - .4byte 0x80463384 + .byte4 $$251871 .4byte 0x00000001 - .4byte 0x80463398 + .byte4 $$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: - .4byte 0x80558C08 - .4byte 0x80558C10 - .4byte 0x80558C18 - .4byte 0x80558C1C - .4byte 0x80558C20 - .4byte 0x80558C24 - .4byte 0x80558C30 - .4byte 0x80558C38 - .4byte 0x80462FE8 - .4byte 0x80462FF4 - .4byte 0x80558C40 - .4byte 0x80558C48 - .4byte 0x80463000 - .4byte 0x80558C50 - .4byte 0x80558C58 - .4byte 0x80558C60 - .4byte 0x8046300C - .4byte 0x80463018 - .4byte 0x80558C68 - .4byte 0x80558C70 - .4byte 0x80463024 - .4byte 0x80558C78 - .4byte 0x80558C80 + .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 .global TABLE__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2 TABLE__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2: - .4byte 0x80558C88 - .4byte 0x80558C18 - .4byte 0x80558C30 - .4byte 0x80462FF4 - .4byte 0x80558C88 - .4byte 0x80558C38 - .4byte 0x80462FE8 - .4byte 0x80558C1C - .4byte 0x80558C10 - .4byte 0x80558C08 - .4byte 0x80558C40 - .4byte 0x80558C20 - .4byte 0x80558C88 - .4byte 0x80558C88 - .4byte 0x80558C24 - .4byte 0x80558C48 - .4byte 0x8046300C - .4byte 0x80558C78 - .4byte 0x80463000 - .4byte 0x80463018 - .4byte 0x80558C60 - .4byte 0x80558C68 - .4byte 0x80558C88 - .4byte 0x80558C58 - .4byte 0x80558C88 - .4byte 0x80558C70 - .4byte 0x80463024 - .4byte 0x80558C50 - .4byte 0x80558C80 + .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 .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: - .4byte 0x80558C88 - .4byte 0x80558C90 - .4byte 0x80558C94 - .4byte 0x80463100 - .4byte 0x80558C88 - .4byte 0x80558C9C - .4byte 0x8046310C - .4byte 0x80558CA4 - .4byte 0x80558CA8 - .4byte 0x80558CAC - .4byte 0x80558CB4 - .4byte 0x80558CBC - .4byte 0x80558C88 - .4byte 0x80558C88 - .4byte 0x80558CC0 - .4byte 0x80558CC4 - .4byte 0x80463118 - .4byte 0x80558CCC - .4byte 0x80463124 - .4byte 0x80558CD8 - .4byte 0x80558CE0 - .4byte 0x80558CE8 - .4byte 0x80558C88 - .4byte 0x80558CF0 - .4byte 0x80558C88 - .4byte 0x80558CF8 - .4byte 0x80463130 - .4byte 0x80558D00 - .4byte 0x80558D08 + .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 .global $$251850 $$251850: .asciz "CopyrightKirby1" diff --git a/asm/src/TimeString.s b/asm/src/TimeString.s index 8c75567f..d819fb15 100644 --- a/asm/src/TimeString.s +++ b/asm/src/TimeString.s @@ -229,9 +229,9 @@ $$249499: __vt__Q43scn15challengeresult4info10TimeString: .4byte 0 .4byte 0 - .4byte 0x801F5050 ;# ptr - .4byte 0x801F52A4 ;# ptr - .4byte 0x801F52A8 ;# ptr + .byte4 onStartTag__Q43scn15challengeresult4info10TimeStringFPCwUlUsUsUsPUc + .byte4 onEndTag__Q43scn15challengeresult4info10TimeStringFPCwUlUsUs + .byte4 onNormalChar__Q43scn15challengeresult4info10TimeStringFw .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/TitleInfo.s b/asm/src/TitleInfo.s index 9b2f0237..7c747636 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: - .4byte 0x8045EE88 + .byte4 $$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: - .4byte 0x80460A98 + .byte4 $$252919 .global $$253798 $$253798: .4byte 0x3F333333 diff --git a/asm/src/TotalScore.s b/asm/src/TotalScore.s index 4af3ad82..28449a23 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: - .4byte 0x805570D0 - .4byte 0x805570D0 - .4byte 0x805570D8 - .4byte 0x805570E0 - .4byte 0x805570E8 - .4byte 0x805570E8 + .byte4 $$251545 + .byte4 $$251545 + .byte4 $$251546 + .byte4 $$251547 + .byte4 $$251548 + .byte4 $$251548 .global $$252626 $$252626: .asciz "common/Main" diff --git a/asm/src/TotalScorePanel.s b/asm/src/TotalScorePanel.s index 5ef49e93..c6971cce 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: - .4byte 0x8055B6F8 - .4byte 0x8055B6FC - .4byte 0x8055B704 - .4byte 0x8055B70C - .4byte 0x80490058 - .4byte 0x8055B714 + .byte4 $$252161 + .byte4 $$252162 + .byte4 $$252163 + .byte4 $$252164 + .byte4 $$252165 + .byte4 $$252166 .global $$252187 $$252187: - .4byte 0x8055B6F8 - .4byte 0x80490064 - .4byte 0x80490070 - .4byte 0x8049007C - .4byte 0x80490088 - .4byte 0x80490098 + .byte4 $$252161 + .byte4 $$252182 + .byte4 $$252183 + .byte4 $$252184 + .byte4 $$252185 + .byte4 $$252186 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$252619 diff --git a/asm/src/Trophy.s b/asm/src/Trophy.s index 98c89aaa..e0bab527 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 - .4byte 0x801EA0B8 ;# ptr + .byte4 __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: - .4byte 0x8045E878 - .4byte 0x8045E878 - .4byte 0x8045E888 - .4byte 0x8045E898 - .4byte 0x8045E8A4 - .4byte 0x8045E8B4 + .byte4 $$252317 + .byte4 $$252317 + .byte4 $$252318 + .byte4 $$252319 + .byte4 $$252320 + .byte4 $$252321 .global $$253902 $$253902: .asciz "challengefileselect/Trophyanime" diff --git a/asm/src/UnitHeapMapUser.s b/asm/src/UnitHeapMapUser.s index 9d32c534..052f4ca1 100644 --- a/asm/src/UnitHeapMapUser.s +++ b/asm/src/UnitHeapMapUser.s @@ -197,16 +197,16 @@ drawFragmentBlocks__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ4 __vt__Q23mem15UnitHeapMapUser: .4byte 0 .4byte 0 - .4byte 0x801BEFB8 ;# ptr - .4byte 0x801BF7C0 ;# ptr - .4byte 0x801BF7D4 ;# ptr - .4byte 0x801BF7D8 ;# ptr - .4byte 0x801BF7EC ;# ptr - .4byte 0x801BF84C ;# ptr - .4byte 0x801BF8A0 ;# ptr - .4byte 0x801BF8DC ;# ptr - .4byte 0x801BF94C ;# ptr - .4byte 0x801BFA2C ;# ptr + .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 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249027 diff --git a/asm/src/UserTagProcessor.s b/asm/src/UserTagProcessor.s index 6db62907..0ffb0922 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: - .4byte 0x80457DE0 - .4byte 0x80557170 - .4byte 0x80457DEC - .4byte 0x80557174 - .4byte 0x80457DF8 - .4byte 0x80557178 - .4byte 0x80457E04 - .4byte 0x8055717C - .4byte 0x80457E10 - .4byte 0x80557180 - .4byte 0x80457E1C - .4byte 0x80557184 - .4byte 0x80457E2C - .4byte 0x80557188 - .4byte 0x80457E38 - .4byte 0x8055718C - .4byte 0x80457E48 - .4byte 0x80557190 - .4byte 0x80457E58 - .4byte 0x80557194 - .4byte 0x80557198 - .4byte 0x805571A0 - .4byte 0x805571A4 - .4byte 0x805571AC - .4byte 0x80457E68 - .4byte 0x805571B0 - .4byte 0x80457E7C - .4byte 0x805571B4 - .4byte 0x80457E90 - .4byte 0x805571B8 - .4byte 0x80457EA0 - .4byte 0x805571BC - .4byte 0x80457EB0 - .4byte 0x805571C0 - .4byte 0x80457EBC - .4byte 0x805571C4 - .4byte 0x80457EC8 - .4byte 0x805571C8 - .4byte 0x80457EDC - .4byte 0x80557178 + .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 .section .data, "wa" # 0x80421040 - 0x80496700 .global $$249204 @@ -1307,9 +1307,9 @@ $$250943: __vt__Q23lyt16UserTagProcessor: .4byte 0 .4byte 0 - .4byte 0x801AC7B4 ;# ptr - .4byte 0x801B02C8 ;# ptr - .4byte 0x801B0CAC ;# ptr + .byte4 __dt__Q23lyt16UserTagProcessorFv + .byte4 Process__Q23lyt16UserTagProcessorFUsPQ34nw4r2ut15PrintContext$$0w$$1 + .byte4 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 88e918ca..79c0130c 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: - .4byte 0x80556EA8 - .4byte 0x80556EB0 - .4byte 0x80556EB8 - .4byte 0x80556EC0 - .4byte 0x80556EC8 - .4byte 0x80556ED0 - .4byte 0x80556ED8 + .byte4 $$251913 + .byte4 $$251914 + .byte4 $$251915 + .byte4 $$251916 + .byte4 $$251917 + .byte4 $$251918 + .byte4 $$251919 .global $$254066 $$254066: .4byte 0xFF10FF11 @@ -1884,16 +1884,16 @@ $$254078: __vt__Q24info22Iterator$52761Util_cpp: .4byte 0 .4byte 0 - .4byte 0x801A56E8 ;# ptr - .4byte 0x801A5680 ;# ptr - .4byte 0x801A5600 ;# ptr + .byte4 onStartTag__Q24info22Iterator$52761Util_cppFPCwUlUsUsUsPUc + .byte4 onEndTag__Q24info22Iterator$52761Util_cppFPCwUlUsUs + .byte4 onNormalChar__Q24info22Iterator$52761Util_cppFw .global __vt__Q24info22Iterator$52705Util_cpp __vt__Q24info22Iterator$52705Util_cpp: .4byte 0 .4byte 0 - .4byte 0x801A58A8 ;# ptr - .4byte 0x801A5850 ;# ptr - .4byte 0x801A5804 ;# ptr + .byte4 onStartTag__Q24info22Iterator$52705Util_cppFPCwUlUsUsUsPUc + .byte4 onEndTag__Q24info22Iterator$52705Util_cppFPCwUlUsUs + .byte4 onNormalChar__Q24info22Iterator$52705Util_cppFw .global $$254197 $$254197: .asciz "bad_function_call" @@ -1902,16 +1902,16 @@ $$254197: __vt__Q24info22Iterator$52503Util_cpp: .4byte 0 .4byte 0 - .4byte 0x801A5918 ;# ptr - .4byte 0x801AFF00 ;# ptr - .4byte 0x801AFF04 ;# ptr + .byte4 onStartTag__Q24info22Iterator$52503Util_cppFPCwUlUsUsUsPUc + .byte4 onEndTag__Q33lyt7TagUtil14StringIteratorFPCwUlUsUs + .byte4 onNormalChar__Q33lyt7TagUtil14StringIteratorFw .global __vt__Q218$$2unnamed$$2Util_cpp$$222Iterator$52007Util_cpp __vt__Q218$$2unnamed$$2Util_cpp$$222Iterator$52007Util_cpp: .4byte 0 .4byte 0 - .4byte 0x801A5A70 ;# ptr - .4byte 0x801A5A6C ;# ptr - .4byte 0x801A5A68 ;# ptr + .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 .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 a50679f8..63c47189 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 - .4byte 0x802EF7C8 ;# ptr - .4byte 0x802EF7AC ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1Fv + .byte4 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 - .4byte 0x80358900 - .4byte 0x803588E4 + .byte4 __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateSwim$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 4e8d2754..8b5585db 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: - .4byte 0x804145B8 - .4byte 0x804145FC - .4byte 0x80414640 - .4byte 0x80414684 - .4byte 0x804146C8 - .4byte 0x8041470C - .4byte 0x80414750 - .4byte 0x80414794 - .4byte 0x804147D8 - .4byte 0x8041481C - .4byte 0x80414860 - .4byte 0x804148A4 - .4byte 0x804148E8 - .4byte 0x8041492C + .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 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249284 diff --git a/asm/src/VMCore.s b/asm/src/VMCore.s index 14932c13..a6633f75 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: - .4byte 0x80557580 - .4byte 0x80557588 - .4byte 0x8055758C - .4byte 0x80557594 + .byte4 $$252608 + .byte4 $$252609 + .byte4 $$252610 + .byte4 $$252611 .global $$258793 $$258793: .asciz "Not Found VMCore::sizeOf" @@ -3729,32 +3729,32 @@ $$259008: __vt__Q26mintvm6VMCore: .4byte 0 .4byte 0 - .4byte 0x801CAE1C ;# ptr + .byte4 __dt__Q26mintvm6VMCoreFv .global __vt__Q26mintvm20VMMap$$0Ul$$44294967295$$1 __vt__Q26mintvm20VMMap$$0Ul$$44294967295$$1: .4byte 0 .4byte 0 - .4byte 0x801CADB0 ;# ptr + .byte4 __dt__Q26mintvm20VMMap$$0Ul$$44294967295$$1Fv .global __vt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMVariable$$1 __vt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMVariable$$1: .4byte 0 .4byte 0 - .4byte 0x801CACE8 ;# ptr + .byte4 __dt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMVariable$$1Fv .global __vt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMFunction$$1 __vt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMFunction$$1: .4byte 0 .4byte 0 - .4byte 0x801CAC20 ;# ptr + .byte4 __dt__Q26mintvm31VMMapPtr$$0Q26mintvm10VMFunction$$1Fv .global __vt__Q26mintvm28VMMapPtr$$0Q26mintvm8VMModule$$1 __vt__Q26mintvm28VMMapPtr$$0Q26mintvm8VMModule$$1: .4byte 0 .4byte 0 - .4byte 0x801CAB58 ;# ptr + .byte4 __dt__Q26mintvm28VMMapPtr$$0Q26mintvm8VMModule$$1Fv .global __vt__Q26mintvm8VMObject __vt__Q26mintvm8VMObject: .4byte 0 .4byte 0 - .4byte 0x801C9F3C ;# ptr + .byte4 __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 6c7b66fc..5026f297 100644 --- a/asm/src/VMFunctionList.s +++ b/asm/src/VMFunctionList.s @@ -170,12 +170,12 @@ lbl_801CD1B8: __vt__Q26mintvm14VMFunctionList: .4byte 0 .4byte 0 - .4byte 0x801CA37C ;# ptr + .byte4 __dt__Q26mintvm14VMFunctionListFv .global __vt__Q26mintvm10VMFunction __vt__Q26mintvm10VMFunction: .4byte 0 .4byte 0 - .4byte 0x801CA504 ;# ptr + .byte4 __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 509b24a8..725325d4 100644 --- a/asm/src/VMModule.s +++ b/asm/src/VMModule.s @@ -143,15 +143,15 @@ lbl_801CD3AC: __vt__Q26mintvm8VMModule: .4byte 0 .4byte 0 - .4byte 0x801CA0F8 ;# ptr + .byte4 __dt__Q26mintvm8VMModuleFv .global __vt__Q26mintvm13VMSymbolTable __vt__Q26mintvm13VMSymbolTable: .4byte 0 .4byte 0 - .4byte 0x801CA6EC ;# ptr + .byte4 __dt__Q26mintvm13VMSymbolTableFv .global __vt__Q26mintvm15VMConstantTable __vt__Q26mintvm15VMConstantTable: .4byte 0 .4byte 0 - .4byte 0x801CA758 ;# ptr + .byte4 __dt__Q26mintvm15VMConstantTableFv .4byte 0 diff --git a/asm/src/VMObjectType.s b/asm/src/VMObjectType.s index 05498be7..3aaca716 100644 --- a/asm/src/VMObjectType.s +++ b/asm/src/VMObjectType.s @@ -264,17 +264,17 @@ lbl_801CD758: __vt__Q26mintvm12VMObjectType: .4byte 0 .4byte 0 - .4byte 0x801CA304 ;# ptr + .byte4 __dt__Q26mintvm12VMObjectTypeFv .global __vt__Q26mintvm14VMVariableList __vt__Q26mintvm14VMVariableList: .4byte 0 .4byte 0 - .4byte 0x801CA560 ;# ptr + .byte4 __dt__Q26mintvm14VMVariableListFv .global __vt__Q26mintvm10VMVariable __vt__Q26mintvm10VMVariable: .4byte 0 .4byte 0 - .4byte 0x801CA6E8 ;# ptr + .byte4 __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 3108f4bc..eccd9a2e 100644 --- a/asm/src/VMObjectTypeList.s +++ b/asm/src/VMObjectTypeList.s @@ -332,7 +332,7 @@ $$250881: __vt__Q26mintvm16VMObjectTypeList: .4byte 0 .4byte 0 - .4byte 0x801CA17C ;# ptr + .byte4 __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 5dce3580..ff91245f 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 - .4byte 0x80358918 - .4byte 0x80358974 - .4byte 0x80358A80 - .4byte 0x80358AE0 - .4byte 0x80358B2C - .4byte 0x80358B64 + .byte4 __dt__Q43scn4step4hero22VacuumAttackerCallbackFv + .byte4 onEndIndivi__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8Attacker + .byte4 onDecCount__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8Attacker + .byte4 onHoldShake__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8Attacker + .byte4 onReceivedMighty__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8AttackerUl + .byte4 onReceivedCure__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8AttackerUl .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256925 diff --git a/asm/src/VacuumReceiver.s b/asm/src/VacuumReceiver.s index 93e1fc4b..ee15fcd5 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 - .4byte 0x80236588 ;# ptr - .4byte 0x8023656C ;# ptr + .byte4 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common18StateVacuumReceive$$4PQ43scn4step4boss4Boss$$1Fv + .byte4 create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common18StateVacuumReceive$$4PQ43scn4step4boss4Boss$$1Fv .global __vt__Q43scn4step4boss14VacuumReceiver __vt__Q43scn4step4boss14VacuumReceiver: .4byte 0 .4byte 0 - .4byte 0x80235E24 ;# ptr - .4byte 0x80235F10 ;# ptr - .4byte 0x80235FCC ;# ptr - .4byte 0x802360F8 ;# ptr - .4byte 0x80236568 ;# ptr - .4byte 0x80236564 ;# ptr - .4byte 0x80236560 ;# ptr - .4byte 0x8023655C ;# ptr - .4byte 0x80236554 ;# ptr - .4byte 0x80236550 ;# ptr - .4byte 0x8023654C ;# ptr - .4byte 0x80236548 ;# ptr - .4byte 0x80236544 ;# ptr - .4byte 0x80236540 ;# ptr - .4byte 0x80236558 ;# ptr - .4byte 0x803D33A8 + .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 .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 - .4byte 0x80290A58 ;# ptr - .4byte 0x80290A38 ;# ptr + .byte4 __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common18StateVacuumReceive$$4PQ43scn4step5enemy5Enemy$$4Ul$$1Fv + .byte4 create__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common18StateVacuumReceive$$4PQ43scn4step5enemy5Enemy$$4Ul$$1Fv .global __vt__Q43scn4step5enemy14VacuumReceiver __vt__Q43scn4step5enemy14VacuumReceiver: .4byte 0 .4byte 0 - .4byte 0x8028FEE4 ;# ptr - .4byte 0x802900C0 ;# ptr - .4byte 0x80290238 ;# ptr - .4byte 0x80290348 ;# ptr - .4byte 0x80236568 ;# ptr - .4byte 0x80236564 ;# ptr - .4byte 0x80236560 ;# ptr - .4byte 0x8023655C ;# ptr - .4byte 0x80236554 ;# ptr - .4byte 0x80236550 ;# ptr - .4byte 0x8023654C ;# ptr - .4byte 0x80236548 ;# ptr - .4byte 0x80236544 ;# ptr - .4byte 0x80236540 ;# ptr - .4byte 0x80290418 ;# ptr - .4byte 0x803D33A8 + .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 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference18StateVacuumReceive$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference18StateVacuumReceive$$4PQ43scn4step4hero4Hero$$4Ul$$1: .4byte 0 .4byte 0 - .4byte 0x80359E34 - .4byte 0x80359D88 + .byte4 __dt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference18StateVacuumReceive$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .byte4 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 - .4byte 0x80359DC8 - .4byte 0x80359D04 + .byte4 __dt__Q24util155StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference12StateVomited$$4PQ43scn4step4hero4Hero$$4Q24util39ObjRefHandle$$0Q43scn4step6weapon6Weapon$$1$$4Ul$$4Ul$$1Fv + .byte4 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 - .4byte 0x80359DC4 - .4byte 0x80359DA8 + .byte4 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference10StateEaten$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference10StateEaten$$4PQ43scn4step4hero4Hero$$1Fv .global __vt__Q43scn4step4hero14VacuumReceiver __vt__Q43scn4step4hero14VacuumReceiver: .4byte 0 .4byte 0 - .4byte 0x80358C04 - .4byte 0x80358D3C - .4byte 0x80358DF4 - .4byte 0x80358F24 - .4byte 0x80358FAC - .4byte 0x80358FF4 - .4byte 0x8035929C - .4byte 0x8023655C ;# ptr - .4byte 0x8035943C - .4byte 0x80359464 - .4byte 0x8035948C - .4byte 0x803594E8 - .4byte 0x8035956C - .4byte 0x80359750 - .4byte 0x803592E8 - .4byte 0x803D33A8 + .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 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18StateVacuumReceive$$4PQ43scn4step4item4Item$$4Ul$$1 __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18StateVacuumReceive$$4PQ43scn4step4item4Item$$4Ul$$1: .4byte 0 .4byte 0 - .4byte 0x803C5BE4 - .4byte 0x803C5BC4 + .byte4 __dt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18StateVacuumReceive$$4PQ43scn4step4item4Item$$4Ul$$1Fv + .byte4 create__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18StateVacuumReceive$$4PQ43scn4step4item4Item$$4Ul$$1Fv .global __vt__Q43scn4step4item14VacuumReceiver __vt__Q43scn4step4item14VacuumReceiver: .4byte 0 .4byte 0 - .4byte 0x803C55E0 - .4byte 0x803C5830 - .4byte 0x803C5894 - .4byte 0x803C59C4 - .4byte 0x80236568 ;# ptr - .4byte 0x80236564 ;# ptr - .4byte 0x80236560 ;# ptr - .4byte 0x8023655C ;# ptr - .4byte 0x80236554 ;# ptr - .4byte 0x80236550 ;# ptr - .4byte 0x8023654C ;# ptr - .4byte 0x80236548 ;# ptr - .4byte 0x80236544 ;# ptr - .4byte 0x80236540 ;# ptr - .4byte 0x803C5A24 - .4byte 0x803D33A8 + .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 .section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock18StateVacuumReceive$$4PQ43scn4step6weapon6Weapon$$4Ul$$1 __vt__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock18StateVacuumReceive$$4PQ43scn4step6weapon6Weapon$$4Ul$$1: .4byte 0 .4byte 0 - .4byte 0x803EF5E8 - .4byte 0x803EF5C8 + .byte4 __dt__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock18StateVacuumReceive$$4PQ43scn4step6weapon6Weapon$$4Ul$$1Fv + .byte4 create__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock18StateVacuumReceive$$4PQ43scn4step6weapon6Weapon$$4Ul$$1Fv .global __vt__Q53scn4step6weapon13vacuumedblock14VacuumReceiver __vt__Q53scn4step6weapon13vacuumedblock14VacuumReceiver: .4byte 0 .4byte 0 - .4byte 0x803EF274 - .4byte 0x803EF2E0 - .4byte 0x803EF2E4 - .4byte 0x803EF2E8 - .4byte 0x80236568 ;# ptr - .4byte 0x80236564 ;# ptr - .4byte 0x80236560 ;# ptr - .4byte 0x8023655C ;# ptr - .4byte 0x80236554 ;# ptr - .4byte 0x80236550 ;# ptr - .4byte 0x8023654C ;# ptr - .4byte 0x80236548 ;# ptr - .4byte 0x80236544 ;# ptr - .4byte 0x80236540 ;# ptr - .4byte 0x80236558 ;# ptr - .4byte 0x803D33A8 + .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 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256314 diff --git a/asm/src/VariationDemo.s b/asm/src/VariationDemo.s index 5eed9dae..590ccd4b 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 - .4byte 0x803040A4 + .byte4 __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 - .4byte 0x80552588 + .byte4 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 - .4byte 0x80303B1C - .4byte 0x80303DCC - .4byte 0x80303DD8 - .4byte 0x80303DDC - .4byte 0x803040A0 + .byte4 updateReady__Q53scn4step7gimmick10cameralock13VariationDemoFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLock__Q53scn4step7gimmick10cameralock13VariationDemoFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock13VariationDemoFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock13VariationDemoFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 setIsPose__Q53scn4step7gimmick10cameralock13VariationDemoFb .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/VariationDownside.s b/asm/src/VariationDownside.s index 5c22052e..5f4ab6b6 100644 --- a/asm/src/VariationDownside.s +++ b/asm/src/VariationDownside.s @@ -77,11 +77,11 @@ setIsPose__Q53scn4step7gimmick10cameralock17VariationDownsideFb: __vt__Q53scn4step7gimmick10cameralock17VariationDownside: .4byte 0 .4byte 0 - .4byte 0x80304240 - .4byte 0x8030424C - .4byte 0x80304250 - .4byte 0x80304254 - .4byte 0x80304300 + .byte4 updateReady__Q53scn4step7gimmick10cameralock17VariationDownsideFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLock__Q53scn4step7gimmick10cameralock17VariationDownsideFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock17VariationDownsideFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock17VariationDownsideFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 setIsPose__Q53scn4step7gimmick10cameralock17VariationDownsideFb .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/VariationLoose.s b/asm/src/VariationLoose.s index bbb081c7..54676859 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 - .4byte 0x8030444C - .4byte 0x8030462C - .4byte 0x80304960 - .4byte 0x80304964 - .4byte 0x80304968 + .byte4 updateReady__Q53scn4step7gimmick10cameralock14VariationLooseFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLock__Q53scn4step7gimmick10cameralock14VariationLooseFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock14VariationLooseFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock14VariationLooseFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 setIsPose__Q53scn4step7gimmick10cameralock14VariationLooseFb .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/VariationMove.s b/asm/src/VariationMove.s index 3d0714e7..6721cdb2 100644 --- a/asm/src/VariationMove.s +++ b/asm/src/VariationMove.s @@ -59,9 +59,9 @@ setIsPose__Q53scn4step7gimmick10cameralock13VariationMoveFb: __vt__Q53scn4step7gimmick10cameralock13VariationMove: .4byte 0 .4byte 0 - .4byte 0x80304C20 - .4byte 0x80304C88 - .4byte 0x80304C8C - .4byte 0x80304C90 - .4byte 0x80304C94 + .byte4 updateReady__Q53scn4step7gimmick10cameralock13VariationMoveFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLock__Q53scn4step7gimmick10cameralock13VariationMoveFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock13VariationMoveFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock13VariationMoveFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 setIsPose__Q53scn4step7gimmick10cameralock13VariationMoveFb .4byte 0 diff --git a/asm/src/VariationNpc.s b/asm/src/VariationNpc.s index c907f1b2..92234688 100644 --- a/asm/src/VariationNpc.s +++ b/asm/src/VariationNpc.s @@ -1482,117 +1482,117 @@ objCollRect__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7maho $$258009: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80314BBC + .byte4 ActWait__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258010 $$258010: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80314C00 + .byte4 ActWait2__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258011 $$258011: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80314C44 + .byte4 ActWait3__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258012 $$258012: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80314C88 + .byte4 ActWait5__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258013 $$258013: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80314CCC + .byte4 ActWait6__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258014 $$258014: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80314D10 + .byte4 ActWait7__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258015 $$258015: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80314D54 + .byte4 ActWait8__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258016 $$258016: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80314D98 + .byte4 ActWait9__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258017 $$258017: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80314DDC + .byte4 ActWait10__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258018 $$258018: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80314E20 + .byte4 ActWait11__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258019 $$258019: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80314E64 + .byte4 ActTurnFront__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258020 $$258020: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80314F64 + .byte4 ActTurnBack__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258021 $$258021: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803150B4 + .byte4 ActTalk__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258022 $$258022: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803150F8 + .byte4 ActTalkGlad__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258023 $$258023: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8031513C + .byte4 ActTalkRegret__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258024 $$258024: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80315180 + .byte4 ActTalkPointing__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258025 $$258025: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803151C4 + .byte4 ActTalkChuckle__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258026 $$258026: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80315208 + .byte4 ActTalkGo__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258027 $$258027: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x8031524C + .byte4 ActGlad__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258028 $$258028: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x80315290 + .byte4 ActChase__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258029 $$258029: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803153DC + .byte4 ActAvert__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258030 $$258030: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803154E8 + .byte4 ActTurnMainPlayer__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258031 $$258031: .4byte 0 .4byte 0xFFFFFFFF - .4byte 0x803155E8 + .byte4 ActWaitMainPlayerMove__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa .global $$258043 $$258043: .4byte 0x8031488C @@ -1622,11 +1622,11 @@ $$258043: __vt__Q53scn4step7gimmick7mahoroa12VariationNpc: .4byte 0 .4byte 0 - .4byte 0x80314600 - .4byte 0x80314640 - .4byte 0x8031479C - .4byte 0x80315740 - .4byte 0x803147C4 + .byte4 registerToRoot__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .byte4 updateFrame__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .byte4 updateUseGPU__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .byte4 objCollRect__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa + .byte4 reqAct__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7MahoroaQ53scn4step7gimmick7mahoroa7ActKind .global __vt__Q53scn4step7gimmick7mahoroa10IVariation __vt__Q53scn4step7gimmick7mahoroa10IVariation: .4byte 0 diff --git a/asm/src/VariationPerm.s b/asm/src/VariationPerm.s index 4b7dcd21..80ed1ec2 100644 --- a/asm/src/VariationPerm.s +++ b/asm/src/VariationPerm.s @@ -103,11 +103,11 @@ setIsPose__Q53scn4step7gimmick10cameralock13VariationPermFb: __vt__Q53scn4step7gimmick10cameralock13VariationPerm: .4byte 0 .4byte 0 - .4byte 0x80304CB4 - .4byte 0x80304DC4 - .4byte 0x80304DC8 - .4byte 0x80304DCC - .4byte 0x80304DD0 + .byte4 updateReady__Q53scn4step7gimmick10cameralock13VariationPermFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLock__Q53scn4step7gimmick10cameralock13VariationPermFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock13VariationPermFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock13VariationPermFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 setIsPose__Q53scn4step7gimmick10cameralock13VariationPermFb .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/VariationShooting.s b/asm/src/VariationShooting.s index 923d2bfd..c23f521c 100644 --- a/asm/src/VariationShooting.s +++ b/asm/src/VariationShooting.s @@ -170,11 +170,11 @@ setIsPose__Q53scn4step7gimmick10cameralock17VariationShootingFb: __vt__Q53scn4step7gimmick10cameralock17VariationShooting: .4byte 0 .4byte 0 - .4byte 0x80304DF0 - .4byte 0x80305004 - .4byte 0x80305008 - .4byte 0x8030500C - .4byte 0x80305010 + .byte4 updateReady__Q53scn4step7gimmick10cameralock17VariationShootingFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLock__Q53scn4step7gimmick10cameralock17VariationShootingFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock17VariationShootingFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock17VariationShootingFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 setIsPose__Q53scn4step7gimmick10cameralock17VariationShootingFb .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/VariationSphere.s b/asm/src/VariationSphere.s index ac707488..f04ed83b 100644 --- a/asm/src/VariationSphere.s +++ b/asm/src/VariationSphere.s @@ -308,11 +308,11 @@ setIsPose__Q53scn4step7gimmick10cameralock15VariationSphereFb: __vt__Q53scn4step7gimmick10cameralock15VariationSphere: .4byte 0 .4byte 0 - .4byte 0x80305034 - .4byte 0x8030528C - .4byte 0x8030545C - .4byte 0x80305460 - .4byte 0x80305464 + .byte4 updateReady__Q53scn4step7gimmick10cameralock15VariationSphereFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLock__Q53scn4step7gimmick10cameralock15VariationSphereFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock15VariationSphereFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock15VariationSphereFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 setIsPose__Q53scn4step7gimmick10cameralock15VariationSphereFb .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/VariationStill.s b/asm/src/VariationStill.s index 94ba8c3c..ba32388f 100644 --- a/asm/src/VariationStill.s +++ b/asm/src/VariationStill.s @@ -174,11 +174,11 @@ setIsPose__Q53scn4step7gimmick10cameralock14VariationStillFb: __vt__Q53scn4step7gimmick10cameralock14VariationStill: .4byte 0 .4byte 0 - .4byte 0x80305498 - .4byte 0x80305628 - .4byte 0x803056A8 - .4byte 0x803056AC - .4byte 0x803056B0 + .byte4 updateReady__Q53scn4step7gimmick10cameralock14VariationStillFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLock__Q53scn4step7gimmick10cameralock14VariationStillFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock14VariationStillFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock14VariationStillFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 setIsPose__Q53scn4step7gimmick10cameralock14VariationStillFb .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/VariationUpside.s b/asm/src/VariationUpside.s index 4424995a..258241fd 100644 --- a/asm/src/VariationUpside.s +++ b/asm/src/VariationUpside.s @@ -75,11 +75,11 @@ setIsPose__Q53scn4step7gimmick10cameralock15VariationUpsideFb: __vt__Q53scn4step7gimmick10cameralock15VariationUpside: .4byte 0 .4byte 0 - .4byte 0x803056C4 - .4byte 0x803056C8 - .4byte 0x803056CC - .4byte 0x803056D0 - .4byte 0x8030577C + .byte4 updateReady__Q53scn4step7gimmick10cameralock15VariationUpsideFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLock__Q53scn4step7gimmick10cameralock15VariationUpsideFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateReadyNonStop__Q53scn4step7gimmick10cameralock15VariationUpsideFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 updateLockNonStop__Q53scn4step7gimmick10cameralock15VariationUpsideFRQ53scn4step7gimmick10cameralock10CameraLock + .byte4 setIsPose__Q53scn4step7gimmick10cameralock15VariationUpsideFb .4byte 0 .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 diff --git a/asm/src/Vector2.s b/asm/src/Vector2.s index 421b4053..f01e065a 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 - .4byte 0x8019F4B0 ;# ptr + .byte4 __sinit_$$3Vector2_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250690 diff --git a/asm/src/Vector3.s b/asm/src/Vector3.s index b235a048..a1160887 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 - .4byte 0x8019FCBC ;# ptr + .byte4 __sinit_$$3Vector3_cpp .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251176 diff --git a/asm/src/Water.s b/asm/src/Water.s index cad5e7d8..79144b83 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 - .4byte 0x8035B524 - .4byte 0x8035B4DC + .byte4 __dt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv + .byte4 create__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateWaterFloat$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateWaterFloat$$4PQ43scn4step4hero4Hero$$1: .4byte 0 .4byte 0 - .4byte 0x8035B520 - .4byte 0x8035B504 + .byte4 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateWaterFloat$$4PQ43scn4step4hero4Hero$$1Fv + .byte4 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 02d2b2c9..e00d9368 100644 --- a/asm/src/WaterCallback.s +++ b/asm/src/WaterCallback.s @@ -64,7 +64,7 @@ lbl_80290B04: __vt__Q43scn4step5enemy13WaterCallback: .4byte 0 .4byte 0 - .4byte 0x802863B4 ;# ptr - .4byte 0x80290A70 ;# ptr - .4byte 0x80290AC4 ;# ptr + .byte4 __dt__Q43scn4step5enemy13WaterCallbackFv + .byte4 onInWater__Q43scn4step5enemy13WaterCallbackFv + .byte4 onOutWater__Q43scn4step5enemy13WaterCallbackFv .4byte 0 diff --git a/asm/src/WaveHandle.s b/asm/src/WaveHandle.s index 808891f6..a0d2bb11 100644 --- a/asm/src/WaveHandle.s +++ b/asm/src/WaveHandle.s @@ -408,12 +408,12 @@ setParam__Q23snd10WaveHandleFUlUlQ34nw4r3snd12SampleFormat: __vt__Q23snd10WaveHandle: .4byte 0 .4byte 0 - .4byte 0x804040A4 + .byte4 __dt__Q23snd10WaveHandleFv .global __vt__Q33snd10WaveHandle10WavePacket __vt__Q33snd10WaveHandle10WavePacket: .4byte 0 .4byte 0 - .4byte 0x80404048 + .byte4 __dt__Q33snd10WaveHandle10WavePacketFv .section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249104 diff --git a/asm/src/Weapon.s b/asm/src/Weapon.s index 8f951aa5..23f70b42 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 - .4byte 0x803DB1B4 - .4byte 0x803DB198 + .byte4 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q43scn4step6weapon11StateNormal$$4PQ43scn4step6weapon6Weapon$$1Fv + .byte4 create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q43scn4step6weapon11StateNormal$$4PQ43scn4step6weapon6Weapon$$1Fv .global __vt__Q24util43StateChanger$$0Q43scn4step6weapon6IState$$4256$$1 __vt__Q24util43StateChanger$$0Q43scn4step6weapon6IState$$4256$$1: .4byte 0 .4byte 0 - .4byte 0x803DA544 + .byte4 __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 2d461368..4bd0bdb1 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: - .4byte 0x8055B2E8 + .byte4 $$248751 .4byte 0 - .4byte 0x8048B698 + .byte4 $$248752 .4byte 0 - .4byte 0x8048B6A8 + .byte4 $$248753 .4byte 0 - .4byte 0x8055B2F0 + .byte4 $$248754 .4byte 0 - .4byte 0x8048B6B8 + .byte4 $$248755 .4byte 0 - .4byte 0x8048B6C8 + .byte4 $$248756 .4byte 0 - .4byte 0x8055B2F8 + .byte4 $$248757 .4byte 0 - .4byte 0x8055B300 + .byte4 $$248758 .4byte 0 - .4byte 0x8048B6D8 + .byte4 $$248759 .4byte 0 - .4byte 0x8048B6E8 + .byte4 $$248760 .4byte 0 - .4byte 0x8048B6F4 + .byte4 $$248761 .4byte 0 - .4byte 0x8048B700 + .byte4 $$248762 .4byte 0 - .4byte 0x8055B308 + .byte4 $$248763 .4byte 0 - .4byte 0x8048B70C + .byte4 $$248764 .4byte 0 - .4byte 0x8048B71C + .byte4 $$248765 .4byte 0 - .4byte 0x8048B72C + .byte4 $$248766 .4byte 0 - .4byte 0x8048B738 + .byte4 $$248767 .4byte 0 - .4byte 0x8048B748 + .byte4 $$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: - .4byte 0x8055B2D0 - .4byte 0x8055B2D8 - .4byte 0x8048B618 - .4byte 0x8048B624 - .4byte 0x8055B2E0 - .4byte 0x8048B630 - .4byte 0x8048B63C - .4byte 0x8048B648 - .4byte 0x8048B654 - .4byte 0x8048B660 + .byte4 $$248735 + .byte4 $$248736 + .byte4 $$248737 + .byte4 $$248738 + .byte4 $$248739 + .byte4 $$248740 + .byte4 $$248741 + .byte4 $$248742 + .byte4 $$248743 + .byte4 $$248744 .global $$248752 $$248752: .asciz "WhipCatchStart" @@ -586,27 +586,27 @@ $$256580: __vt__Q53scn4step4hero4whip4Whip: .4byte 0 .4byte 0 - .4byte 0x8038C804 - .4byte 0x8038C8A4 - .4byte 0x8032B7A0 - .4byte 0x8032B7A4 - .4byte 0x8032B7A8 - .4byte 0x8038C9C4 - .4byte 0x8038CC64 - .4byte 0x8032B7B4 - .4byte 0x8032B7B8 - .4byte 0x8032B7BC - .4byte 0x8032B7C0 - .4byte 0x8032B7C4 - .4byte 0x8032B7C8 - .4byte 0x8032B7CC - .4byte 0x8032B7D0 - .4byte 0x8032B7D4 - .4byte 0x8032B7D8 - .4byte 0x8038CB28 - .4byte 0x8032B7E0 - .4byte 0x8032B7E4 - .4byte 0x8032B7E8 + .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 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248735 diff --git a/asm/src/Wing.s b/asm/src/Wing.s index 02d7b895..01db1b56 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: - .4byte 0x8048B794 + .byte4 $$249539 .4byte 0 - .4byte 0x8048B7A8 + .byte4 $$249540 .4byte 0 - .4byte 0x8048B7BC + .byte4 $$249541 .4byte 0 - .4byte 0x8048B7D0 + .byte4 $$249542 .4byte 0 - .4byte 0x8048B7E0 + .byte4 $$249543 .4byte 0 - .4byte 0x8048B7F8 + .byte4 $$249544 .4byte 0 - .4byte 0x8048B810 + .byte4 $$249545 .4byte 0 - .4byte 0x8048B828 + .byte4 $$249546 .4byte 0 - .4byte 0x8048B83C + .byte4 $$249547 .4byte 0 - .4byte 0x8048B848 + .byte4 $$249548 .4byte 0 - .4byte 0x8048B858 + .byte4 $$249549 .4byte 0 - .4byte 0x8048B86C + .byte4 $$249550 .4byte 0 - .4byte 0x8048B87C + .byte4 $$249551 .4byte 0 - .4byte 0x8048B890 + .byte4 $$249552 .4byte 0 - .4byte 0x8048B8A4 + .byte4 $$249553 .4byte 0 - .4byte 0x8048B8B4 + .byte4 $$249554 .4byte 0 - .4byte 0x8048B8C8 + .byte4 $$249555 .4byte 0 - .4byte 0x8048B8D8 + .byte4 $$249556 .4byte 0 - .4byte 0x8048B8E8 + .byte4 $$249557 .4byte 0 - .4byte 0x8048B8F8 + .byte4 $$249558 .4byte 0 - .4byte 0x8048B908 + .byte4 $$249559 .4byte 0 - .4byte 0x8048B91C + .byte4 $$249560 .4byte 0 - .4byte 0x8048B928 + .byte4 $$249561 .4byte 0 - .4byte 0x8048B938 + .byte4 $$249562 .4byte 0 - .4byte 0x8048B948 + .byte4 $$249563 .4byte 0 .section .data, "wa" # 0x80421040 - 0x80496700 @@ -614,27 +614,27 @@ $$256290: __vt__Q53scn4step4hero4wing4Wing: .4byte 0 .4byte 0 - .4byte 0x8039B018 - .4byte 0x8039B0A4 - .4byte 0x8032B7A0 - .4byte 0x8039B1E0 - .4byte 0x8032B7A8 - .4byte 0x8039B1E8 - .4byte 0x8032B7B0 - .4byte 0x8032B7B4 - .4byte 0x8032B7B8 - .4byte 0x8032B7BC - .4byte 0x8032B7C0 - .4byte 0x8032B7C4 - .4byte 0x8032B7C8 - .4byte 0x8032B7CC - .4byte 0x8032B7D0 - .4byte 0x8032B7D4 - .4byte 0x8032B7D8 - .4byte 0x8032B7DC - .4byte 0x8032B7E0 - .4byte 0x8032B7E4 - .4byte 0x8032B7E8 + .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 .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: - .4byte 0x8055B310 + .byte4 $$249532 .global $$249870 $$249870: .asciz "LBDJ" diff --git a/asm/src/Wipe.s b/asm/src/Wipe.s index 58daf19a..7b04581f 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: - .4byte 0x80492D40 - .4byte 0x80492D54 - .4byte 0x80492D68 + .byte4 $$251702 + .byte4 $$251703 + .byte4 $$251704 .4byte 0 .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 diff --git a/asm/src/ZoomQuake.s b/asm/src/ZoomQuake.s index 3480afb0..2a7e785e 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: - .4byte 0x8046B140 - .4byte 0x8046B150 - .4byte 0x8046B168 - .4byte 0x8046B184 - .4byte 0x8046B1A0 - .4byte 0x8046B1C0 - .4byte 0x8046B1E0 + .byte4 $$251535 + .byte4 $$251536 + .byte4 $$251537 + .byte4 $$251538 + .byte4 $$251539 + .byte4 $$251540 + .byte4 $$251541 .global $$251699 $$251699: .asciz "Scn.Step.Camera.ZoomQuake.%s" diff --git a/asm/vi/vi.s b/asm/vi/vi.s index 68caac5d..1d0a906c 100644 --- a/asm/vi/vi.s +++ b/asm/vi/vi.s @@ -3126,7 +3126,7 @@ GXPal524ProgAa: .4byte 0 .global ShutdownFunctionInfo ShutdownFunctionInfo: - .4byte 0x8002BAD0 ;# ptr + .byte4 OnShutdown .4byte 0x0000007F .4byte 0 .4byte 0 @@ -3243,7 +3243,7 @@ $$24441: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __VIVersion __VIVersion: - .4byte 0x8042FC90 + .byte4 $$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 eff51f4e..ba9a65e3 100644 --- a/asm/wpad/WPAD.s +++ b/asm/wpad/WPAD.s @@ -12118,7 +12118,7 @@ $$21504: .balign 4 .global ShutdownFunctionInfo ShutdownFunctionInfo: - .4byte 0x80053EA0 ;# ptr + .byte4 OnShutdown .4byte 0x0000007F .4byte 0 .4byte 0 @@ -12233,7 +12233,7 @@ $$29559: .section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __WPADVersion __WPADVersion: - .4byte 0x80438588 + .byte4 $$21504 .global _wpadOnReconnect _wpadOnReconnect: .4byte 0xFFFFFFFF diff --git a/asm/wpad/WPADHIDParser.s b/asm/wpad/WPADHIDParser.s index e278407d..6323250e 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: - .4byte 0x80060FF0 ;# ptr - .4byte 0x80061430 ;# ptr - .4byte 0x800617A0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063650 ;# ptr - .4byte 0x80063690 ;# ptr - .4byte 0x80063760 ;# ptr - .4byte 0x800637B0 ;# ptr - .4byte 0x800638C0 ;# ptr - .4byte 0x80063910 ;# ptr - .4byte 0x800639F0 ;# ptr - .4byte 0x80063AA0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063EF0 ;# ptr - .4byte 0x80063BF0 ;# ptr - .4byte 0x80063C20 ;# ptr - .4byte 0x80063D90 ;# ptr + .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 .global $$25371 $$25371: .4byte 0x80060704 ;# ptr diff --git a/deptr.py b/deptr.py new file mode 100755 index 00000000..e93e0de6 --- /dev/null +++ b/deptr.py @@ -0,0 +1,52 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 +# +# Usage: deptr.py mapfile file.s +# Replaces pointers with symbol names + +import os +import re +import sys + +substitutions = ( + ('<', '$$0'), + ('>', '$$1'), + ('@', '$$2'), + ('\\', '$$3'), + (',', '$$4'), + ('-', '$$5') +) + +def format(symbol): + for sub in substitutions: + symbol = symbol.replace(sub[0], sub[1]) + + return symbol + +if len(sys.argv) != 3: + print('Usage: %s MAP_FILE ASM_FILE' % sys.argv[0]) + exit() + +labels = set() +labelNames = {} + +with open(sys.argv[1], "r") as mapfile: + for line in mapfile: + match = re.match(' [0-9a-f]{8} [0-9a-f]{6} ([0-9a-f]{8}) [0-9a-f]{8} [ 0-9][0-9] ([^ 0-9.][^ ]*)', line) + if match: + addr = int(match.group(1), 16) + name = format(match.group(2)) + labels.add(addr) + labelNames[addr] = name + +with open(sys.argv[2], 'rt') as f: + for line in f.readlines(): + line = line.rstrip('\n') + # Section directive + m = re.match(r'\s*.4byte (0x80[0-5][0-9A-F]{5})', line) + if m: + ptr = int(m.groups()[0], 16) + if ptr in labelNames: + print(f"\t.byte4 {labelNames[ptr]}") + continue + print(line)